Long live Qt 4.5!

30515 files changed, 7329097 insertions, 0 deletions

diff --git a/.commit-template b/.commit-template
new file mode 100644
index 0000000..589ca89
--- /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 0000000..0de9563
--- /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 0000000..784d507
--- /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 0000000..c243e5c
--- /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 0000000..8d0f85e
--- /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 0000000..13e6f18
--- /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 0000000..bb95f25
--- /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 0000000..7f7b234
--- /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 0000000..7df3325
--- /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 0000000..5e04526
--- /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 0000000..7a9f1d3
--- /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 0000000..579844f
--- /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 0000000..1a16204
--- /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 0000000..c3abf15
--- /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 0000000..2ac10b3
--- /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 0000000..4502af7
--- /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 0000000..a640b11
--- /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 0000000..08322a9
--- /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 0000000..e613cc5
--- /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 0000000..a5e8951
--- /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 0000000..532a565
--- /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 0000000..f743864
--- /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 0000000..db14d3b
--- /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 0000000..be412bb
--- /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 0000000..4ad3376
--- /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 0000000..f4bf9c8
--- /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 0000000..1690652
--- /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 0000000..1b1d0ed
--- /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 0000000..90a8a19
--- /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 0000000..52fdb32
--- /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 0000000..edb71f5
--- /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 0000000..2a6160b
--- /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 0000000..c527535
--- /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 0000000..df99963
--- /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 0000000..961e3a8
--- /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 0000000..b5afa18
--- /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 0000000..e8c17ea
--- /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 0000000..d7b78c8
--- /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 0000000..e408d28
--- /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 0000000..0fa39a8
--- /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 0000000..15ed45f
--- /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 0000000..1e4aea7
--- /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 0000000..3e707c5
--- /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 0000000..d71caba
--- /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 0000000..7e51dea
--- /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 0000000..2c21652
--- /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 0000000..40af746
--- /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 0000000..7b739eb
--- /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 0000000..126f820
--- /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 0000000..4c78563
--- /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 0000000..3edf619
--- /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 0000000..7ef1cf9
--- /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 0000000..e84158e
--- /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 0000000..b2bcc07
--- /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 0000000..c9121db
--- /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 0000000..9dcd030
--- /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 0000000..4e05a18
--- /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 0000000..c3fead6
--- /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 0000000..16b787d
--- /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 0000000..15d059d
--- /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 0000000..21f12dd
--- /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 0000000..d879b20
--- /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 0000000..6ef85e1
--- /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 0000000..7d4aa8e
--- /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 0000000..2152260
--- /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 0000000..01e7429
--- /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 0000000..c0f35a3
--- /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 0000000..8cdc776
--- /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 0000000..e2e1560
--- /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 0000000..8378a7e
--- /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 0000000..c51e61b
--- /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 0000000..5f87eeb
--- /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 0000000..619a783
--- /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 0000000..ed62869
--- /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 0000000..77b09b4
--- /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 0000000..20a5f1a
--- /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 0000000..d7affc6
--- /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 0000000..ed04e7a
--- /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 0000000..de1fb7b
--- /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 0000000..d06888c
--- /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 0000000..cafb478
--- /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 0000000..ee57ecd
--- /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 0000000..7a3f2a7
--- /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 0000000..f038386
--- /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 0000000..eac03ab
--- /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 0000000..60ba7d1
--- /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 0000000..9d66108
--- /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 0000000..617cd62
--- /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 0000000..d2fea7f
--- /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 0000000..1a2ada1
--- /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 0000000..a36d756
--- /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 0000000..c05da1c
--- /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 0000000..a22579e
--- /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 0000000..8c06067
--- /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 0000000..65561f1
--- /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 0000000..1f985b2
--- /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 0000000..eb2173d
--- /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 0000000..9f83a78
--- /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 0000000..4add225
--- /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 0000000..6b64e12
--- /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 0000000..c588ede
--- /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 0000000..a0060b4
--- /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 0000000..d800a5d
--- /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 0000000..f864276
--- /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 0000000..c9addf9
--- /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 0000000..493530d
--- /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 0000000..13f95a1
--- /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 0000000..5ca3e9c
--- /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 0000000..bc95479
--- /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 0000000..6891e78
--- /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 0000000..283475d
--- /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 0000000..f7c5a02
--- /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 0000000..4974425
--- /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 0000000..64bb3d6
--- /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 0000000..1307cec
--- /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 0000000..9e15e81
--- /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 0000000..41aba86
--- /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 0000000..fe7301e
--- /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 0000000..ba2cac1
--- /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 0000000..22c21ca
--- /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 0000000..14a64d5
--- /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 0000000..e1c23bd
--- /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 0000000..4cc34a7
--- /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 0000000..ea0737d
--- /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 0000000..d4a21aa
--- /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 0000000..91e5c3a
--- /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 0000000..79a0d9c
--- /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 0000000..a2feab4
--- /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 0000000..ff653a4
--- /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 0000000..54a4859
--- /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 0000000..5516a14
--- /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 0000000..7cd55ca
--- /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 0000000..1191120
--- /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 0000000..37c858c
--- /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 0000000..58a286f
--- /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 0000000..67cc870
--- /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 0000000..8501162
--- /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 0000000..718a820
--- /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 0000000..e86b02a
--- /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 0000000..4705ca6
--- /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 0000000..b9be2e0
--- /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 0000000..8a40317
--- /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 0000000..a522491
--- /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 0000000..b33949c
--- /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 0000000..6ce2c62
--- /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 0000000..ad69379
--- /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 0000000..432bd8d
--- /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 0000000..8bb5ffb
--- /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 0000000..9be43d8
--- /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 0000000..08cd94b
--- /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 0000000..b1e69be
--- /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 0000000..fd36480
--- /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 0000000..cc94a11
--- /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 0000000..2cb3cf9
--- /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 0000000..54d1af0
--- /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 0000000..9a61bc2
--- /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 0000000..8acaede
--- /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 0000000..afe3c57
--- /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 0000000..d4ec222
--- /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 0000000..cd61c2d
--- /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 0000000..3fb2910
--- /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 0000000..7974d73
--- /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 0000000..e778642
--- /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 0000000..01b5ef4
--- /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 0000000..611c048
--- /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 0000000..269d88c
--- /dev/null
+++ b/configure
@@ -0,0 +1,7270 @@
+#!/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
+    qmakevarname="${varname}"
+    # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
+    if [ "${varname}" = "LDFLAGS" ]; then
+        qmakevarname="LFLAGS"
+    fi
+    cmd=`echo \
+'if [ -n "\$'${varname}'" ]; then
+    QMakeVar set QMAKE_'${qmakevarname}' "\$'${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 0000000..54e8a60
--- /dev/null
+++ b/configure.exe
diff --git a/demos/README b/demos/README
new file mode 100644
index 0000000..b161990
--- /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 0000000..b928753
--- /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 0000000..d8a7ae4
--- /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 0000000..dfc7cee
--- /dev/null
+++ b/demos/affine/bg1.jpg
diff --git a/demos/affine/main.cpp b/demos/affine/main.cpp
new file mode 100644
index 0000000..88cd864
--- /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 0000000..059e38e
--- /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 0000000..f33e63d
--- /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 0000000..17325ac
--- /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 0000000..e5170e6
--- /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 0000000..e9eb1f3
--- /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 0000000..dfc7cee
--- /dev/null
+++ b/demos/arthurplugin/bg1.jpg
diff --git a/demos/arthurplugin/flower.jpg b/demos/arthurplugin/flower.jpg
new file mode 100644
index 0000000..f8e022c
--- /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 0000000..6a3c2a0
--- /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 0000000..e2bf54e
--- /dev/null
+++ b/demos/arthurplugin/plugin.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 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)
+
+static inline QString customWidgetDomXml(const QString &className)
+{
+    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("\"/></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:
+    DemoPlugin(const QString &className);
+
+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) :
+    m_className(className),
+    m_domXml(customWidgetDomXml(className)),
+    m_initialized(false)
+{
+}
+
+class DeformPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+
+public:
+    DeformPlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("PathDeformRendererEx")) { }
+    QString includeFile() const { return "deform.h"; }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        PathDeformRenderer *deform = new PathDeformRendererEx(parent);
+        deform->setRadius(70);
+        deform->setAnimated(false);
+        deform->setFontSize(20);
+        deform->setText("Arthur Widgets Demo");
+
+        return deform;
+    }
+};
+
+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:
+    XFormPlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("XFormRendererEx")) { }
+    QString includeFile() const { return "xform.h"; }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        XFormRendererEx *xform = new XFormRendererEx(parent);
+        xform->setText("Qt - Hello World!!");
+        xform->setPixmap(QPixmap(":/trolltech/arthurplugin/bg1.jpg"));
+        return xform;
+    }
+};
+
+
+class GradientEditorPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    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 "gradients.h"; }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        GradientRenderer *renderer = new GradientRendererEx(parent);
+        renderer->setConicalGradient();
+        return renderer;
+    }
+};
+
+class PathStrokeRendererEx : public PathStrokeRenderer
+{
+    Q_OBJECT
+public:
+    PathStrokeRendererEx(QWidget *p) : PathStrokeRenderer(p) { }
+    QSize sizeHint() const { return QSize(300, 200); }
+};
+
+class StrokeRenderPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    StrokeRenderPlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("PathStrokeRendererEx")) { }
+    QString includeFile() const { return "pathstroke.h"; }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        PathStrokeRenderer *stroke = new PathStrokeRendererEx(parent);
+        return stroke;
+    }
+};
+
+
+class CompositionModePlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    CompositionModePlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("CompositionRenderer")) { }
+    QString includeFile() const { return "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:
+    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 0000000..1322fd6
--- /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 0000000..fb32335
--- /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 0000000..a2cd33f
--- /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 0000000..342638e
--- /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 0000000..e73f727
--- /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 0000000..3cc69d0
--- /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 0000000..659d324
--- /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 0000000..87f4464
--- /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 0000000..f9a94b7
--- /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 0000000..f3ae325
--- /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 0000000..98eb87a
--- /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 0000000..b8a4a99
--- /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 0000000..06ef24a
--- /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 0000000..5a02df2
--- /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 0000000..6c1a331
--- /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 0000000..d27506d
--- /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 0000000..07c282e
--- /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 0000000..46cd2f9
--- /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 0000000..40c01dd
--- /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 0000000..0b42e8a
--- /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 0000000..2aca9b1
--- /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 0000000..2e49173
--- /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 0000000..26425f6
--- /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 0000000..dd98061
--- /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 0000000..2b59a0a
--- /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 0000000..b2a594e
--- /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 0000000..88de4e8
--- /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 0000000..59256a8
--- /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 0000000..74617d6
--- /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 0000000..b6999a8
--- /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 0000000..2b6209a
--- /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 0000000..c06ce90
--- /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 0000000..9b75d1d
--- /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 0000000..10bbde1
--- /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 0000000..62d3c9f
--- /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 0000000..50e2073
--- /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 0000000..4014b46
--- /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 0000000..7d3e97e
--- /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 0000000..0607698
--- /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 0000000..aae8256
--- /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 0000000..d5807ee
--- /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 0000000..f91c24d
--- /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 0000000..f238da2
--- /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 0000000..b934ade
--- /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 0000000..1040e17
--- /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 0000000..2db9317
--- /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 0000000..41cfda6
--- /dev/null
+++ b/demos/boxes/smiley.png
diff --git a/demos/boxes/square.jpg b/demos/boxes/square.jpg
new file mode 100644
index 0000000..03f53bd
--- /dev/null
+++ b/demos/boxes/square.jpg
diff --git a/demos/boxes/trackball.cpp b/demos/boxes/trackball.cpp
new file mode 100644
index 0000000..980f6ed
--- /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 0000000..5e3f40c
--- /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 0000000..bb24531
--- /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 0000000..35bf7d6
--- /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 0000000..5648631
--- /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 0000000..3460d7b
--- /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 0000000..4e945f0
--- /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 0000000..bb340cd
--- /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 0000000..8e7823d
--- /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 0000000..fb47b4f
--- /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 0000000..c893e94
--- /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 0000000..f591ae4
--- /dev/null
+++ b/demos/browser/browser.icns
diff --git a/demos/browser/browser.ico b/demos/browser/browser.ico
new file mode 100644
index 0000000..7f9be93
--- /dev/null
+++ b/demos/browser/browser.ico
diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro
new file mode 100644
index 0000000..d970f99
--- /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 0000000..89a237c
--- /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 0000000..5433022
--- /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 0000000..6887dfd
--- /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 0000000..f1dcaef
--- /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 0000000..eaf976c
--- /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 0000000..7ebe282
--- /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 0000000..78968ba
--- /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 0000000..9e11c8e
--- /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 0000000..ffcd4c1
--- /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 0000000..c4bccc5
--- /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 0000000..3d9ef62
--- /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 0000000..20928fb
--- /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 0000000..4b0fa72
--- /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 0000000..ab9d669
--- /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 0000000..c7d0294
--- /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 0000000..a168244
--- /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 0000000..01a0920
--- /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 0000000..552a1cb
--- /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 0000000..c1545eb
--- /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 0000000..4a0a0fd
--- /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 0000000..af31391
--- /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 0000000..85318da
--- /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 0000000..a2e2569
--- /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 0000000..0d776a7
--- /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 0000000..3ae63e0
--- /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 0000000..0331ba7
--- /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 0000000..97b9804
--- /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 0000000..80e7372
--- /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 0000000..4f4edcd
--- /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 0000000..0944940
--- /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 0000000..03b256c
--- /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 0000000..b04a9f8
--- /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 0000000..a59b2fb
--- /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 0000000..9403ef1
--- /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 0000000..edd2e04
--- /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 0000000..2e7b2fd
--- /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 0000000..d016e76
--- /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 0000000..7c16658
--- /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 0000000..62a8be6
--- /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 0000000..8f668e0
--- /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 0000000..be17e05
--- /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 0000000..09f4846
--- /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 0000000..a7a0a35
--- /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 0000000..3491ce0
--- /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 0000000..3209e16
--- /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 0000000..2f82240
--- /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 0000000..7a2ee40
--- /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 0000000..da3fe42
--- /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 0000000..255b5e9
--- /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 0000000..8e1be8d
--- /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 0000000..f7a6345
--- /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 0000000..6a718f0
--- /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 0000000..6c4d857
--- /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 0000000..a41bcf3
--- /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 0000000..a92b649
--- /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 0000000..b736d02
--- /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 0000000..c2b22da
--- /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 0000000..9866f80
--- /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 0000000..53fa23b
--- /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 0000000..ba7c02d
--- /dev/null
+++ b/demos/chip/fileprint.png
diff --git a/demos/chip/images.qrc b/demos/chip/images.qrc
new file mode 100644
index 0000000..c7cdf0c
--- /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 0000000..e945026
--- /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 0000000..5222cd4
--- /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 0000000..5decca8
--- /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 0000000..157e86e
--- /dev/null
+++ b/demos/chip/qt4logo.png
diff --git a/demos/chip/rotateleft.png b/demos/chip/rotateleft.png
new file mode 100644
index 0000000..8cfa931
--- /dev/null
+++ b/demos/chip/rotateleft.png
diff --git a/demos/chip/rotateright.png b/demos/chip/rotateright.png
new file mode 100644
index 0000000..ec5e866
--- /dev/null
+++ b/demos/chip/rotateright.png
diff --git a/demos/chip/view.cpp b/demos/chip/view.cpp
new file mode 100644
index 0000000..f919af3
--- /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 0000000..4987f60
--- /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 0000000..8b0daee
--- /dev/null
+++ b/demos/chip/zoomin.png
diff --git a/demos/chip/zoomout.png b/demos/chip/zoomout.png
new file mode 100644
index 0000000..1575dd2
--- /dev/null
+++ b/demos/chip/zoomout.png
diff --git a/demos/composition/composition.cpp b/demos/composition/composition.cpp
new file mode 100644
index 0000000..b43c66b
--- /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 0000000..1d504d0
--- /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 0000000..1848ad8
--- /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 0000000..d5c4a60
--- /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 0000000..d02c397
--- /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 0000000..f8e022c
--- /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 0000000..6a3c2a0
--- /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 0000000..74055b2
--- /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 0000000..db8484d
--- /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 0000000..2e59ebc
--- /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 0000000..e32fa12
--- /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 0000000..2e1d89a
--- /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 0000000..45edb26
--- /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 0000000..b3f63a8
--- /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 0000000..9248ab8
--- /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 0000000..7428b9f
--- /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 0000000..1bd99c9
--- /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 0000000..c0af3cf
--- /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 0000000..505e607
--- /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 0000000..bb02118
--- /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 0000000..c28a711
--- /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 0000000..4ee87f8
--- /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 0000000..80f92d6
--- /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 0000000..c28a711
--- /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 0000000..e108777
--- /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 0000000..6cb4be7
--- /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 0000000..3b57770
--- /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 0000000..c5abfb9
--- /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 0000000..84ce1d4
--- /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 0000000..f80e6ca
--- /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 0000000..3f4c1fe
--- /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 0000000..76d12ad
--- /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 0000000..05e820e
--- /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 0000000..04bbf05
--- /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 0000000..fccc7a3
--- /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 0000000..fd308b5
--- /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 0000000..c22f2ae
--- /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 0000000..bc157e5
--- /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 0000000..522f13b
--- /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 0000000..1304a19
--- /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 0000000..c3d727e
--- /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 0000000..669c488
--- /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 0000000..b20fbc4
--- /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 0000000..d2952e5
--- /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 0000000..1899825
--- /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 0000000..8369bc0
--- /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 0000000..377e369
--- /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 0000000..239f08a
--- /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 0000000..0addf37
--- /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 0000000..8f643b4
--- /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 0000000..27fb87b
--- /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 0000000..fc5c16d
--- /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 0000000..a632ad1
--- /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 0000000..aa87277
--- /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 0000000..9c0f77c
--- /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 0000000..3a04edb
--- /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 0000000..e69de29
--- /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 0000000..a0ab1fa
--- /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 0000000..e3a9912
--- /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 0000000..6a7472e
--- /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 0000000..ee5e4d6
--- /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 0000000..96237d4
--- /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 0000000..304dd36
--- /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 0000000..5ccb418
--- /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 0000000..586faea
--- /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 0000000..445567f
--- /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 0000000..56a0548
--- /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 0000000..0a5fbaf
--- /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 0000000..40f361c
--- /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 0000000..787196c
--- /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 0000000..f967b10
--- /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 0000000..a38e3e8
--- /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 0000000..33be503
--- /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 0000000..4cf7325
--- /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 0000000..6256ba9
--- /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 0000000..74e8417
--- /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 0000000..1ea2c0e
--- /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 0000000..167572b
--- /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 0000000..fb971eb
--- /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 0000000..f880510
--- /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 0000000..5089442
--- /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 0000000..589fd2d
--- /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 0000000..0c3d690
--- /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 0000000..6b2ad96
--- /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 0000000..c013755
--- /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 0000000..b28ea34
--- /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 0000000..9682322
--- /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 0000000..1d5040c
--- /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 0000000..96e6aea
--- /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 0000000..b5e4740
--- /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 0000000..156e793
--- /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 0000000..f5165a7
--- /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 0000000..2b01cfe
--- /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 0000000..ba6a076
--- /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 0000000..57c5ac6
--- /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 0000000..46268b5
--- /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 0000000..7edaf52
--- /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 0000000..9c7f620
--- /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 0000000..9853a55
--- /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 0000000..47ff22a
--- /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 0000000..48fa9fc
--- /dev/null
+++ b/demos/mainwindow/qt.png
diff --git a/demos/mainwindow/titlebarCenter.png b/demos/mainwindow/titlebarCenter.png
new file mode 100644
index 0000000..5cc1413
--- /dev/null
+++ b/demos/mainwindow/titlebarCenter.png
diff --git a/demos/mainwindow/titlebarLeft.png b/demos/mainwindow/titlebarLeft.png
new file mode 100644
index 0000000..3151662
--- /dev/null
+++ b/demos/mainwindow/titlebarLeft.png
diff --git a/demos/mainwindow/titlebarRight.png b/demos/mainwindow/titlebarRight.png
new file mode 100644
index 0000000..a450526
--- /dev/null
+++ b/demos/mainwindow/titlebarRight.png
diff --git a/demos/mainwindow/toolbar.cpp b/demos/mainwindow/toolbar.cpp
new file mode 100644
index 0000000..9de1348
--- /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 0000000..a9b9af2
--- /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 0000000..a15df92
--- /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 0000000..279a6c7
--- /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 0000000..5f5a5dc
--- /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 0000000..d162435
--- /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 0000000..c64abd9
--- /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 0000000..bcdf404
--- /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 0000000..d2cedd4
--- /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 0000000..613d835
--- /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 0000000..d079490
--- /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 0000000..99f17a7
--- /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 0000000..9e7e50d
--- /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 0000000..50b4de2
--- /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 0000000..a9a7234
--- /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 0000000..71b0059
--- /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 0000000..18343cb
--- /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 0000000..58865c6
--- /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 0000000..0335bd3
--- /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 0000000..e03327b
--- /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 0000000..92b2d24
--- /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 0000000..ad89ada
--- /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 0000000..29b73d3
--- /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 0000000..e4838c7
--- /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 0000000..cd549fc
--- /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 0000000..679e3fb
--- /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 0000000..7f26f04
--- /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 0000000..13473a3
--- /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 0000000..a568b8c
--- /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 0000000..850d64b
--- /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 0000000..1f3c355
--- /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 0000000..51ce6c3
--- /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 0000000..98328dc
--- /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 0000000..2179527
--- /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 0000000..ac01339
--- /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 0000000..93daaa8
--- /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 0000000..80a255a
--- /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 0000000..a5cb997
--- /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 0000000..e556011
--- /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 0000000..e73079a
--- /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 0000000..3280afa
--- /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 0000000..21b17df
--- /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 0000000..186c69c
--- /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 0000000..fff52bb
--- /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 0000000..27e399c
--- /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 0000000..7b814b1
--- /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 0000000..8c3f16e
--- /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 0000000..bf2028d
--- /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 0000000..8723823
--- /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 0000000..388a392
--- /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 0000000..a74cfe4
--- /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 0000000..737492d
--- /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 0000000..bfa2e3f
--- /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 0000000..3a12c54
--- /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 0000000..def5f0e
--- /dev/null
+++ b/demos/qtdemo/qtdemo.icns
diff --git a/demos/qtdemo/qtdemo.ico b/demos/qtdemo/qtdemo.ico
new file mode 100644
index 0000000..016c77f
--- /dev/null
+++ b/demos/qtdemo/qtdemo.ico
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro
new file mode 100644
index 0000000..2534b75
--- /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 0000000..b30dd58
--- /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 0000000..4cf2a63
--- /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 0000000..0eab840
--- /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 0000000..b0b5ffc
--- /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 0000000..f45ba0d
--- /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 0000000..bfed5d2
--- /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 0000000..96e1a23
--- /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 0000000..b7c91fb
--- /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 0000000..df2d93b
--- /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 0000000..846d2f3
--- /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 0000000..ec79361
--- /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 0000000..f9eed99
--- /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 0000000..4d55b61
--- /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 0000000..70062f6
--- /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 0000000..cf8742d
--- /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 0000000..ee67026
--- /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 0000000..db31dd9
--- /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 0000000..38ead1c
--- /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 0000000..87abe67
--- /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 0000000..66bfc13
--- /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 0000000..3d4cfe2
--- /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 0000000..4dd4ad1
--- /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 0000000..034b474
--- /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 0000000..889b40d
--- /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 0000000..0b3023f
--- /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 0000000..0021e35
--- /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 0000000..40f331c
--- /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 0000000..023af8c
--- /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 0000000..001f3a7
--- /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 0000000..58c68d4
--- /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 0000000..6a7e8d3
--- /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 0000000..af2fe06
--- /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 0000000..fdf2e97
--- /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 0000000..f47b67d
--- /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 0000000..c122f46
--- /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 0000000..1056b78
--- /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 0000000..5746ef9
--- /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 0000000..98d9cd9
--- /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 0000000..1a0a328
--- /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 0000000..1c61442
--- /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 0000000..0d9bb97
--- /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 0000000..d5bc7ea
--- /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 0000000..a2f9a35
--- /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 0000000..60ef3f9
--- /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 0000000..af1753a
--- /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 0000000..f875838
--- /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 0000000..400906e
--- /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 0000000..50a049e
--- /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 0000000..1b3d62c
--- /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 0000000..d7f141d
--- /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 0000000..8e1f510
--- /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 0000000..2d47507
--- /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 0000000..dc3ff85
--- /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 0000000..1104334
--- /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 0000000..b551595
--- /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 0000000..cabce25
--- /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 0000000..17336ec
--- /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 0000000..0c3d690
--- /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 0000000..7a71641
--- /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 0000000..76c4ae8
--- /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 0000000..3f2b918
--- /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 0000000..742855e
--- /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 0000000..944433d
--- /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 0000000..b62f244
--- /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 0000000..13f496d
--- /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 0000000..465c92f
--- /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 0000000..3b7b9ac
--- /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 0000000..8f94b87
--- /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 0000000..5996d73
--- /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 0000000..f7b24db
--- /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 0000000..787675b
--- /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 0000000..20946f0
--- /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 0000000..7df28ac
--- /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 0000000..5c48414
--- /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 0000000..b7b7fe5
--- /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 0000000..a2e3c89
--- /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 0000000..d5f3456
--- /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 0000000..91a8700
--- /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 0000000..920e8a0
--- /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 0000000..19b5520
--- /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 0000000..5f91e98
--- /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 0000000..f551364
--- /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 0000000..a784fd5
--- /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 0000000..64c0b2d
--- /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 0000000..8875bf2
--- /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 0000000..a3bd5e0
--- /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 0000000..ebb44e6
--- /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 0000000..d3882c7
--- /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 0000000..fc06c5e
--- /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 0000000..10ca56c
--- /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 0000000..b41ecf5
--- /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 0000000..38400bd
--- /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 0000000..2ef5b2e
--- /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 0000000..0170ee2
--- /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 0000000..39cd6c1
--- /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 0000000..83a66d5
--- /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 0000000..e7c0464
--- /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 0000000..968bac5
--- /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 0000000..d46f5af
--- /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 0000000..4632656
--- /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 0000000..1121b47
--- /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 0000000..38e55f7
--- /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 0000000..ffab15a
--- /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 0000000..9d679fe
--- /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 0000000..eee23d2
--- /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 0000000..eef5132
--- /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 0000000..af5d122
--- /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 0000000..fc6f17e
--- /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 0000000..ba7c02d
--- /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 0000000..8feec99
--- /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 0000000..9cbc713
--- /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 0000000..11efb4b
--- /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 0000000..b30ce14
--- /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 0000000..9de0c88
--- /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 0000000..16f80bc
--- /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 0000000..16872df
--- /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 0000000..c72eff5
--- /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 0000000..2e586fc
--- /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 0000000..a736d39
--- /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 0000000..fa38ecb
--- /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 0000000..128cd6a
--- /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 0000000..53279b9
--- /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 0000000..1fb09f9
--- /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 0000000..1ef4256
--- /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 0000000..7d6efd7
--- /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 0000000..4802e34
--- /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 0000000..f98cb6d
--- /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 0000000..df435fd
--- /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 0000000..0b12ad0
--- /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 0000000..3bc5ed8
--- /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 0000000..4e181bb
--- /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 0000000..ed16c6e
--- /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 0000000..539cb2e
--- /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 0000000..c5483d1
--- /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 0000000..57e57e3
--- /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 0000000..33e0d63
--- /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 0000000..57fd5e2
--- /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 0000000..e2e7cc9
--- /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 0000000..e355ea9
--- /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 0000000..3a7d979
--- /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 0000000..58c3e72
--- /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 0000000..5591517
--- /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 0000000..7a7b048
--- /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 0000000..2969131
--- /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 0000000..8cf63a8
--- /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 0000000..f36a6e8
--- /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 0000000..409fd14
--- /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 0000000..5340e94
--- /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 0000000..91a0b43
--- /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 0000000..e26d07c
--- /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 0000000..65619b8
--- /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 0000000..110be1c
--- /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 0000000..1226d65
--- /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 0000000..892395b
--- /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 0000000..5353e12
--- /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 0000000..205a476
--- /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 0000000..52555d1
--- /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 0000000..a36abeb
--- /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 0000000..80be555
--- /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 0000000..cf9f7a1
--- /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 0000000..ff9d2a7
--- /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 0000000..d4d2c2c
--- /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 0000000..255d89c
--- /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 0000000..b6b2d65
--- /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 0000000..3c5843d
--- /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 0000000..63b3dbb
--- /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 0000000..11e9b37
--- /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 0000000..35d9ed0
--- /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 0000000..6c40f61
--- /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 0000000..d99b636
--- /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 0000000..831dd87
--- /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 0000000..0a40bf9
--- /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 0000000..c71578f
--- /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 0000000..80e814a
--- /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 0000000..1f5f986
--- /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 0000000..31ccc55
--- /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 0000000..7e47a53
--- /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 0000000..4a224bf
--- /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 0000000..1dcfea7
--- /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 0000000..5dccbad
--- /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 0000000..943c368
--- /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 0000000..08f222a
--- /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 0000000..a0794cf
--- /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 0000000..bb653fe
--- /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 0000000..d5444a8
--- /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 0000000..1df0851
--- /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 0000000..5f271fe
--- /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 0000000..1f6ad5b
--- /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 0000000..2c73e77
--- /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 0000000..0d55b12
--- /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 0000000..cc49e6e
--- /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 0000000..a3f44a5
--- /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 0000000..174a1b3
--- /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 0000000..dbed175
--- /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 0000000..26fb022
--- /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 0000000..211c8ef
--- /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 0000000..e7089a7
--- /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 0000000..ec084d6
--- /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 0000000..f080946
--- /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 0000000..527992f
--- /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 0000000..f5c8c14
--- /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 0000000..41a5742
--- /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 0000000..79e0136
--- /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 0000000..6d99213
--- /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 0000000..cdd3514
--- /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 0000000..98910a8
--- /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 0000000..c5a2915
--- /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 0000000..e6d1424
--- /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 0000000..a88e930
--- /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 0000000..8523592
--- /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 0000000..8a7433b
--- /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 0000000..55ea305
--- /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 0000000..72213de
--- /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 0000000..8dde96a
--- /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 0000000..8839f76
--- /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 0000000..d9464ed
--- /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 0000000..f95bf0c
--- /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 0000000..540d636
--- /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 0000000..f08aac6
--- /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 0000000..396a5b7
--- /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 0000000..fac0ce0
--- /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 0000000..b18539d
--- /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 0000000..7c26a30
--- /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 0000000..59f0c71
--- /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 0000000..426959e
--- /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 0000000..fefc91b
--- /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 0000000..f42da27
--- /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 0000000..b2a994d
--- /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 0000000..5cbcc2c
--- /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 0000000..25131a1
--- /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 0000000..8041602
--- /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 0000000..530c650
--- /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 0000000..f4e1d1a
--- /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 0000000..71de8e9
--- /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 0000000..2bec4e6
--- /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 0000000..5bf6da0
--- /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 0000000..fe076d9
--- /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 0000000..c674d87
--- /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 0000000..41aaea8
--- /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 0000000..5d78e57
--- /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 0000000..009dc33
--- /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 0000000..fab21ad
--- /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 0000000..7875f2c
--- /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 0000000..4995a86
--- /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 0000000..192bbd1
--- /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 0000000..f33cede
--- /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 0000000..3fc075f
--- /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 0000000..6b77f88
--- /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 0000000..a87878e
--- /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 0000000..538a245
--- /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 0000000..090da86
--- /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 0000000..9465a31
--- /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 0000000..b9156f0
--- /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 0000000..c570dcd
--- /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 0000000..aba0b58
--- /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 0000000..ea13e59
--- /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 0000000..1950c45
--- /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 0000000..4d29337
--- /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 0000000..6a735d2
--- /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 0000000..5c0973b
--- /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 0000000..2a17a34
--- /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 0000000..c25da2b
--- /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 0000000..eaeed3e
--- /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 0000000..987468c
--- /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 0000000..62bbdb5
--- /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 0000000..d107277
--- /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 0000000..604d233
--- /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 0000000..114e28d
--- /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 0000000..81eecfc
--- /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 0000000..3c651fb
--- /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 0000000..da5a82f
--- /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 0000000..9cc8df5
--- /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 0000000..25e496e
--- /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 0000000..38c5d3c
--- /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 0000000..b491b2a
--- /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 0000000..db1155e
--- /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 0000000..34bb80d
--- /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 0000000..9e9b7b4
--- /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 0000000..9c2c9d7
--- /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 0000000..2b94e15
--- /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 0000000..f7d20cc
--- /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 0000000..3e8575a
--- /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 0000000..c32c13c
--- /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 0000000..3a59275
--- /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 0000000..58f2b65
--- /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 0000000..0e66908
--- /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 0000000..1c817f6
--- /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 0000000..88eb7d6
--- /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 0000000..68c3656
--- /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 0000000..a99fc4a
--- /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 0000000..401986a
--- /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 0000000..d2c7a9e
--- /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 0000000..9eb43b7
--- /dev/null
+++ b/doc/src/designer-manual.qdoc
@@ -0,0 +1,2762 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** 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.
+
+    If you would like to use a container widget that is not a subclass of the
+    containers provided in \QD, but the container is still based on the notion
+    of \e{Current Page}, you need to provide a container extension and
+    tell \QD which method to use to add the pages. This can be done using the
+    \c{<addpagemethod>} XML tag.
+
+
+    \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 0000000..e52b8d8
--- /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 0000000..00c54b6
--- /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 0000000..3b03341
--- /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 0000000..1bf39c2
--- /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 0000000..d728889
--- /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 0000000..3ea5921
--- /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 0000000..d85439c
--- /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 0000000..3401dc3
--- /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 0000000..01ff8ce
--- /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 0000000..99c741d
--- /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 0000000..4c4c51d
--- /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 0000000..cd81ebe
--- /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 0000000..dcc6072
--- /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 0000000..21c7981
--- /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 0000000..c4bbeea
--- /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 0000000..a3afed4
--- /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 0000000..a4b0668
--- /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 0000000..22689ea
--- /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 0000000..21d205e
--- /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 0000000..a9fc405
--- /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 0000000..89e0b1b
--- /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 0000000..3006044
--- /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 0000000..975287d
--- /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 0000000..323065e
--- /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 0000000..fe73f5a
--- /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 0000000..24f46c4
--- /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 0000000..30d7a61
--- /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 0000000..7de01af
--- /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 0000000..2b95f64
--- /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 0000000..cdadf10
--- /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 0000000..a525208
--- /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 0000000..fead6c4
--- /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 0000000..f208569
--- /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 0000000..27e4637
--- /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 0000000..84fd561
--- /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 0000000..96a878e
--- /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 0000000..d20f4f1
--- /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 0000000..4124ecc
--- /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 0000000..97b4beb
--- /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 0000000..960da83
--- /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 0000000..0492df6
--- /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 0000000..8e81dd9
--- /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 0000000..cde92d9
--- /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 0000000..08395eb
--- /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 0000000..ca1a5b3
--- /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 0000000..6b82373
--- /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 0000000..e673b3c
--- /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 0000000..96a9d69
--- /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 0000000..1c3d3ca
--- /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 0000000..33aa0d6
--- /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 0000000..f9e64c8
--- /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 0000000..8338d08
--- /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 0000000..67d81e4
--- /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 0000000..d242646
--- /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 0000000..d530186
--- /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 0000000..07a49ba
--- /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 0000000..d800c31
--- /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 0000000..b5b2934
--- /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 0000000..d92a88a
--- /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 0000000..780b1ac
--- /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 0000000..7be4891
--- /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 0000000..00664a6
--- /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 0000000..c2f1beb
--- /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 0000000..76ecbe0
--- /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 0000000..3a3ab54
--- /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 0000000..e8078e0
--- /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 0000000..bddbf0e
--- /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 0000000..dc43d9e
--- /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 0000000..e94abd9
--- /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 0000000..e8dd39f
--- /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 0000000..9101e89
--- /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 0000000..fcce637
--- /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 0000000..69b7ee6
--- /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 0000000..593a2de
--- /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 0000000..698f271
--- /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 0000000..96646ab
--- /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 0000000..4696516
--- /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 0000000..7382bad
--- /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 0000000..2c11da4
--- /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 0000000..7ba8f77
--- /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 0000000..a985b70
--- /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 0000000..6be469c
--- /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 0000000..293394f
--- /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 0000000..a68ef21
--- /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 0000000..a97840f
--- /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 0000000..80dc2f1
--- /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 0000000..5075128
--- /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 0000000..90cfb51
--- /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 0000000..1e20f39
--- /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 0000000..7458643
--- /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 0000000..91a4e97
--- /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 0000000..cc2242e
--- /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 0000000..cdf852d
--- /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 0000000..7474928
--- /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 0000000..dd1b00d
--- /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 0000000..69d63b8
--- /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 0000000..710e2fc
--- /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 0000000..f52ba98
--- /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 0000000..a508261
--- /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 0000000..ecc5001
--- /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 0000000..d9e5876
--- /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 0000000..d698413
--- /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 0000000..16e0bb2
--- /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 0000000..b66a851
--- /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 0000000..31da50d
--- /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 0000000..6b6c544
--- /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 0000000..4533469
--- /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 0000000..fec7b44
--- /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 0000000..758283e
--- /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 0000000..426dbcc
--- /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 0000000..be2bd38
--- /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 0000000..4394f58
--- /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 0000000..6bd0495
--- /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 0000000..2fc78c6
--- /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 0000000..7ec25ae
--- /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 0000000..c30aa84
--- /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 0000000..5484fab
--- /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 0000000..3d781b5
--- /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 0000000..f91ad48
--- /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 0000000..7e546ef
--- /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 0000000..fe86c19
--- /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 0000000..7170bb6
--- /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 0000000..9496512
--- /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 0000000..106f86d
--- /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 0000000..78cab56
--- /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 0000000..a0b8064
--- /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 0000000..d0892e5
--- /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 0000000..d79e94f
--- /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 0000000..df0466b
--- /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 0000000..fc3c97a
--- /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 0000000..07f388b
--- /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 0000000..eb00206
--- /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 0000000..907ff3c
--- /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 0000000..ca7c3db
--- /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 0000000..64c630a
--- /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 0000000..4d5bf37
--- /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 0000000..0a90fa9
--- /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 0000000..09fede7
--- /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 0000000..7bb3762
--- /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 0000000..0fdc02a
--- /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 0000000..bd9a079
--- /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 0000000..87606f7
--- /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 0000000..008eadf
--- /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 0000000..eb683b6
--- /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 0000000..6469c8c
--- /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 0000000..bfdf68b
--- /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 0000000..cbf595c
--- /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 0000000..746b22d
--- /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 0000000..1df0de5
--- /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 0000000..f784d59
--- /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 0000000..878257b
--- /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 0000000..b1c9b86
--- /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 0000000..a8a7b13
--- /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 0000000..53a65e9
--- /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 0000000..d34dacd
--- /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 0000000..cb0cfe0
--- /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 0000000..a11a3b5
--- /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 0000000..a7258a4
--- /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 0000000..6de60c4
--- /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 0000000..85340ce
--- /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 0000000..20ee523
--- /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 0000000..140f00a
--- /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 0000000..f1062cb
--- /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 0000000..6705317
--- /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 0000000..7a73e59
--- /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 0000000..e9f77e6
--- /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 0000000..cf87c3a
--- /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 0000000..b404114
--- /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 0000000..779cc82
--- /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 0000000..0abbbfa
--- /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 0000000..a73f135
--- /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 0000000..b4a36af
--- /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 0000000..42d1644
--- /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 0000000..f8e9b4f
--- /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 0000000..2a288d9
--- /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 0000000..48aecba
--- /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 0000000..628df46
--- /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 0000000..e920e7c
--- /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 0000000..6941c81
--- /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 0000000..8c28854
--- /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 0000000..4868352
--- /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 0000000..aeadd1c
--- /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 0000000..2a91be6
--- /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 0000000..96aedb8
--- /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 0000000..3b72701
--- /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 0000000..653735e
--- /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 0000000..05b6620
--- /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 0000000..76a7c43
--- /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 0000000..5acb425
--- /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 0000000..4c6f6f3
--- /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 0000000..7dd1d74
--- /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 0000000..3dbbe64
--- /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 0000000..b5087a6
--- /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 0000000..fcafe67
--- /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 0000000..2c18459
--- /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 0000000..b232c14
--- /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 0000000..8a99406
--- /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 0000000..6b1f290
--- /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 0000000..7ea7fe3
--- /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 0000000..093735b
--- /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 0000000..404ab2b
--- /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 0000000..54868cb
--- /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 0000000..6cc18ab
--- /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 0000000..e3bf8a3
--- /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 0000000..f71163f
--- /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 0000000..dc84d19
--- /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 0000000..d1adec1
--- /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 0000000..2c8af54
--- /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 0000000..c2ed76c
--- /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 0000000..209e59b
--- /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 0000000..d20d69b
--- /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 0000000..624f279
--- /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 0000000..df50e03
--- /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 0000000..1423b05
--- /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 0000000..8b13ea9
--- /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 0000000..d2ed505
--- /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 0000000..76dfd0c
--- /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 0000000..62fdc91
--- /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 0000000..c927ad9
--- /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 0000000..d02187e
--- /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 0000000..d6f426a
--- /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 0000000..a476b58
--- /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 0000000..373e04c
--- /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 0000000..a83fd44
--- /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 0000000..a5698bb
--- /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 0000000..2a4008c
--- /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 0000000..c3923a5
--- /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 0000000..868a36a
--- /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 0000000..721cb30
--- /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 0000000..7dd40fd
--- /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 0000000..200f348
--- /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 0000000..5599cdb
--- /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 0000000..c638dbc
--- /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 0000000..9212594
--- /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 0000000..eac8763
--- /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 0000000..34de0e9
--- /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 0000000..5734103
--- /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 0000000..cc40f16
--- /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 0000000..218d90e
--- /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 0000000..8e98d42
--- /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 0000000..6cd5b2a
--- /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 0000000..36dd3e2
--- /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 0000000..0e12fc4
--- /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 0000000..80bbb5a
--- /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 0000000..5e72c36
--- /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 0000000..8a9d8f3
--- /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 0000000..da35a4a
--- /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 0000000..9d2da07
--- /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 0000000..7503cc8
--- /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 0000000..ffbdb5a
--- /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 0000000..9e04271
--- /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 0000000..86ca13e
--- /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 0000000..d095655
--- /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 0000000..65a2967
--- /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 0000000..38115a2
--- /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 0000000..69d4af4
--- /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 0000000..c42af7f
--- /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 0000000..22651b8
--- /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 0000000..ea930d5
--- /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 0000000..ed22884
--- /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 0000000..50a5d5a
--- /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 0000000..b762be3
--- /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 0000000..68f98ae
--- /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 0000000..050f0ac
--- /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 0000000..c533809
--- /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 0000000..8ab83cb
--- /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 0000000..85e6ed4
--- /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 0000000..390c956
--- /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 0000000..86f3a86
--- /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 0000000..bf3d2cc
--- /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 0000000..7810fdb
--- /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 0000000..d3e2885
--- /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 0000000..917eea1
--- /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 0000000..103a2e6
--- /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 0000000..3f6f2c0
--- /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 0000000..7e875dd
--- /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 0000000..5f13d9b
--- /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 0000000..a2d0c66
--- /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 0000000..6d4da7b
--- /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 0000000..128f232
--- /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 0000000..f739ae0
--- /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 0000000..a3a5d93
--- /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 0000000..79115d6
--- /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 0000000..b94b07f
--- /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 0000000..28b0a39
--- /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 0000000..c952731
--- /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 0000000..9a4b053
--- /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 0000000..b3477e8
--- /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 0000000..0ab376b
--- /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 0000000..7626820
--- /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 0000000..5ad12c6
--- /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 0000000..a80ade5
--- /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 0000000..01fcca1
--- /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 0000000..47a5505
--- /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 0000000..82b6f2c
--- /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 0000000..9b7b587
--- /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 0000000..997153d
--- /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 0000000..9a93682
--- /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 0000000..ad57384
--- /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 0000000..8c7bfac
--- /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 0000000..cbd3c89
--- /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 0000000..50f8543
--- /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 0000000..79fae26
--- /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 0000000..dab379f
--- /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 0000000..1972905
--- /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 0000000..2d3f2ff
--- /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 0000000..e101577
--- /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 0000000..759a41b
--- /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 0000000..b852b63
--- /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 0000000..640b689
--- /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 0000000..afcaf63
--- /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 0000000..f689c33
--- /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 0000000..e6c8f85
--- /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 0000000..4f72648
--- /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 0000000..1b35455
--- /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 0000000..18f2fb6
--- /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 0000000..d542c3b
--- /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 0000000..38e55f7
--- /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 0000000..717dd86
--- /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 0000000..dd795cf
--- /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 0000000..1b3e69f
--- /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 0000000..808c97e
--- /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 0000000..46eac82
--- /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 0000000..7700d6f
--- /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 0000000..05c92bd
--- /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 0000000..30c3ee6
--- /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 0000000..99dc873
--- /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 0000000..15c13ea
--- /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 0000000..2afb769
--- /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 0000000..3492f95
--- /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 0000000..9d679fe
--- /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 0000000..6ea35e9
--- /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 0000000..eee23d2
--- /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 0000000..0b5d46a
--- /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 0000000..fd63bb4
--- /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 0000000..b132282
--- /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 0000000..02cb311
--- /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 0000000..784f486
--- /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 0000000..3018c12
--- /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 0000000..d239250
--- /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 0000000..1013115
--- /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 0000000..9cba683
--- /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 0000000..78ebe89
--- /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 0000000..865ba9c
--- /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 0000000..15352b2
--- /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 0000000..e5289ac
--- /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 0000000..4479a13
--- /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 0000000..32a4606
--- /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 0000000..7e9dfac
--- /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 0000000..cc19460
--- /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 0000000..3c8ad7d
--- /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 0000000..ac5529a
--- /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 0000000..cf77802
--- /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 0000000..89c19cc
--- /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 0000000..9e6b30c
--- /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 0000000..19e69b0
--- /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 0000000..1ba0473
--- /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 0000000..4e8a492
--- /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 0000000..717d9da
--- /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 0000000..2501124
--- /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 0000000..f66d5fa
--- /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 0000000..6513c12
--- /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 0000000..8e27015
--- /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 0000000..faf7e11
--- /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 0000000..df54743
--- /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 0000000..5fe142d
--- /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 0000000..53ab0b5
--- /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 0000000..6d9eb36
--- /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 0000000..b6046fc
--- /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 0000000..260488d
--- /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 0000000..ee71214
--- /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 0000000..b8c603b
--- /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 0000000..cb3b041
--- /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 0000000..b2b408a
--- /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 0000000..1e9e851
--- /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 0000000..1e37cd3
--- /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 0000000..f043ca7
--- /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 0000000..97fa569
--- /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 0000000..ed401cc
--- /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 0000000..5358cee
--- /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 0000000..cbeac40
--- /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 0000000..f153820
--- /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 0000000..ebc4357
--- /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 0000000..e520285
--- /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 0000000..c78659f
--- /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 0000000..095d51f
--- /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 0000000..f35b48b
--- /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 0000000..593861e
--- /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 0000000..bc455e5
--- /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 0000000..9bb503d
--- /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 0000000..58f5cad
--- /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 0000000..7842769
--- /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 0000000..203befd
--- /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 0000000..6473e21
--- /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 0000000..92ed546
--- /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 0000000..371327f
--- /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 0000000..0c19197
--- /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 0000000..a08a122
--- /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 0000000..1f741f3
--- /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 0000000..d62303f
--- /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 0000000..5064938
--- /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 0000000..69fa46d
--- /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 0000000..986fbc5
--- /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 0000000..83bb4a6
--- /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 0000000..4896a11
--- /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 0000000..4c0792d
--- /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 0000000..0396d80
--- /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 0000000..77be4ee
--- /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 0000000..4447923
--- /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 0000000..d5198dc
--- /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 0000000..7e5da3e
--- /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 0000000..975183b
--- /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 0000000..76223c2
--- /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 0000000..4e445dd
--- /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 0000000..21c5b14
--- /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 0000000..50d462e
--- /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 0000000..d877f98
--- /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 0000000..b6fb649
--- /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 0000000..709aef1
--- /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 0000000..0363904
--- /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 0000000..4441427
--- /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 0000000..c2b5787
--- /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 0000000..9d2d9e7
--- /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 0000000..8a399d6
--- /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 0000000..2db5399
--- /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 0000000..6c991cc
--- /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 0000000..3e6eb5b
--- /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 0000000..75b45f5
--- /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 0000000..cca31f3
--- /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 0000000..07f562d
--- /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 0000000..a72671f
--- /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 0000000..abacde9
--- /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 0000000..531a34c
--- /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 0000000..d2b5c18
--- /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 0000000..5f4d889
--- /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 0000000..e670eac
--- /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 0000000..bcf52bb
--- /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 0000000..e339a63
--- /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 0000000..b37c5a6
--- /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 0000000..4f8bcb6
--- /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 0000000..58d7c28
--- /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 0000000..96076ed
--- /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 0000000..8d38864
--- /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 0000000..04f9c99
--- /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 0000000..78d705d
--- /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 0000000..73a9937
--- /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 0000000..05a70bf
--- /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 0000000..9ab824f
--- /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 0000000..d3ad995
--- /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 0000000..bd7b9ef
--- /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 0000000..3ac0f80
--- /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 0000000..a679205
--- /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 0000000..ba3b020
--- /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 0000000..5a62f02
--- /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 0000000..b591e19
--- /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 0000000..d67a603
--- /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 0000000..73a8e8a
--- /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 0000000..109b69e
--- /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 0000000..7da1fdc
--- /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 0000000..9083a07
--- /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 0000000..4188a23
--- /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 0000000..b479d4d
--- /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 0000000..5f20e2e
--- /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 0000000..833f606
--- /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 0000000..1d2d4ce
--- /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 0000000..6c1be60
--- /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 0000000..1523dad
--- /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 0000000..a76246c
--- /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 0000000..f4ea2de
--- /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 0000000..71a94cc
--- /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 0000000..5b0f1ba
--- /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 0000000..0ef3e40
--- /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 0000000..dedac0d
--- /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 0000000..a1fda3f
--- /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 0000000..8303215
--- /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 0000000..ef2f6e4
--- /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 0000000..5f6b304
--- /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 0000000..69e5f15
--- /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 0000000..9b88dc4
--- /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 0000000..119922b
--- /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 0000000..303b752
--- /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 0000000..5d3b35c
--- /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 0000000..67fe8e6
--- /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 0000000..e38ebe3
--- /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 0000000..54e65c5
--- /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 0000000..2c1ff00
--- /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 0000000..b6fb631
--- /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 0000000..b06c132
--- /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 0000000..67f92a5
--- /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 0000000..3ed23c3
--- /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 0000000..fc86dd9
--- /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 0000000..11b3f03
--- /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 0000000..ca33eda
--- /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 0000000..79edf34
--- /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 0000000..d52abfb
--- /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 0000000..9d6fad6
--- /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 0000000..8b819b6
--- /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 0000000..9cdf414
--- /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 0000000..283193c
--- /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 0000000..06ca08c
--- /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 0000000..549574d
--- /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 0000000..c9cb049
--- /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 0000000..31aea59
--- /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 0000000..05f3fb5
--- /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 0000000..afe7034
--- /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 0000000..9d0cb5e
--- /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 0000000..868d0ce
--- /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 0000000..6ce1625
--- /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 0000000..ee174bf
--- /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 0000000..d15371b
--- /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 0000000..44df0c4
--- /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 0000000..05c9d08
--- /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 0000000..c29feeb
--- /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 0000000..45a346c
--- /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 0000000..e79e542
--- /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 0000000..46b83f9
--- /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 0000000..1457119
--- /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 0000000..017da30
--- /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 0000000..fb5c1ea
--- /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 0000000..d42df66
--- /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 0000000..d5f7273
--- /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 0000000..32e8c10
--- /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 0000000..76b753b
--- /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 0000000..5297201
--- /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 0000000..92571af
--- /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 0000000..0d64b1f
--- /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 0000000..557729a
--- /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 0000000..5c9dbe1
--- /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 0000000..6275249
--- /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 0000000..253b68b
--- /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 0000000..05975aa
--- /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 0000000..b7f416b
--- /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 0000000..2cae6ce
--- /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 0000000..c63267e
--- /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 0000000..a8e891e
--- /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 0000000..e6beef4
--- /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 0000000..f4417c2
--- /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 0000000..9d62c71
--- /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 0000000..64c00db
--- /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 0000000..22f8a51
--- /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 0000000..a36edf7
--- /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 0000000..cb38cbe
--- /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 0000000..669ab45
--- /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 0000000..7ea2ca2
--- /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 0000000..768bb51
--- /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 0000000..cf44bdb
--- /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 0000000..f47ba07
--- /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 0000000..dd05a41
--- /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 0000000..7c36b0d
--- /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 0000000..afb1c5f
--- /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 0000000..a4fbcea
--- /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 0000000..a45b8bb
--- /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 0000000..8d0404a
--- /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 0000000..5778581
--- /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 0000000..ffeccc3
--- /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 0000000..d335c28
--- /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 0000000..31ad65b
--- /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 0000000..88f6d51
--- /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 0000000..f062c23
--- /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 0000000..5b13abe
--- /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 0000000..6b15978
--- /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 0000000..ef31bd2
--- /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 0000000..dc65902
--- /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 0000000..cd1c4ae
--- /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 0000000..ebf93e2
--- /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 0000000..0ff4642
--- /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 0000000..2cbfcfe
--- /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 0000000..bc9f5f1
--- /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 0000000..f3944ef
--- /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 0000000..0e6ed09
--- /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 0000000..d3f97b0
--- /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 0000000..23150f9
--- /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 0000000..4d3d89d
--- /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 0000000..344b9e7
--- /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 0000000..4780b82
--- /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 0000000..96b791b
--- /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 0000000..32ad15b
--- /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 0000000..da01830
--- /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 0000000..90f2f01
--- /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 0000000..8a0ca3a
--- /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 0000000..5434098
--- /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 0000000..e53769c
--- /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 0000000..db41f43
--- /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 0000000..557ba39
--- /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 0000000..1fbb879
--- /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 0000000..b98f5bd
--- /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 0000000..cbdd164
--- /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 0000000..e6a7f85
--- /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 0000000..3220641
--- /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 0000000..721706a
--- /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 0000000..de95b52
--- /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 0000000..9cc9cd1
--- /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 0000000..e1b83fe
--- /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 0000000..efb5b6f
--- /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 0000000..c5f6a62
--- /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 0000000..2fc51a3
--- /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 0000000..0293584
--- /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 0000000..5662680
--- /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 0000000..72efd11
--- /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 0000000..17404a8
--- /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 0000000..68d9153
--- /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 0000000..750ef2e
--- /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 0000000..8cba805
--- /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 0000000..6881673
--- /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 0000000..99ef7d4
--- /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 0000000..a702c06
--- /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 0000000..ee702ae
--- /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 0000000..b4489b1
--- /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 0000000..3b2395c
--- /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 0000000..b100f71
--- /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 0000000..d2a3ee1
--- /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 0000000..d7dc0e2
--- /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 0000000..f97db5e
--- /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 0000000..0500101
--- /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 0000000..e271265
--- /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 0000000..00e42c6
--- /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 0000000..ff2f00f
--- /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 0000000..d23c1f1
--- /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 0000000..3caeb9a
--- /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 0000000..f6f2607
--- /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 0000000..e19f54b
--- /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 0000000..f43725b
--- /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 0000000..fd27566
--- /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 0000000..347cf3d
--- /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 0000000..5426852
--- /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 0000000..2a8b43d
--- /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 0000000..3cdd8a4
--- /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 0000000..d32732f
--- /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 0000000..76943df
--- /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 0000000..9cbeec1
--- /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 0000000..ce1dab6
--- /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 0000000..74b4be0
--- /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 0000000..9f5295d
--- /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 0000000..41909fb
--- /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 0000000..5c40552
--- /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 0000000..d7d3227
--- /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 0000000..1d713f8
--- /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 0000000..f8d85a2
--- /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 0000000..c96db6a
--- /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 0000000..296f609
--- /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 0000000..bbd1427
--- /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 0000000..7059043
--- /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 0000000..185cbf1
--- /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 0000000..ba06b7e
--- /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 0000000..de6cbfc
--- /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 0000000..5e944c2
--- /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 0000000..698ad1f
--- /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 0000000..73ff68c
--- /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 0000000..1c8202c
--- /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 0000000..3db87d6
--- /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 0000000..b989a32
--- /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 0000000..4dc1783
--- /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 0000000..cfe351c
--- /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 0000000..e93bf20
--- /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 0000000..a387350
--- /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 0000000..5ce1e49
--- /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 0000000..369553b
--- /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 0000000..f323977
--- /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 0000000..fe8700a
--- /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 0000000..8d2d102
--- /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 0000000..2a5e45c0
--- /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 0000000..5ddeb46
--- /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 0000000..2fdbf25
--- /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 0000000..817f5e2
--- /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 0000000..650fdcb
--- /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 0000000..542eebd
--- /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 0000000..d8b0daa
--- /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 0000000..173aea4
--- /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 0000000..db533ed
--- /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 0000000..fde3316
--- /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 0000000..0dea7bf
--- /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 0000000..b68a310
--- /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 0000000..811d65c
--- /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 0000000..c94d408
--- /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 0000000..affc85f
--- /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 0000000..7cc9e61
--- /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 0000000..62bc05c
--- /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 0000000..c9500af
--- /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 0000000..e3d4a22
--- /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 0000000..476bba1
--- /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 0000000..b02da6c
--- /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 0000000..b9adb98
--- /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 0000000..2eea15d
--- /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 0000000..cc5a6b6
--- /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 0000000..2f0389c3
--- /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 0000000..d5f2571
--- /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 0000000..5daa2b2
--- /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 0000000..8805dad
--- /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 0000000..c9b6890
--- /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 0000000..eabb803
--- /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 0000000..82e9c24
--- /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 0000000..360ea00
--- /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 0000000..38251ee
--- /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 0000000..3d0965f
--- /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 0000000..dce0411
--- /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 0000000..5406c77
--- /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 0000000..b25206e
--- /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 0000000..644ffdb
--- /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 0000000..072b1f0
--- /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 0000000..925a7a0
--- /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 0000000..f67950c
--- /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 0000000..f48c3d7
--- /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 0000000..defb3e0
--- /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 0000000..4aa0851
--- /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 0000000..36916a2
--- /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 0000000..7ae5385
--- /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 0000000..8251f04
--- /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 0000000..608713d
--- /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 0000000..79c44b1
--- /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 0000000..b184ea8
--- /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 0000000..40ba7ce
--- /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 0000000..1ad8823
--- /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 0000000..dcb8e82
--- /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 0000000..dc9f732
--- /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 0000000..b17aa39
--- /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 0000000..e423171
--- /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 0000000..049b0c3
--- /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 0000000..c9cedc4
--- /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 0000000..888368b
--- /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 0000000..2b70964
--- /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 0000000..4b16294
--- /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 0000000..5018b51
--- /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 0000000..2a77e7d
--- /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 0000000..18d2f4e
--- /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 0000000..40cd6dc
--- /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 0000000..8b82158
--- /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 0000000..e2bab80
--- /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 0000000..2920f16
--- /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 0000000..fd41ee6
--- /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 0000000..b743c16
--- /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 0000000..ebd14b6
--- /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 0000000..ff215a4
--- /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 0000000..cda4269
--- /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 0000000..092e9a2
--- /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 0000000..ef514c8
--- /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 0000000..4381079
--- /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 0000000..cf15627
--- /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 0000000..330858d
--- /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 0000000..ca9af37
--- /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 0000000..3b108fb
--- /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 0000000..73f6dfb
--- /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 0000000..e49f8dc
--- /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 0000000..d9f7f31
--- /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 0000000..662fa7f
--- /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 0000000..e7f4725
--- /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 0000000..97d1357
--- /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 0000000..42b0f92
--- /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 0000000..18e5451
--- /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 0000000..be7172e
--- /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 0000000..ea4a66c
--- /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 0000000..1771e7b
--- /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 0000000..95fdcaf
--- /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 0000000..c0deb70
--- /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 0000000..f77bf03
--- /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 0000000..d6b0a50
--- /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 0000000..d6727dc
--- /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 0000000..495edda
--- /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 0000000..534d695
--- /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 0000000..57b17c6
--- /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 0000000..3feff296
--- /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 0000000..ffd7baa
--- /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 0000000..31ce0c3
--- /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 0000000..70619cc
--- /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 0000000..1815a2a
--- /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 0000000..2fb7f2f
--- /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 0000000..6d372c2
--- /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 0000000..7f00942
--- /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 0000000..d728889
--- /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 0000000..17bc064
--- /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 0000000..c5bac58
--- /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 0000000..47c01bc
--- /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 0000000..e1411e4
--- /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 0000000..42c1fd0
--- /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 0000000..6844d88
--- /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 0000000..172fcce
--- /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 0000000..f04499f
--- /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 0000000..ef75c33
--- /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 0000000..1b41825
--- /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 0000000..043acbe
--- /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 0000000..5c8f4cb
--- /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 0000000..f293423
--- /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 0000000..7f3bfdf
--- /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 0000000..0010892
--- /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 0000000..cdb7cac
--- /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 0000000..5bcc20b
--- /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 0000000..e856e06
--- /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 0000000..6ad253c
--- /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 0000000..b837895
--- /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 0000000..bf7ccbe
--- /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 0000000..466f218
--- /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 0000000..f560c9f
--- /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 0000000..eecb006
--- /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 0000000..b2f74bb
--- /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 0000000..e7843dc
--- /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 0000000..5da11f4
--- /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 0000000..6f5dfc6
--- /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 0000000..2e853d3
--- /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 0000000..f59bd8d
--- /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 0000000..89ae84d
--- /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 0000000..7287600
--- /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 0000000..dd4ce1c
--- /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 0000000..539de1a
--- /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 0000000..db770df
--- /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 0000000..6f1158d
--- /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 0000000..cdfa902
--- /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 0000000..561e500
--- /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 0000000..91432ac
--- /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 0000000..895ce76
--- /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 0000000..464be90
--- /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 0000000..7347153
--- /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 0000000..d760592
--- /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 0000000..9615eae
--- /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 0000000..b2528dc
--- /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 0000000..7458643
--- /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 0000000..ebb24d5
--- /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 0000000..9ac659a
--- /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 0000000..956d19c
--- /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 0000000..30a9af6
--- /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 0000000..043ca1d
--- /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 0000000..221576e
--- /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 0000000..8bad69b
--- /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 0000000..6e7cde8
--- /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 0000000..4e906ea
--- /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 0000000..97324c1
--- /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 0000000..6c1527b
--- /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 0000000..2e58140
--- /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 0000000..41715de
--- /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 0000000..2d9bdd2
--- /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 0000000..e053665
--- /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 0000000..bd84371
--- /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 0000000..5f53c8e
--- /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 0000000..7a99217
--- /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 0000000..8cf5473
--- /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 0000000..c65b8da
--- /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 0000000..6a5a4b9
--- /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 0000000..c0dd4e9
--- /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 0000000..baff25c
--- /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 0000000..df3184b
--- /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 0000000..c1f25a5
--- /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 0000000..9823666
--- /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 0000000..8889424
--- /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 0000000..ad9446c
--- /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 0000000..ea740bd
--- /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 0000000..99c57b6
--- /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 0000000..aaf2daa
--- /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 0000000..5fff4c8
--- /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 0000000..384136a
--- /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 0000000..7a62ceb
--- /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 0000000..259a088
--- /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 0000000..907dfda
--- /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 0000000..93b11f9
--- /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 0000000..47a5907
--- /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 0000000..2427b08
--- /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 0000000..89c6eb2
--- /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 0000000..ca1c806
--- /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 0000000..199758f
--- /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 0000000..c6e3412
--- /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 0000000..3e9f1a4
--- /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 0000000..95f836c
--- /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 0000000..53fc6c1
--- /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 0000000..0d5cb59
--- /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 0000000..7b3b335
--- /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 0000000..4e07768
--- /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 0000000..8dfaa01
--- /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 0000000..ad5b5a0
--- /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 0000000..d89fecc
--- /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 0000000..bcff296
--- /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 0000000..0c825a1
--- /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 0000000..00420a2
--- /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 0000000..63366e5
--- /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 0000000..bcf86ea
--- /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 0000000..5bc4a06
--- /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 0000000..8e7ae95
--- /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 0000000..b176406
--- /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 0000000..41561de
--- /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 0000000..cd839a6
--- /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 0000000..910d6ed
--- /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 0000000..fa7c8a9
--- /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 0000000..94b75b0
--- /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 0000000..904c198
--- /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 0000000..aa3fb9c
--- /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 0000000..dcaa253
--- /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 0000000..58eeae4
--- /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 0000000..23f200e
--- /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 0000000..60703a0
--- /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 0000000..c74b0ee
--- /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 0000000..18a359c
--- /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 0000000..29acbbc
--- /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 0000000..d08942e
--- /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 0000000..942bc58
--- /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 0000000..fd308b5
--- /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 0000000..b4eabad
--- /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 0000000..2b76df3
--- /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 0000000..1777b21
--- /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 0000000..20d917b
--- /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 0000000..013f6ef
--- /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 0000000..2427f91
--- /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 0000000..369f32e
--- /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 0000000..0c12754
--- /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 0000000..16e3091
--- /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 0000000..90dfa87
--- /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 0000000..65201bd
--- /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 0000000..fbf6873
--- /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 0000000..162e1df
--- /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 0000000..be3690d
--- /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 0000000..76c06be
--- /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 0000000..2736213
--- /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 0000000..181f2f6
--- /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 0000000..a69ef4e
--- /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 0000000..53717e4
--- /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 0000000..b78dd1d
--- /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 0000000..fe38e74
--- /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 0000000..2b08c4e
--- /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 0000000..d2004ae
--- /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 0000000..1beda25
--- /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 0000000..097fc5f
--- /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 0000000..9181c85
--- /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 0000000..69f13eb
--- /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 0000000..f37d7b9
--- /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 0000000..3b127a0
--- /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 0000000..a9f40cb
--- /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 0000000..1edbab2
--- /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 0000000..d3e70ef
--- /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 0000000..a5667e3
--- /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 0000000..69056c4
--- /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 0000000..b47601c
--- /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 0000000..a525208
--- /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 0000000..0bb2c25
--- /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 0000000..d7ee8bd
--- /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 0000000..fbc3953
--- /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 0000000..87fde81
--- /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 0000000..c2d498c
--- /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 0000000..ad66d08
--- /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 0000000..72fe3c4
--- /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 0000000..2f037f0
--- /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 0000000..1cafba6
--- /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 0000000..99ad23f
--- /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 0000000..db7a298
--- /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 0000000..56c8439
--- /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 0000000..7d17573
--- /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 0000000..fe16586
--- /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 0000000..45ff4a0
--- /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 0000000..e29fcf8
--- /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 0000000..87b0fb8
--- /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 0000000..a92320e
--- /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 0000000..cf2a9c9
--- /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 0000000..e2201cb
--- /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 0000000..3d8e8a1
--- /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 0000000..48197f6
--- /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 0000000..2a42870
--- /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 0000000..fa6e470
--- /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 0000000..c9d8528
--- /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 0000000..28dfeae
--- /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 0000000..90b6a3a
--- /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 0000000..fd4d17d
--- /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 0000000..089d1e4
--- /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 0000000..a7ce33f
--- /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 0000000..8b98f9f
--- /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 0000000..320f70f
--- /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 0000000..71c9b07
--- /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 0000000..f4dcc0b
--- /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 0000000..d16823a
--- /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 0000000..d347e2f
--- /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 0000000..3239e52
--- /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 0000000..dab3dfd
--- /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 0000000..e51fad6
--- /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 0000000..0d4f838
--- /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 0000000..1fcac22
--- /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 0000000..e7a537c
--- /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 0000000..f50a448
--- /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 0000000..aea6639
--- /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 0000000..5268aac
--- /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 0000000..ee2732a
--- /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 0000000..95808d5
--- /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 0000000..b9d80c0
--- /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 0000000..e05c931
--- /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 0000000..87606f7
--- /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 0000000..f3b9c1a
--- /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 0000000..3fad021
--- /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 0000000..0a75670
--- /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 0000000..a2ebbf0
--- /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 0000000..bae945d
--- /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 0000000..1059aea
--- /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 0000000..364e70d
--- /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 0000000..07b4393
--- /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 0000000..390087c
--- /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 0000000..1697836
--- /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 0000000..cd1c802
--- /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 0000000..afa6faf
--- /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 0000000..591d971
--- /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 0000000..36e54f9
--- /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 0000000..ae65f04
--- /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 0000000..aa84bad
--- /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 0000000..13d5674
--- /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 0000000..ead3069
--- /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 0000000..8389986
--- /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 0000000..3fb5747
--- /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 0000000..0c25605
--- /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 0000000..522a978
--- /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 0000000..d79fedd
--- /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 0000000..f76a6e9
--- /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 0000000..7daea6c
--- /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 0000000..2c3a8ce
--- /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 0000000..99a6592
--- /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 0000000..b311536
--- /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 0000000..1a82251
--- /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 0000000..7634d63
--- /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 0000000..a8d2d42
--- /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 0000000..cf949bc
--- /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 0000000..1531903
--- /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 0000000..c7f3180
--- /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 0000000..b4a9e0f
--- /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 0000000..7333abe
--- /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 0000000..d4b4d66
--- /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 0000000..8117e0e
--- /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 0000000..5fc7836
--- /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 0000000..3b6aec4
--- /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 0000000..e64cf6e
--- /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 0000000..54a243a
--- /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 0000000..ef9ef4f
--- /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 0000000..2377560
--- /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 0000000..c7f4cf1
--- /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 0000000..2a96fe3
--- /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 0000000..e43a530
--- /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 0000000..cb6ccaa
--- /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 0000000..ae6345e
--- /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 0000000..fad2309
--- /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 0000000..c101e76
--- /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 0000000..3fecfc2
--- /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 0000000..aa3b9d6
--- /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 0000000..213a58b
--- /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 0000000..31a4cb1
--- /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 0000000..7ef511c
--- /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 0000000..a417bbd
--- /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 0000000..6b8aee7
--- /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 0000000..47a45d0
--- /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 0000000..4ce9ca2
--- /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 0000000..ad4096b
--- /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 0000000..1700b06
--- /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 0000000..a358d30
--- /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 0000000..93d315f
--- /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 0000000..86b4ecc
--- /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 0000000..e93f4dc
--- /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 0000000..2646c28
--- /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 0000000..a6893e7
--- /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 0000000..f687590
--- /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 0000000..8135f3b
--- /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 0000000..f54faf9
--- /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 0000000..a6661d5
--- /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 0000000..bfbc5b7
--- /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 0000000..ac13a0a
--- /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 0000000..f8acd9f
--- /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 0000000..d564fbe
--- /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 0000000..4788170
--- /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 0000000..974bc0e
--- /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 0000000..e456564
--- /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 0000000..e1aa353
--- /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 0000000..86b16b4
--- /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 0000000..623d362
--- /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 0000000..c84fc81
--- /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 0000000..26537b5
--- /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 0000000..baa62d3
--- /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 0000000..45bf0ab
--- /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 0000000..4739866
--- /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 0000000..2b87ed1
--- /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 0000000..6412ead
--- /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 0000000..35db6a2
--- /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 0000000..d299ce6
--- /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 0000000..2a2d6f8
--- /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 0000000..abacacb
--- /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 0000000..89d9e50
--- /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 0000000..8122782
--- /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 0000000..53aae77
--- /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 0000000..003ce13
--- /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 0000000..f9b2281
--- /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 0000000..6e72108
--- /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 0000000..4d4ab50
--- /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 0000000..68353f7
--- /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 0000000..42b988d
--- /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 0000000..65d8150
--- /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 0000000..7cb1e4d
--- /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 0000000..d4a0fc4
--- /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 0000000..840f74fe
--- /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 0000000..deafc7b
--- /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 0000000..b2ad83c
--- /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 0000000..bfd0450
--- /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 0000000..d0da4b6
--- /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 0000000..dfaacc0
--- /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 0000000..2b06809
--- /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 0000000..d2359dc
--- /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 0000000..7d22ef3
--- /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 0000000..7e19174
--- /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 0000000..cb794c5
--- /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 0000000..acb5ea1
--- /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 0000000..05eda2c
--- /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 0000000..27660d6
--- /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 0000000..7df4a50
--- /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 0000000..7a6a19b
--- /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 0000000..155cdaa
--- /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 0000000..b34a987
--- /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 0000000..73f27d5
--- /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 0000000..df9b6db
--- /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 0000000..bafb05a
--- /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 0000000..13c0850
--- /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 0000000..9adb572
--- /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 0000000..504c658
--- /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 0000000..c69e11d
--- /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 0000000..6a05b94
--- /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 0000000..9ee7164
--- /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 0000000..d80708e
--- /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 0000000..136175a
--- /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 0000000..7c7a8e5
--- /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 0000000..b58bdc3
--- /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 0000000..73be2dd
--- /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 0000000..952a3c2
--- /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 0000000..e7f5ac6
--- /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 0000000..0fc2dbf
--- /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 0000000..c1ddd56
--- /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 0000000..d14fac5
--- /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 0000000..3cd2232
--- /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 0000000..a5917e5
--- /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 0000000..466eb33
--- /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 0000000..908d67f
--- /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 0000000..e7441df
--- /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 0000000..f1ae3c0
--- /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 0000000..212195f
--- /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 0000000..a1cc3d0
--- /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 0000000..ae76c04
--- /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 0000000..443f812
--- /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 0000000..568cd1a
--- /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 0000000..1fd5fc7
--- /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 0000000..548ce8b
--- /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 0000000..3b4544d
--- /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 0000000..25229f0
--- /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 0000000..0c934a4
--- /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 0000000..18e14b3
--- /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 0000000..3a69043
--- /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 0000000..4cb1bc1
--- /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 0000000..c1bf52f
--- /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 0000000..6d217c8
--- /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 0000000..2887730
--- /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 0000000..006d013
--- /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 0000000..142d298
--- /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 0000000..8fb513c
--- /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 0000000..d32f8e8
--- /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 0000000..6162484
--- /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 0000000..f4f4d7c
--- /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 0000000..b3620fa
--- /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 0000000..3d8e0ee
--- /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 0000000..a39eb3a
--- /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 0000000..2d493a0
--- /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 0000000..a025193
--- /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 0000000..089c76d
--- /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 0000000..e4b91c0
--- /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 0000000..acf6730
--- /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 0000000..25e6137
--- /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 0000000..f0eb86e
--- /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 0000000..7b4e304
--- /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 0000000..7e55f09
--- /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 0000000..ecb3a3a
--- /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 0000000..16b0539
--- /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 0000000..658927b
--- /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 0000000..20c46c9
--- /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 0000000..cc2b6ac
--- /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 0000000..ae4b1d3
--- /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 0000000..7fc02a0
--- /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 0000000..c92c7e1
--- /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 0000000..534d6de
--- /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 0000000..f4942f7
--- /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 0000000..141a87c
--- /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 0000000..edb5132
--- /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 0000000..c23eed6
--- /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 0000000..098afae
--- /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 0000000..9274369
--- /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 0000000..e9bb24a
--- /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 0000000..cd3d0f3
--- /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 0000000..a67565c
--- /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 0000000..5aa2d73
--- /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 0000000..5aa2d73
--- /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 0000000..8de7fce
--- /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 0000000..1360280
--- /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 0000000..a23ee9f
--- /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 0000000..697c980
--- /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 0000000..69b4f7a
--- /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 0000000..0fe1ba1
--- /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 0000000..29e3a93
--- /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 0000000..c0443eb
--- /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 0000000..05b0fff
--- /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 0000000..0c36111
--- /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 0000000..135c2f6
--- /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 0000000..bddc401
--- /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 0000000..d4a1956
--- /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 0000000..0213a8d
--- /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 0000000..71d29fe
--- /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 0000000..4c66e88
--- /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 0000000..35fcb75
--- /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 0000000..592e0ff
--- /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 0000000..0ace1cc
--- /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 0000000..a151ea8
--- /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 0000000..7c026c2
--- /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 0000000..05ae28b
--- /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 0000000..7dfcde0
--- /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 0000000..c04e3cc
--- /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 0000000..f2cfc4b
--- /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 0000000..c3a9742
--- /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 0000000..bc841a6
--- /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 0000000..69217fb
--- /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 0000000..88e8cad
--- /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 0000000..de9745a
--- /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 0000000..1f05e5f
--- /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 0000000..910000a
--- /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 0000000..4bfec14
--- /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 0000000..eefe171
--- /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 0000000..a39cd42
--- /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 0000000..5baf609
--- /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 0000000..b4546d8
--- /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 0000000..4117149
--- /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 0000000..8d44da4
--- /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 0000000..e68e4a3
--- /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 0000000..b0cf28e
--- /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 0000000..282dde7
--- /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 0000000..56491ff
--- /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 0000000..e537773
--- /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 0000000..de3a838
--- /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 0000000..433b900
--- /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 0000000..e5f92be
--- /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 0000000..087424a
--- /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 0000000..2794638
--- /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 0000000..c1ecb5d
--- /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 0000000..6d3e29d
--- /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 0000000..667e6fb
--- /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 0000000..ccbf525
--- /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 0000000..a382233
--- /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 0000000..28b7544
--- /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 0000000..df700dd
--- /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 0000000..79eee81
--- /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 0000000..ec9d6e0
--- /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 0000000..d0d57c8
--- /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 0000000..5983804
--- /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 0000000..616580c
--- /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 0000000..737155c
--- /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 0000000..5d7ecc4
--- /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 0000000..50287ae
--- /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 0000000..e69e8df
--- /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 0000000..b9025f5
--- /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 0000000..c5f61ec
--- /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 0000000..7bcbd26
--- /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 0000000..9167e83
--- /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 0000000..3217172
--- /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 0000000..485e847
--- /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 0000000..eb28127
--- /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 0000000..98cee45
--- /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 0000000..dfa2815
--- /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 0000000..a7121a9
--- /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 0000000..97b3aaa
--- /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 0000000..76df63a
--- /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 0000000..40925cc
--- /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 0000000..ff5e318
--- /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 0000000..9a95eb2
--- /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 0000000..fc33f9f
--- /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 0000000..f2645a8
--- /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 0000000..634605e
--- /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 0000000..2423e9e
--- /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 0000000..759a41b
--- /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 0000000..b852b63
--- /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 0000000..640b689
--- /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 0000000..afcaf63
--- /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 0000000..f689c33
--- /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 0000000..e101577
--- /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 0000000..18f2fb6
--- /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 0000000..d542c3b
--- /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 0000000..38e55f7
--- /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 0000000..6ea35e9
--- /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 0000000..717dd86
--- /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 0000000..9d679fe
--- /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 0000000..eee23d2
--- /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 0000000..c39ed5d
--- /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 0000000..1b3e69f
--- /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 0000000..2afb769
--- /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 0000000..46eac82
--- /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 0000000..831a393
--- /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 0000000..6b3d807
--- /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 0000000..f1ecdb0
--- /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 0000000..303d20b
--- /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 0000000..9ef1c2c
--- /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 0000000..bc510be
--- /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 0000000..7700d6f
--- /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 0000000..05c92bd
--- /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 0000000..eb5da70
--- /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 0000000..1b35455
--- /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 0000000..99dc873
--- /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 0000000..c4fca3c
--- /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 0000000..15c13ea
--- /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 0000000..b45c31b
--- /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 0000000..e524c05
--- /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 0000000..e460481
--- /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 0000000..b96d477
--- /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 0000000..293c44a
--- /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 0000000..f718c99
--- /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 0000000..0ff8c39
--- /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 0000000..4f72648
--- /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 0000000..30c3ee6
--- /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 0000000..cc127fd
--- /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 0000000..3492f95
--- /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 0000000..0b5d46a
--- /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 0000000..614784b
--- /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 0000000..2f04c75
--- /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 0000000..2b1bd4a
--- /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 0000000..06c0ba0
--- /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 0000000..2f74350
--- /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 0000000..d0130e3
--- /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 0000000..c1dc3c0
--- /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 0000000..45aee90
--- /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 0000000..62af02d
--- /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 0000000..df0ffe2
--- /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 0000000..a0695ff
--- /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 0000000..8a5a3c7
--- /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 0000000..fee61a3
--- /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 0000000..f6c7bce
--- /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 0000000..8b63572
--- /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 0000000..753aa4d
--- /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 0000000..2ea9ea0
--- /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 0000000..0e992c7
--- /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 0000000..346e6427
--- /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 0000000..59bdcea
--- /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 0000000..2dfc8ab
--- /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 0000000..7ec1491
--- /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 0000000..8b02f50
--- /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 0000000..bf0c546
--- /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 0000000..4196c37
--- /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 0000000..e651249
--- /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 0000000..1d174a4
--- /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 0000000..4f0ce36
--- /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 0000000..4bcfce3
--- /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 0000000..18d41ea
--- /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 0000000..f91331c
--- /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 0000000..afda6d8
--- /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 0000000..dadd836
--- /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 0000000..84eb11c
--- /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 0000000..439ab21
--- /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 0000000..ca86471
--- /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 0000000..5799dc0
--- /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 0000000..a5641fd
--- /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 0000000..24f42a2
--- /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 0000000..3e946a6
--- /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 0000000..b6996ec
--- /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 0000000..fcb901a
--- /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 0000000..4776ce4
--- /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 0000000..45bf0ab
--- /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 0000000..f581783
--- /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 0000000..b800455
--- /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 0000000..704ea0a
--- /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 0000000..8b48211
--- /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 0000000..30190e4
--- /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 0000000..148ac77
--- /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 0000000..a669f4b
--- /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 0000000..bc282b7
--- /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 0000000..ca55a5b
--- /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 0000000..240f9e2
--- /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 0000000..1486d96
--- /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 0000000..2c1f9b4
--- /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 0000000..81e6e0d
--- /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 0000000..9c6258e
--- /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 0000000..26d4158
--- /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 0000000..8d13b17
--- /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 0000000..50d04c3
--- /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 0000000..30eeb82
--- /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 0000000..b4d6eda
--- /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 0000000..aee60e0
--- /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 0000000..8e95187
--- /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 0000000..6be5e15
--- /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 0000000..183a7cf
--- /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 0000000..41e3a68
--- /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 0000000..2a60ce7
--- /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 0000000..9a9ea2f
--- /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 0000000..f7b02eb
--- /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 0000000..4ce6aeb
--- /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 0000000..2a26327
--- /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 0000000..2a288d9
--- /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 0000000..d00c45f
--- /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 0000000..cc43ef8
--- /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 0000000..36b3ff7
--- /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 0000000..6092913
--- /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 0000000..c07452d
--- /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 0000000..55dcc32
--- /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 0000000..13742b1
--- /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 0000000..dab1d3f
--- /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 0000000..7ae6674
--- /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 0000000..e2cc9a8
--- /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 0000000..a335c8c
--- /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 0000000..47bd3ea
--- /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 0000000..f1d9f4b
--- /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 0000000..f6d6979
--- /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 0000000..9dc6a9d
--- /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 0000000..468e54c
--- /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 0000000..6301e2b
--- /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 0000000..9acc282
--- /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 0000000..a1d205a
--- /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 0000000..19da66a
--- /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 0000000..205bc19
--- /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 0000000..1ad459b
--- /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 0000000..be39c48
--- /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 0000000..4bc3c37
--- /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 0000000..8ef51dd
--- /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 0000000..a7dd0f2
--- /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 0000000..713f563
--- /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 0000000..1380e20
--- /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 0000000..e794699
--- /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 0000000..bd81f4d
--- /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 0000000..dbe6701
--- /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 0000000..9e89292
--- /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 0000000..4f3ebf7
--- /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 0000000..949bb07
--- /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 0000000..15dfba8
--- /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 0000000..62a4452
--- /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 0000000..8acdf8c
--- /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 0000000..8826369
--- /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 0000000..c8545ad
--- /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 0000000..0368dca
--- /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 0000000..d766557
--- /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 0000000..7e1220d
--- /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 0000000..214004c
--- /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 0000000..1275841
--- /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 0000000..7d6a8e5
--- /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 0000000..7b81b7c
--- /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 0000000..701df29
--- /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 0000000..50b2ed3
--- /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 0000000..4623db0
--- /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 0000000..992ea9e
--- /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 0000000..f8154f2
--- /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 0000000..a67c6c5
--- /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 0000000..ecc8ef8
--- /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 0000000..832a5a5
--- /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 0000000..094e2e9
--- /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 0000000..7a07db3
--- /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 0000000..2df765f
--- /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 0000000..cca5fa0
--- /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 0000000..0901330
--- /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 0000000..bafb05a
--- /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 0000000..4a9c717
--- /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 0000000..56b5137
--- /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 0000000..b6273c7
--- /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 0000000..29a6ddc
--- /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 0000000..0e023a5
--- /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 0000000..be43659
--- /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 0000000..9172d7a
--- /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 0000000..5e65945
--- /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 0000000..91a5109
--- /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 0000000..68bf4d0
--- /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 0000000..e3bf8a3
--- /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 0000000..2e28a40
--- /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 0000000..810bf16
--- /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 0000000..b65e7c7
--- /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 0000000..823b352
--- /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 0000000..627c4a2
--- /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 0000000..60f3c4b
--- /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 0000000..37816c4
--- /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 0000000..d382308
--- /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 0000000..7e799a8
--- /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 0000000..9f81f6c
--- /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 0000000..d353c40
--- /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 0000000..d20300c
--- /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 0000000..d2a55a8
--- /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 0000000..74149ee
--- /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 0000000..f455383
--- /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 0000000..64bd00f
--- /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 0000000..88df249
--- /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 0000000..642f95d
--- /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 0000000..89178fc
--- /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 0000000..38c1ae7
--- /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 0000000..3f8af01
--- /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 0000000..fe8dd90
--- /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 0000000..4373bca
--- /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 0000000..d090033
--- /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 0000000..83c44fd
--- /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 0000000..a2c820d
--- /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 0000000..09a551e
--- /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 0000000..492f0fd
--- /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 0000000..af15db3
--- /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 0000000..c8f9792
--- /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 0000000..8e906d9
--- /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 0000000..3371dda
--- /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 0000000..b20c1cc
--- /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 0000000..92ae398
--- /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 0000000..a802d75
--- /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 0000000..2d70b84
--- /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 0000000..10bcd7a
--- /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 0000000..4e51831
--- /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 0000000..db0bc01
--- /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 0000000..4b601bd
--- /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 0000000..bd5d001
--- /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 0000000..8dbe673
--- /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 0000000..b5fce51
--- /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 0000000..d930250
--- /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 0000000..c92d136
--- /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 0000000..8ebea60
--- /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 0000000..b4bf755
--- /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 0000000..8b5ecc0
--- /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 0000000..866b44d
--- /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 0000000..b010fcc
--- /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 0000000..3c4835b
--- /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 0000000..65683e0
--- /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 0000000..3df4dd9
--- /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 0000000..1e78d20
--- /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 0000000..f860429
--- /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 0000000..354a67a
--- /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 0000000..1fe82d0
--- /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 0000000..74fb332
--- /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 0000000..dfe8f67
--- /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 0000000..49fdf77
--- /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 0000000..144b27c
--- /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 0000000..fea4c63
--- /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 0000000..f28776a
--- /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 0000000..0e06912
--- /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 0000000..1d312bf
--- /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 0000000..8260306
--- /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 0000000..784a433
--- /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 0000000..02f8e8b
--- /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 0000000..98d2502
--- /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 0000000..b905f8a
--- /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 0000000..07d2606
--- /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 0000000..94d7aa5
--- /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 0000000..c32bb12
--- /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 0000000..0a0824e
--- /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 0000000..3abecc5
--- /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 0000000..1ed44bd
--- /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 0000000..f743599
--- /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 0000000..cf06b70
--- /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 0000000..5a5e880
--- /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 0000000..95b9e9c
--- /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 0000000..10d8f6f
--- /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 0000000..8d0c296
--- /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 0000000..4f0bc57
--- /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 0000000..9b48dc5
--- /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 0000000..2a76d40
--- /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 0000000..6932327
--- /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 0000000..454e501
--- /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 0000000..7cbf0f1
--- /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 0000000..fcd7144
--- /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 0000000..ac4fb98
--- /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 0000000..3bc3664
--- /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 0000000..d77eb3d
--- /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 0000000..dd12665
--- /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 0000000..e38203c
--- /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 0000000..18d6323
--- /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 0000000..bf52cfe
--- /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 0000000..136dd50
--- /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 0000000..b7d944f
--- /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 0000000..75ead98
--- /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 0000000..5b956bc
--- /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 0000000..19798ea
--- /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 0000000..fe862c7
--- /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 0000000..dda3c35
--- /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 0000000..0eff42d
--- /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 0000000..f791bfa
--- /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 0000000..2e3efd3
--- /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 0000000..dde8f4b
--- /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 0000000..14b0af5
--- /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 0000000..ffe5cc3
--- /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 0000000..f30d3ee
--- /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 0000000..1399406
--- /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 0000000..5943fdd
--- /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 0000000..26a212e
--- /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 0000000..b0a6d86
--- /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 0000000..e40ba15
--- /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 0000000..fe2f9a0
--- /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 0000000..00bd7d4
--- /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 0000000..8cb9cec
--- /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 0000000..3be48c8
--- /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 0000000..a809086
--- /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 0000000..3634754
--- /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 0000000..40f62c7
--- /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 0000000..1557720
--- /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 0000000..6753093
--- /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 0000000..fc05afb
--- /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 0000000..4889dcd
--- /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 0000000..e7e78c3
--- /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 0000000..b7bc6a3
--- /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 0000000..5f1cd97
--- /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 0000000..0762ca9
--- /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 0000000..3570b16
--- /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 0000000..ab73c6a
--- /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 0000000..7803901
--- /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 0000000..3b6ea3c
--- /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 0000000..05fdc88
--- /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 0000000..6e24a0e
--- /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 0000000..876a277
--- /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 0000000..4fe582e
--- /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 0000000..af7821c
--- /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 0000000..b3716ca
--- /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 0000000..aff95f4
--- /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 0000000..98f8517
--- /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 0000000..d36bde8
--- /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 0000000..be9283e
--- /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 0000000..803a958
--- /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 0000000..fe60b08
--- /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 0000000..4beeba1
--- /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 0000000..465bfec
--- /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 0000000..ceeed2f
--- /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 0000000..f2bd359
--- /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 0000000..8a30779
--- /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 0000000..a2a038a
--- /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 0000000..67082c3
--- /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 0000000..64b3846
--- /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 0000000..ff1b2e6
--- /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 0000000..e33cf58
--- /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 0000000..3ea5108
--- /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 0000000..54e81c9
--- /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 0000000..06e2195
--- /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 0000000..025e003
--- /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 0000000..17a9072
--- /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 0000000..77b22b2
--- /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 0000000..155e2aa
--- /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 0000000..e042b18
--- /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 0000000..ebc5d1e
--- /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 0000000..519f01d
--- /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 0000000..a78a3f1
--- /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 0000000..dbe9b0a
--- /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 0000000..3a85ffe
--- /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 0000000..bc83ece
--- /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 0000000..eda1f5c
--- /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 0000000..6c1a6cb
--- /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