Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

677 files changed, 12440 insertions, 5812 deletions

diff --git a/.gitignore b/.gitignore
index 14b25f3..282c8bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -198,6 +198,7 @@ plugin_commonU.def
 # ---------------------
 .project
 .cproject
+.make.cache
 
 qtc-debugging-helper
 src/corelib/lib
diff --git a/LICENSE.GPL3 b/LICENSE.GPL3
deleted file mode 100644
index 265c4ea..0000000
--- a/LICENSE.GPL3
+++ /dev/null
@@ -1,696 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-
- The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- Contact: Nokia Corporation (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/bin/createpackage.bat b/bin/createpackage.bat
index b5ede18..87d094f 100644
--- a/bin/createpackage.bat
+++ b/bin/createpackage.bat
@@ -1,3 +1,44 @@
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: Contact: Nokia Corporation (qt-info@nokia.com)
+::
+:: This file is part of the test suite of the Qt Toolkit.
+::
+:: $QT_BEGIN_LICENSE:LGPL$
+:: No Commercial Usage
+:: This file contains pre-release code and may not be distributed.
+:: You may use this file in accordance with the terms and conditions
+:: contained in the Technology Preview License Agreement accompanying
+:: this package.
+::
+:: GNU Lesser General Public License Usage
+:: Alternatively, this file may be used under the terms of the GNU Lesser
+:: General Public License version 2.1 as published by the Free Software
+:: Foundation and appearing in the file LICENSE.LGPL included in the
+:: packaging of this file.  Please review the following information to
+:: ensure the GNU Lesser General Public License version 2.1 requirements
+:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+::
+:: In addition, as a special exception, Nokia gives you certain
+:: additional rights.  These rights are described in the Nokia Qt LGPL
+:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+:: package.
+::
+:: If you have questions regarding the use of this file, please contact
+:: Nokia at qt-info@nokia.com.
+::
+::
+::
+::
+::
+::
+::
+::
+:: $QT_END_LICENSE$
+::
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
 @echo off
 set scriptpath=%~dp0
-perl %scriptpath%createpackage.pl %*
\ No newline at end of file
+perl %scriptpath%createpackage.pl %*
diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index a180864..2e31544 100644
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -1,11 +1,49 @@
-#!\usr\bin\perl
+#!/usr/bin/perl
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the S60 port of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 ############################################################################################
 #
 # Convenience script for creating signed packages you can install on your phone.
 #
-# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# Contact: Qt Software Information (qt-info@nokia.com)
-#
 ############################################################################################
 
 use strict;
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index 005d587..8140207 100644
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -1,10 +1,49 @@
+#!/usr/bin/perl
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the S60 port of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 #######################################################################
 #
 # A script for setting binary capabilities based on .pkg file contents.
 #
-# Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
-# Contact: Nokia Corporation (qt-info@nokia.com)
-#
 #######################################################################
 
 sub Usage() {
@@ -13,7 +52,7 @@ sub Usage() {
     print("If no capabilities are given, the binaries will be given the\n");
     print("capabilities supported by self-signed certificates.\n");
     print("\nUsage: patch_capabilities.pl pkg_filename [target-platform] [capability list]\n");
-    print("    If template .pkg file is given, next agrument must be 'target-platform'.\n");    
+    print("    If template .pkg file is given, next agrument must be 'target-platform'.\n");
     print("\nE.g. patch_capabilities.pl myapp_template.pkg release-armv5 \"All -TCB\"\n");
     exit();
 }
@@ -26,17 +65,26 @@ if (@ARGV)
     # Parse the first given script argument as a ".pkg" file name.
     my $pkgFileName = shift(@ARGV);
 
-    # Check if using template .pkg and do preprocessing if needed
-    if (($pkgFileName =~ m|_template\.pkg$|i) && -r($pkgFileName)) 
+    # These variables will only be set for template .pkg files.
+    my $target;
+    my $platform;
+
+    # Check if using template .pkg and set target/platform variables
+    if (($pkgFileName =~ m|_template\.pkg$|i) && -r($pkgFileName))
     {
-        my $target;
-        unless ($target = shift(@ARGV)) 
+        my $targetplatform;
+        unless ($targetplatform = shift(@ARGV))
         {
             Usage();
         }
-        
-        system ("createpackage.bat -p ".$pkgFileName." ".$target);   
-        $pkgFileName =~ s/_template\.pkg/_${target}\.pkg/;
+
+        my @tmpvalues = split('-', $targetplatform);
+        $target = $tmpvalues[0];
+        $platform = $tmpvalues[1];
+
+        # Convert visual target to real target (debug->udeb and release->urel)
+        $target =~ s/debug/udeb/i;
+        $target =~ s/release/urel/i;
     }
 
     # If the specified ".pkg" file exists (and can be read),
@@ -80,8 +128,16 @@ if (@ARGV)
                 my $destinationPath = $2;
 
                 # If the given file is a binary, check the target and binary type (+ the actual filename) from its path.
-                if ($sourcePath =~ m:/epoc32/release/([^/]+)/(udeb|urel)/(\w+(\.dll|\.exe)):i)
+                if ($sourcePath =~ m:/epoc32/release/([^/]+)/(udeb|urel|\$\(TARGET\))/(\w+(\.dll|\.exe)):i)
                 {
+                    # Do preprocessing for template pkg,
+                    # In case of template pkg target and platform variables are set
+                    if(length($target) && length($platform))
+                    {
+                        $sourcePath =~ s/\$\(PLATFORM\)/$platform/gm;
+                        $sourcePath =~ s/\$\(TARGET\)/$target/gm;
+                    }
+
                     push (@binaries, $sourcePath);
                 }
             }
diff --git a/bin/setcepaths.bat b/bin/setcepaths.bat
index 5e04526..ebed731 100755
--- a/bin/setcepaths.bat
+++ b/bin/setcepaths.bat
@@ -1,3 +1,43 @@
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: Contact: Nokia Corporation (qt-info@nokia.com)
+::
+:: This file is part of the tools applications of the Qt Toolkit.
+::
+:: $QT_BEGIN_LICENSE:LGPL$
+:: No Commercial Usage
+:: This file contains pre-release code and may not be distributed.
+:: You may use this file in accordance with the terms and conditions
+:: contained in the Technology Preview License Agreement accompanying
+:: this package.
+::
+:: GNU Lesser General Public License Usage
+:: Alternatively, this file may be used under the terms of the GNU Lesser
+:: General Public License version 2.1 as published by the Free Software
+:: Foundation and appearing in the file LICENSE.LGPL included in the
+:: packaging of this file.  Please review the following information to
+:: ensure the GNU Lesser General Public License version 2.1 requirements
+:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+::
+:: In addition, as a special exception, Nokia gives you certain
+:: additional rights.  These rights are described in the Nokia Qt LGPL
+:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+:: package.
+::
+:: If you have questions regarding the use of this file, please contact
+:: Nokia at qt-info@nokia.com.
+::
+::
+::
+::
+::
+::
+::
+::
+:: $QT_END_LICENSE$
+::
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 @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
diff --git a/bin/syncqt.bat b/bin/syncqt.bat
index 579844f..a619b92 100755
--- a/bin/syncqt.bat
+++ b/bin/syncqt.bat
@@ -1,2 +1,42 @@
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: Contact: Nokia Corporation (qt-info@nokia.com)
+::
+:: This file is part of the tools applications of the Qt Toolkit.
+::
+:: $QT_BEGIN_LICENSE:LGPL$
+:: No Commercial Usage
+:: This file contains pre-release code and may not be distributed.
+:: You may use this file in accordance with the terms and conditions
+:: contained in the Technology Preview License Agreement accompanying
+:: this package.
+::
+:: GNU Lesser General Public License Usage
+:: Alternatively, this file may be used under the terms of the GNU Lesser
+:: General Public License version 2.1 as published by the Free Software
+:: Foundation and appearing in the file LICENSE.LGPL included in the
+:: packaging of this file.  Please review the following information to
+:: ensure the GNU Lesser General Public License version 2.1 requirements
+:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+::
+:: In addition, as a special exception, Nokia gives you certain
+:: additional rights.  These rights are described in the Nokia Qt LGPL
+:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+:: package.
+::
+:: If you have questions regarding the use of this file, please contact
+:: Nokia at qt-info@nokia.com.
+::
+::
+::
+::
+::
+::
+::
+::
+:: $QT_END_LICENSE$
+::
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 @rem ***** This assumes PERL is in the PATH *****
 @perl.exe -S syncqt %*
diff --git a/configure b/configure
index 3f3e55a..9ef0b45 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,44 @@
 #!/bin/sh
-#
-# Configures to build the Qt library
-#
-# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# Contact: Nokia Corporation (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.
-#
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 #-------------------------------------------------------------------------------
 # script initialization
@@ -643,7 +674,7 @@ CFG_MULTIMEDIA=yes
 CFG_SVG=yes
 CFG_WEBKIT=auto # (yes|no|auto)
 
-CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen"
+CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb"
 CFG_GFX_ON="linuxfb multiscreen"
 CFG_GFX_PLUGIN_AVAILABLE=
 CFG_GFX_PLUGIN=
@@ -3842,16 +3873,22 @@ if [ "$Edition" = "NokiaInternalBuild" ]; then
 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."
+        if [ -e "$relpath/LICENSE.GPL3" ]; then
+            echo "You are also licensed to use this software under the terms of"
+            echo "the GNU General Public License (GPL) versions 3."
+            affix="either"
+        else
+            affix="the"
+        fi
         echo
-        affix="either"
         if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then
-	    echo "You have already accepted the terms of the $LicenseType license."
+            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."
+            if [ -e "$relpath/LICENSE.GPL3" ]; then
+                echo "Type '3' to view the GNU General Public License version 3."
+            fi
             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."
diff --git a/demos/boxes/qtbox.cpp b/demos/boxes/qtbox.cpp
index 54882fb..7134d63 100644
--- a/demos/boxes/qtbox.cpp
+++ b/demos/boxes/qtbox.cpp
@@ -319,6 +319,8 @@ void QtBox::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWi
         0.5f * (right + left), 0.5f * (bottom + top), 0.0f, 1.0f
     };
 
+    painter->beginNativePainting();
+
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
     glLoadMatrixf(moveToRectMatrix);
@@ -392,6 +394,8 @@ void QtBox::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWi
     glMatrixMode(GL_PROJECTION);
     glPopMatrix();
 
+    painter->endNativePainting();
+
     ItemBase::paint(painter, option, widget);
 }
 
diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp
index 016ba17..7c0d4d8 100644
--- a/demos/boxes/scene.cpp
+++ b/demos/boxes/scene.cpp
@@ -649,6 +649,24 @@ void Scene::initGL()
     m_renderOptions->emitParameterChanged();
 }
 
+static void loadMatrix(const QMatrix4x4& m)
+{
+    GLfloat mat[16];
+    const qreal *data = m.constData();
+    for (int index = 0; index < 16; ++index)
+        mat[index] = data[index];
+    glLoadMatrixf(mat);
+}
+
+static void multMatrix(const QMatrix4x4& m)
+{
+    GLfloat mat[16];
+    const qreal *data = m.constData();
+    for (int index = 0; index < 16; ++index)
+        mat[index] = data[index];
+    glMultMatrixf(mat);
+}
+
 // 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 QMatrix4x4 &view, int excludeBox)
@@ -673,7 +691,7 @@ void Scene::renderBoxes(const QMatrix4x4 &view, int excludeBox)
     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.data());
+    loadMatrix(viewRotation);
     glScalef(20.0f, 20.0f, 20.0f);
 
     // Don't render the environment if the environment texture can't be set for the correct sampler.
@@ -688,7 +706,7 @@ void Scene::renderBoxes(const QMatrix4x4 &view, int excludeBox)
         m_environment->unbind();
     }
 
-    glLoadMatrixf(view.data());
+    loadMatrix(view);
 
     glEnable(GL_CULL_FACE);
     glEnable(GL_LIGHTING);
@@ -702,7 +720,7 @@ void Scene::renderBoxes(const QMatrix4x4 &view, int excludeBox)
         m.rotate(m_trackBalls[1].rotation());
         m = m.transposed();
 
-        glMultMatrixf(m.data());
+        multMatrix(m);
 
         glRotatef(360.0f * i / m_programs.size(), 0.0f, 0.0f, 1.0f);
         glTranslatef(2.0f, 0.0f, 0.0f);
@@ -736,7 +754,7 @@ void Scene::renderBoxes(const QMatrix4x4 &view, int excludeBox)
         QMatrix4x4 m;
         m.rotate(m_trackBalls[0].rotation());
         m = m.transposed();
-        glMultMatrixf(m.data());
+        multMatrix(m);
 
         if (glActiveTexture) {
             if (m_dynamicCubemap)
@@ -842,7 +860,7 @@ void Scene::renderCubemaps()
 
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
-    glLoadMatrixf(mat.data());
+    loadMatrix(mat);
 
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
@@ -894,6 +912,7 @@ void Scene::drawBackground(QPainter *painter, const QRectF &)
     float width = float(painter->device()->width());
     float height = float(painter->device()->height());
 
+    painter->beginNativePainting();
     setStates();
 
     if (m_dynamicCubemap)
@@ -913,6 +932,8 @@ void Scene::drawBackground(QPainter *painter, const QRectF &)
 
     defaultStates();
     ++m_frame;
+
+    painter->endNativePainting();
 }
 
 QPointF Scene::pixelPosToViewPos(const QPointF& p)
diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h
index efe1e3f..23f17e5 100644
--- a/demos/boxes/scene.h
+++ b/demos/boxes/scene.h
@@ -108,6 +108,8 @@ private:
 
 class GraphicsWidget : public QGraphicsProxyWidget
 {
+public:
+    GraphicsWidget() : QGraphicsProxyWidget(0, Qt::Window) {}
 protected:
     virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
     virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
diff --git a/demos/composition/composition.cpp b/demos/composition/composition.cpp
index bb8a02c..8061908 100644
--- a/demos/composition/composition.cpp
+++ b/demos/composition/composition.cpp
@@ -377,7 +377,9 @@ void CompositionRenderer::paint(QPainter *painter)
             p.setCompositionMode(QPainter::CompositionMode_Source);
             p.fillRect(QRect(0, 0, m_pbuffer->width(), m_pbuffer->height()), Qt::transparent);
 
-            p.save();
+            p.save(); // Needed when using the GL1 engine
+            p.beginNativePainting(); // Needed when using the GL2 engine
+
             glBindTexture(GL_TEXTURE_2D, m_base_tex);
             glEnable(GL_TEXTURE_2D);
             glColor4f(1.,1.,1.,1.);
@@ -399,16 +401,21 @@ void CompositionRenderer::paint(QPainter *painter)
             glEnd();
 
             glDisable(GL_TEXTURE_2D);
-            p.restore();
+
+            p.endNativePainting(); // Needed when using the GL2 engine
+            p.restore(); // Needed when using the GL1 engine
 
             drawSource(p);
             p.end();
             m_pbuffer->updateDynamicTexture(m_compositing_tex);
         }
 
-        glWidget()->makeCurrent();
+        painter->beginNativePainting(); // Needed when using the GL2 engine
+        glWidget()->makeCurrent(); // Needed when using the GL1 engine
         glBindTexture(GL_TEXTURE_2D, m_compositing_tex);
         glEnable(GL_TEXTURE_2D);
+        glEnable(GL_BLEND);
+        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
         glColor4f(1.,1.,1.,1.);
         glBegin(GL_QUADS);
         {
@@ -426,6 +433,7 @@ void CompositionRenderer::paint(QPainter *painter)
         }
         glEnd();
         glDisable(GL_TEXTURE_2D);
+        painter->endNativePainting(); // Needed when using the GL2 engine
     } else
 #endif
     {
diff --git a/demos/embedded/digiflip/digiflip.pro b/demos/embedded/digiflip/digiflip.pro
index 6654088..4db5171 100644
--- a/demos/embedded/digiflip/digiflip.pro
+++ b/demos/embedded/digiflip/digiflip.pro
@@ -1 +1,7 @@
 SOURCES = digiflip.cpp
+
+symbian {
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000CF72
+}
+
diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro
index 3d814f7..5bd3276 100644
--- a/demos/embedded/embedded.pro
+++ b/demos/embedded/embedded.pro
@@ -7,12 +7,10 @@ contains(QT_CONFIG, svg) {
     !vxworks:!qnx:SUBDIRS += fluidlauncher
 }
 
-contains(QT_CONFIG, network) {
-    SUBDIRS += lightmaps
-    SUBDIRS += flightinfo
-    contains(QT_CONFIG, svg) {
-        SUBDIRS += weatherinfo
-    }
+SUBDIRS += lightmaps
+SUBDIRS += flightinfo
+contains(QT_CONFIG, svg) {
+    SUBDIRS += weatherinfo
 }
 
 contains(QT_CONFIG, webkit) {
diff --git a/demos/embedded/flickable/flickable.pro b/demos/embedded/flickable/flickable.pro
index 3c021dd..02e88aa 100644
--- a/demos/embedded/flickable/flickable.pro
+++ b/demos/embedded/flickable/flickable.pro
@@ -1,2 +1,7 @@
 SOURCES = flickable.cpp main.cpp
 HEADERS = flickable.h
+
+symbian {
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000CF73
+}
diff --git a/demos/embedded/flightinfo/flightinfo.pro b/demos/embedded/flightinfo/flightinfo.pro
index 5edb175..461c701 100644
--- a/demos/embedded/flightinfo/flightinfo.pro
+++ b/demos/embedded/flightinfo/flightinfo.pro
@@ -6,6 +6,8 @@ RESOURCES = flightinfo.qrc
 QT += network
 
 symbian {
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000CF74
     HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
     LIBS += -lesock  -lconnmon
     TARGET.CAPABILITY = NetworkServices
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index 522ccf3..3ed4f31 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -61,7 +61,6 @@ symbian {
     TARGET.UID3 = 0xA000A641
 
     executables.sources = \
-        embeddedsvgviewer.exe \
         styledemo.exe \
         deform.exe \
         pathstroke.exe \
@@ -71,48 +70,78 @@ symbian {
         desktopservices.exe \
         fridgemagnets.exe \
         drilldown.exe \
-        softkeys.exe
-
-    contains(QT_CONFIG, webkit): executables.sources += anomaly.exe
-    contains(QT_CONFIG, script): executables.sources += context2d.exe
+        softkeys.exe \
+        raycasting.exe \
+        flickable.exe \
+        digiflip.exe \
+        lightmaps.exe \
+        flightinfo.exe
 
     executables.path = /sys/bin
 
     reg_resource.sources = \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/embeddedsvgviewer_reg.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/styledemo_reg.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/deform_reg.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/pathstroke_reg.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/wiggly_reg.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/ftp_reg.rsc\
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/drilldown_reg.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc
-
-    contains(QT_CONFIG, webkit): reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
-    contains(QT_CONFIG, script): reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/context2d_reg.rsc
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/styledemo_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/deform_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/pathstroke_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/wiggly_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/ftp_reg.rsc\
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/drilldown_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/raycasting_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/flickable_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/digiflip_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/lightmaps_reg.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/flightinfo_reg.rsc
 
     reg_resource.path = $$REG_RESOURCE_IMPORT_DIR
 
     resource.sources = \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/ftp.rsc\
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/drilldown.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc
-    contains(QT_CONFIG, webkit): resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
-    contains(QT_CONFIG, script): resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.rsc
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/ftp.rsc\
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/drilldown.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/raycasting.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flickable.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/digiflip.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/lightmaps.rsc \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flightinfo.rsc
+
     
     resource.path = $$APP_RESOURCE_DIR
 
+    contains(QT_CONFIG, svg) { 
+        executables.sources += \ 
+            embeddedsvgviewer.exe \
+            weatherinfo.exe
+            
+        reg_resource.sources += \
+            $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/embeddedsvgviewer_reg.rsc \
+            $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/weatherinfo_reg.rsc
+            
+        resource.sources += \
+            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.rsc \
+            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/weatherinfo.rsc
+    }
+    contains(QT_CONFIG, webkit) {
+        executables.sources += anomaly.exe
+        reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
+        resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
+    }
+    contains(QT_CONFIG, script) {
+        executables.sources += context2d.exe    
+        reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/context2d_reg.rsc
+        resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.rsc
+    }
+
     mifs.sources = \
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C611.mif
     mifs.path = $$APP_RESOURCE_DIR
diff --git a/demos/embedded/fluidlauncher/pictureflow.cpp b/demos/embedded/fluidlauncher/pictureflow.cpp
index 9eeaa26..293ef99 100644
--- a/demos/embedded/fluidlauncher/pictureflow.cpp
+++ b/demos/embedded/fluidlauncher/pictureflow.cpp
@@ -3,10 +3,6 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** This is a version of the Pictureflow animated image show widget modified by Nokia.
-**
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
diff --git a/demos/embedded/fluidlauncher/pictureflow.h b/demos/embedded/fluidlauncher/pictureflow.h
index 7ae2a88..8fc145c 100644
--- a/demos/embedded/fluidlauncher/pictureflow.h
+++ b/demos/embedded/fluidlauncher/pictureflow.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This is a version of the Pictureflow animated image show widget modified by Nokia.
+** This file is part of the ActiveQt framework of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/demos/embedded/lightmaps/lightmaps.pro b/demos/embedded/lightmaps/lightmaps.pro
index e57d15d..137183a 100644
--- a/demos/embedded/lightmaps/lightmaps.pro
+++ b/demos/embedded/lightmaps/lightmaps.pro
@@ -3,6 +3,8 @@ SOURCES = lightmaps.cpp
 QT += network
 
 symbian {
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000CF75
     HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
     LIBS += -lesock  -lconnmon
     TARGET.CAPABILITY = NetworkServices
diff --git a/demos/embedded/raycasting/raycasting.pro b/demos/embedded/raycasting/raycasting.pro
index dae9412..19e0212 100644
--- a/demos/embedded/raycasting/raycasting.pro
+++ b/demos/embedded/raycasting/raycasting.pro
@@ -1,3 +1,8 @@
 TEMPLATE = app
 SOURCES = raycasting.cpp
 RESOURCES += raycasting.qrc
+
+symbian {
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000CF76
+}
diff --git a/demos/embedded/weatherinfo/weatherinfo.pro b/demos/embedded/weatherinfo/weatherinfo.pro
index a89acba..0a579b0 100644
--- a/demos/embedded/weatherinfo/weatherinfo.pro
+++ b/demos/embedded/weatherinfo/weatherinfo.pro
@@ -5,6 +5,8 @@ RESOURCES = weatherinfo.qrc
 QT += network svg
 
 symbian {
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000CF77
     HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
     LIBS += -lesock -lconnmon
     TARGET.CAPABILITY = NetworkServices
diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp
index e63417c..455ba0c 100644
--- a/demos/qtdemo/colors.cpp
+++ b/demos/qtdemo/colors.cpp
@@ -274,6 +274,8 @@ void Colors::parseArgs(int argc, char *argv[])
                                  + "[-low] [-ticker-letters<int>] [-ticker-speed<float>] [-no-ticker-morph] "
                                  + "[-ticker-morph-speed<float>] [-ticker-text<string>]");
             exit(0);
+        } else if (s == "-verbose") {
+            // this option was already handled above
         } else{
             QMessageBox::warning(0, "QtDemo", QString("Unrecognized argument:\n") + s);
             exit(0);
diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp
index 12796dc..88eaeb3 100644
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
@@ -324,9 +324,10 @@ void MenuManager::launchExample(const QString &name)
 
 #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));
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    env.insert(QLatin1String("PATH"), QLibraryInfo::location(QLibraryInfo::BinariesPath) 
+               + QLatin1Char(';') + env.value(QLatin1String("Path")));
+    process->setProcessEnvironment(env);
 #endif
 
     if (info[name]["changedirectory"] != "false"){
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index f598780..77006c2 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -184,7 +184,6 @@
   <category dirname="statemachine" name="State Machine">
     <example filename="eventtransitions" name="Event Transitions" />
     <example filename="rogue" name="Rogue" />
-    <example filename="tankgame" name="Tank Game" />
     <example filename="trafficlight" name="Traffic Light" />
     <example filename="twowaybutton" name="Two-way Button" />
   </category>
diff --git a/demos/sub-attaq/graphicsscene.cpp b/demos/sub-attaq/graphicsscene.cpp
index b4fd0c9..79de011 100644
--- a/demos/sub-attaq/graphicsscene.cpp
+++ b/demos/sub-attaq/graphicsscene.cpp
@@ -51,6 +51,7 @@
 #include "animationmanager.h"
 #include "qanimationstate.h"
 #include "progressitem.h"
+#include "textinformationitem.h"
 
 //Qt
 #include <QtCore/QPropertyAnimation>
@@ -112,6 +113,8 @@ GraphicsScene::GraphicsScene(int x, int y, int width, int height, Mode mode)
     //The item that display score and level
     progressItem = new ProgressItem(backgroundItem);
 
+    textInformationItem = new TextInformationItem(backgroundItem);
+    textInformationItem->hide();
     //We create the boat
     boat = new Boat();
     addItem(boat);
@@ -244,15 +247,15 @@ void GraphicsScene::setupScene(const QList<QAction *> &actions)
     lettersFadingState->setAnimation(lettersGroupFading);
 
     //if new game then we fade out the welcome screen and start playing
-    lettersMovingState->addTransition(newAction, SIGNAL(triggered()),lettersFadingState);
-    lettersFadingState->addTransition(lettersFadingState, SIGNAL(animationFinished()),gameState);
+    lettersMovingState->addTransition(newAction, SIGNAL(triggered()), lettersFadingState);
+    lettersFadingState->addTransition(lettersFadingState, SIGNAL(animationFinished()), gameState);
 
     //New Game is triggered then player start playing
-    gameState->addTransition(newAction, SIGNAL(triggered()),gameState);
+    gameState->addTransition(newAction, SIGNAL(triggered()), gameState);
 
     //Wanna quit, then connect to CTRL+Q
-    gameState->addTransition(quitAction, SIGNAL(triggered()),final);
-    lettersMovingState->addTransition(quitAction, SIGNAL(triggered()),final);
+    gameState->addTransition(quitAction, SIGNAL(triggered()), final);
+    lettersMovingState->addTransition(quitAction, SIGNAL(triggered()), final);
 
     //Welcome screen is the initial state
     machine->setInitialState(lettersMovingState);
diff --git a/demos/sub-attaq/graphicsscene.h b/demos/sub-attaq/graphicsscene.h
index 073ad17..8fa62f7 100644
--- a/demos/sub-attaq/graphicsscene.h
+++ b/demos/sub-attaq/graphicsscene.h
@@ -54,6 +54,7 @@ class Torpedo;
 class Bomb;
 class PixmapItem;
 class ProgressItem;
+class TextInformationItem;
 QT_BEGIN_NAMESPACE
 class QAction;
 QT_END_NAMESPACE
@@ -108,6 +109,7 @@ private:
     Mode mode;
     PixmapItem *backgroundItem;
     ProgressItem *progressItem;
+    TextInformationItem *textInformationItem;
     QAction * newAction;
     QAction * quitAction;
     Boat *boat;
diff --git a/demos/sub-attaq/states.cpp b/demos/sub-attaq/states.cpp
index 75a2615..5c809cb 100644
--- a/demos/sub-attaq/states.cpp
+++ b/demos/sub-attaq/states.cpp
@@ -47,6 +47,7 @@
 #include "torpedo.h"
 #include "animationmanager.h"
 #include "progressitem.h"
+#include "textinformationitem.h"
 
 //Qt
 #include <QtGui/QMessageBox>
@@ -226,8 +227,15 @@ void LostState::onEntry(QEvent *)
     //We clear the scene
     scene->clearScene();
 
-    //we have only one view
-    QMessageBox::information(scene->views().at(0),"You lose",message);
+    //We inform the player
+    scene->textInformationItem->setMessage(message);
+    scene->textInformationItem->show();
+}
+
+void LostState::onExit(QEvent *)
+{
+    //we hide the information
+    scene->textInformationItem->hide();
 }
 
 /** Win State */
@@ -242,7 +250,7 @@ void WinState::onEntry(QEvent *)
 
     QString message;
     if (scene->levelsData.size() - 1 != game->currentLevel) {
-        message = QString("You win the level %1. Your score is %2.\nPress Space to continue after closing this dialog.").arg(game->currentLevel+1).arg(game->score);
+        message = QString("You win the level %1. Your score is %2.\nPress Space to continue.").arg(game->currentLevel+1).arg(game->score);
         //We increment the level number
         game->currentLevel++;
     } else {
@@ -253,8 +261,15 @@ void WinState::onEntry(QEvent *)
         game->score = 0;
     }
 
-    //we have only one view
-    QMessageBox::information(scene->views().at(0),"You win",message);
+    //We inform the player
+    scene->textInformationItem->setMessage(message);
+    scene->textInformationItem->show();
+}
+
+void WinState::onExit(QEvent *)
+{
+    //we hide the information
+    scene->textInformationItem->hide();
 }
 
 /** UpdateScore State */
diff --git a/demos/sub-attaq/states.h b/demos/sub-attaq/states.h
index 7635c0c..3176571 100644
--- a/demos/sub-attaq/states.h
+++ b/demos/sub-attaq/states.h
@@ -113,6 +113,7 @@ public:
 
 protected:
     void onEntry(QEvent *);
+    void onExit(QEvent *);
 private :
     GraphicsScene *scene;
     PlayState *game;
@@ -125,6 +126,7 @@ public:
 
 protected:
     void onEntry(QEvent *);
+    void onExit(QEvent *);
 private :
     GraphicsScene *scene;
     PlayState *game;
diff --git a/demos/sub-attaq/sub-attaq.pro b/demos/sub-attaq/sub-attaq.pro
index ad1327d..ba2b54b 100644
--- a/demos/sub-attaq/sub-attaq.pro
+++ b/demos/sub-attaq/sub-attaq.pro
@@ -1,5 +1,4 @@
 contains(QT_CONFIG, opengl):QT += opengl
-
 HEADERS += boat.h \
     bomb.h \
     mainwindow.h \
@@ -13,7 +12,8 @@ HEADERS += boat.h \
     submarine_p.h \
     custompropertyanimation.h \
     qanimationstate.h \
-    progressitem.h
+    progressitem.h \
+    textinformationitem.h
 SOURCES += boat.cpp \
     bomb.cpp \
     main.cpp \
@@ -26,12 +26,18 @@ SOURCES += boat.cpp \
     states.cpp \
     custompropertyanimation.cpp \
     qanimationstate.cpp \
-    progressitem.cpp
+    progressitem.cpp \
+    textinformationitem.cpp
 RESOURCES += subattaq.qrc
 
 # install
 target.path = $$[QT_INSTALL_DEMOS]/animation/sub-attaq
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sub-attaq.pro pics
+sources.files = $$SOURCES \
+    $$HEADERS \
+    $$RESOURCES \
+    $$FORMS \
+    sub-attaq.pro \
+    pics
 sources.path = $$[QT_INSTALL_DEMOS]/animation/sub-attaq
-INSTALLS += target sources
-
+INSTALLS += target \
+    sources
diff --git a/demos/sub-attaq/textinformationitem.cpp b/demos/sub-attaq/textinformationitem.cpp
new file mode 100644
index 0000000..759aa56
--- /dev/null
+++ b/demos/sub-attaq/textinformationitem.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "textinformationitem.h"
+#include "pixmapitem.h"
+
+TextInformationItem::TextInformationItem (QGraphicsItem * parent)
+    : QGraphicsTextItem(parent)
+{
+    setFont(QFont("Comic Sans MS", 25));
+}
+#include <QDebug>
+void TextInformationItem::setMessage(const QString& text)
+{
+    setHtml(text);
+    setPos(parentItem()->boundingRect().center().x() - boundingRect().size().width()/2 , parentItem()->boundingRect().center().y());
+}
diff --git a/examples/effects/lighting/shadoweffect.h b/demos/sub-attaq/textinformationitem.h
index 64314e5..aa7f0be 100644
--- a/examples/effects/lighting/shadoweffect.h
+++ b/demos/sub-attaq/textinformationitem.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,28 +39,17 @@
 **
 ****************************************************************************/
 
-#ifndef SHADOWEFFECT_H
-#define SHADOWEFFECT_H
+#ifndef TEXTINFORMATIONITEM_H
+#define TEXTINFORMATIONITEM_H
 
-#include <QGraphicsEffect>
-#include <QGraphicsItem>
+//Qt
+#include <QtGui/QGraphicsTextItem>
 
-class ShadowEffect: public QGraphicsDropShadowEffect
+class TextInformationItem : public QGraphicsTextItem
 {
 public:
-    ShadowEffect(QGraphicsItem *item, QGraphicsItem *source);
-
-    QRectF boundingRectFor(const QRectF &rect) const;
-
-    void draw(QPainter *painter, QGraphicsEffectSource *source);
-
-private:
-    void adjustForItem();
-
-private:
-    QColor m_color;
-    QGraphicsItem *item;
-    QGraphicsItem *m_lightSource;
+    TextInformationItem(QGraphicsItem * parent = 0);
+    void setMessage(const QString& text);
 };
 
-#endif // SHADOWEFFECT_H
+#endif // TEXTINFORMATIONITEM_H
diff --git a/demos/textedit/textedit.doc b/demos/textedit/textedit.doc
deleted file mode 100644
index 53279b9..0000000
--- a/demos/textedit/textedit.doc
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!   \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.qdoc b/demos/textedit/textedit.qdoc
new file mode 100644
index 0000000..c9b06e8
--- /dev/null
+++ b/demos/textedit/textedit.qdoc
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!   \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/doc/src/diagrams/contentspropagation/customwidget.py b/doc/src/diagrams/contentspropagation/customwidget.py
index 89e0b1b..68d64e5 100755
--- a/doc/src/diagrams/contentspropagation/customwidget.py
+++ b/doc/src/diagrams/contentspropagation/customwidget.py
@@ -1,4 +1,44 @@
 #!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 import os, sys
 from PyQt4.QtCore import *
diff --git a/doc/src/diagrams/contentspropagation/standardwidgets.py b/doc/src/diagrams/contentspropagation/standardwidgets.py
index 975287d..fb5796e 100755
--- a/doc/src/diagrams/contentspropagation/standardwidgets.py
+++ b/doc/src/diagrams/contentspropagation/standardwidgets.py
@@ -1,4 +1,44 @@
 #!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 import os, sys
 from PyQt4.QtCore import *
diff --git a/doc/src/diagrams/programs/mdiarea.py b/doc/src/diagrams/programs/mdiarea.py
index c78659f..c336382 100644
--- a/doc/src/diagrams/programs/mdiarea.py
+++ b/doc/src/diagrams/programs/mdiarea.py
@@ -1,4 +1,44 @@
 #!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 import sys
 from PyQt4.QtCore import SIGNAL
diff --git a/doc/src/diagrams/programs/qpen-dashpattern.py b/doc/src/diagrams/programs/qpen-dashpattern.py
index 095d51f..24a793e 100644
--- a/doc/src/diagrams/programs/qpen-dashpattern.py
+++ b/doc/src/diagrams/programs/qpen-dashpattern.py
@@ -1,4 +1,44 @@
 #!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 import sys
 from PyQt4.QtCore import *
diff --git a/doc/src/examples/complexpingpong.qdoc b/doc/src/examples/complexpingpong.qdoc
index 22e9bc4..52266a5 100644
--- a/doc/src/examples/complexpingpong.qdoc
+++ b/doc/src/examples/complexpingpong.qdoc
@@ -46,5 +46,5 @@
     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
+    \quotefile doc/src/snippets/complexpingpong-example.txt
 */
diff --git a/doc/src/examples/dbus-pingpong.qdoc b/doc/src/examples/dbus-pingpong.qdoc
index 6b15978..1451fac 100644
--- a/doc/src/examples/dbus-pingpong.qdoc
+++ b/doc/src/examples/dbus-pingpong.qdoc
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 /*!
     \example dbus/pingpong
     \title D-Bus Ping Pong Example
@@ -5,5 +46,5 @@
     The D-Bus Ping Pong example provides a basic demonstration of D-Bus
     interfaces.
 
-    \quotefile doc/src/snippets/dbus-pingpong-example.qdoc
+    \quotefile doc/src/snippets/dbus-pingpong-example.txt
 */
diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc
index 9f5d785..2011aa9 100644
--- a/doc/src/examples/diagramscene.qdoc
+++ b/doc/src/examples/diagramscene.qdoc
@@ -704,7 +704,7 @@
     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
+    We reimplement the functions that handle mouse events to make it
     possible to alter the mouse behavior of QGraphicsTextItem.
 
     \section1 DiagramTextItem Implementation
@@ -729,7 +729,8 @@
     \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. 
+    focus to remove the item if it is empty, i.e., it contains no
+    text. 
 
     This is the implementation of \c mouseDoubleClickEvent():
 
@@ -838,7 +839,7 @@
 
     \snippet examples/graphicsview/diagramscene/arrow.cpp 7
 
-    If the line is selected we draw to dotted lines that are
+    If the line is selected, we draw two 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
diff --git a/doc/src/examples/fetchmore.qdoc b/doc/src/examples/fetchmore.qdoc
index 5434098..d561706 100644
--- a/doc/src/examples/fetchmore.qdoc
+++ b/doc/src/examples/fetchmore.qdoc
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 /*!
     \example itemviews/fetchmore
     \title Fetch More Example
diff --git a/doc/src/examples/hellogl_es.qdoc b/doc/src/examples/hellogl_es.qdoc
index 0293584..5659d7c 100644
--- a/doc/src/examples/hellogl_es.qdoc
+++ b/doc/src/examples/hellogl_es.qdoc
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 /*!
     \example opengl/hellogl_es
     \title Hello GL ES Example
diff --git a/doc/src/examples/videographicsitem.qdoc b/doc/src/examples/videographicsitem.qdoc
index ed420c0..796704c 100644
--- a/doc/src/examples/videographicsitem.qdoc
+++ b/doc/src/examples/videographicsitem.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
diff --git a/doc/src/examples/videowidget.qdoc b/doc/src/examples/videowidget.qdoc
index ea0b495..d853fa8 100644
--- a/doc/src/examples/videowidget.qdoc
+++ b/doc/src/examples/videowidget.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
diff --git a/doc/src/frameworks-technologies/dbus-adaptors.qdoc b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
index 1f0cbdf..890cac3 100644
--- a/doc/src/frameworks-technologies/dbus-adaptors.qdoc
+++ b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
@@ -39,8 +39,6 @@
 **
 ****************************************************************************/
 
-**
-**
 /*!
     \page usingadaptors.html
     \title Using QtDBus Adaptors
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 4307e0e..1d983b5 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -853,7 +853,7 @@ If you are using pre-built binaries, follow the instructions
     \brief Setting up the Windows CE environment for Qt.
     \previouspage General Qt Requirements
 
-    Qt is known to work with Visual Studio 2005 and the following SDKs for
+    Qt is known to work with Visual Studio 2005/2008 and the following SDKs for
     Windows CE development on Windows XP and Windows Vista:
 
     \list
diff --git a/doc/src/images/graphicseffect-blur.png b/doc/src/images/graphicseffect-blur.png
index 3fa403b..4ea0bbb 100644
--- a/doc/src/images/graphicseffect-blur.png
+++ b/doc/src/images/graphicseffect-blur.png
diff --git a/doc/src/images/graphicseffect-colorize.png b/doc/src/images/graphicseffect-colorize.png
index 96fbfe4..160c997 100644
--- a/doc/src/images/graphicseffect-colorize.png
+++ b/doc/src/images/graphicseffect-colorize.png
diff --git a/doc/src/images/graphicseffect-drop-shadow.png b/doc/src/images/graphicseffect-drop-shadow.png
index c02415a..813c3a8 100644
--- a/doc/src/images/graphicseffect-drop-shadow.png
+++ b/doc/src/images/graphicseffect-drop-shadow.png
diff --git a/doc/src/images/graphicseffect-effects.png b/doc/src/images/graphicseffect-effects.png
index 422ae19..3709014 100644
--- a/doc/src/images/graphicseffect-effects.png
+++ b/doc/src/images/graphicseffect-effects.png
diff --git a/doc/src/images/graphicseffect-grayscale.png b/doc/src/images/graphicseffect-grayscale.png
index 2bd0c93..8b6e5c6 100644
--- a/doc/src/images/graphicseffect-grayscale.png
+++ b/doc/src/images/graphicseffect-grayscale.png
diff --git a/doc/src/images/graphicseffect-opacity.png b/doc/src/images/graphicseffect-opacity.png
index de15859..cce75ab 100644
--- a/doc/src/images/graphicseffect-opacity.png
+++ b/doc/src/images/graphicseffect-opacity.png
diff --git a/doc/src/images/graphicseffect-pixelize.png b/doc/src/images/graphicseffect-pixelize.png
index 047c452..57a0057 100644
--- a/doc/src/images/graphicseffect-pixelize.png
+++ b/doc/src/images/graphicseffect-pixelize.png
diff --git a/doc/src/platforms/emb-deployment.qdoc b/doc/src/platforms/emb-deployment.qdoc
index a6fb978..57df026 100644
--- a/doc/src/platforms/emb-deployment.qdoc
+++ b/doc/src/platforms/emb-deployment.qdoc
@@ -71,8 +71,8 @@
     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
+    sensible path in the target device environment. See the 
+    \l {Installing Qt on Embedded Linux#Step 3: Building the
     Library}{installation} documentation for more details.
 
     \section1 Environment Variables
diff --git a/doc/src/platforms/emb-running.qdoc b/doc/src/platforms/emb-running.qdoc
index 67c9283..8f56a3b 100644
--- a/doc/src/platforms/emb-running.qdoc
+++ b/doc/src/platforms/emb-running.qdoc
@@ -77,7 +77,7 @@
     \row
     \o
     Provided that the environment variables are adjusted properly
-    during the \l {Installing Qt for Embedded Linux}{installation process}, you
+    during the \l {Installing Qt on Embedded Linux}{installation process}, you
     should see the \l {Text Edit} demo appear.
 
     It might be that the hardware drivers must be specified explicitly
diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc
index 4fef2f5..8d79a8c 100644
--- a/doc/src/platforms/platform-notes-rtos.qdoc
+++ b/doc/src/platforms/platform-notes-rtos.qdoc
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 /*!
     \page platform-notes-vxworks.html
     \title Platform Notes - VxWorks
diff --git a/doc/src/platforms/qt-embedded-linux.qdoc b/doc/src/platforms/qt-embedded-linux.qdoc
index 0bb2f7d..be98e43 100644
--- a/doc/src/platforms/qt-embedded-linux.qdoc
+++ b/doc/src/platforms/qt-embedded-linux.qdoc
@@ -81,7 +81,7 @@
     \o
      \list
         \o \l {Qt for Embedded Linux Architecture}{Architecture Overview}
-        \o \l {Installing Qt for Embedded Linux}{Installation}
+        \o \l {Installing Qt on Embedded Linux}{Installation}
         \o \l {Running Qt for Embedded Linux Applications}{Running Applications}
         \o \l {Qt for Embedded Linux Examples}{Examples}
     \endlist
diff --git a/doc/src/platforms/qtmac-as-native.qdoc b/doc/src/platforms/qtmac-as-native.qdoc
index 97b4c57..2b6f151 100644
--- a/doc/src/platforms/qtmac-as-native.qdoc
+++ b/doc/src/platforms/qtmac-as-native.qdoc
@@ -39,49 +39,6 @@
 **
 ****************************************************************************/
 
-/****************************************************************************
-**
-** Qt for Mac OS X documentation
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-**********************************************************************/
-
 /*!
     \page qtmac-as-native.html
     \title Qt is Mac OS X Native
diff --git a/doc/src/platforms/wince-introduction.qdoc b/doc/src/platforms/wince-introduction.qdoc
index 2018eaa..561217d 100644
--- a/doc/src/platforms/wince-introduction.qdoc
+++ b/doc/src/platforms/wince-introduction.qdoc
@@ -84,8 +84,11 @@
     \section1 Required tools
 
     In order to use Qt for Windows CE you need to have Visual Studio
-    2005 and at least one of the supported Windows CE/Mobile SDKs
-    installed.
+    2005 or 2008 and at least one of the supported Windows
+    CE/Mobile SDKs installed.
+    Note, that the Visual Studio 2008 Standard Edition doesn't come
+    with Windows CE support. You will need the Professional Edition,
+    if you're using Visual Studio 2008.
 
     We recommend the \e{Windows Mobile 5.0 SDK for Pocket PC} SDK available
     \l{http://www.microsoft.com/downloads/details.aspx?FamilyID=83a52af2-f524-4ec5-9155-717cbe5d25ed&amp;DisplayLang=en}{here}.
@@ -103,15 +106,15 @@
 
     Once you have a \c .pro file, there are two ways of building your
     application. You can either do it on the command line or inside of
-    VS2005. To do it on the command line, simply write:
+    Visual Studio. To do it on the command line, simply write:
 
     \snippet doc/src/snippets/code/doc_src_wince-introduction.qdoc 0
 
-    To build the project inside of VS2005, on the command line write:
+    To build the project inside of Visual Studio, on the command line write:
 
     \snippet doc/src/snippets/code/doc_src_wince-introduction.qdoc 1
 
-    then start VS2005 with the generated \c .vcproj or \c .sln file and
+    then start Visual Studio with the generated \c .vcproj or \c .sln file and
     select \e{Build project}.
 
     For more information on how to use qmake have a look at the \l
@@ -121,20 +124,20 @@
 
     In order to run the application, it needs to be deployed on the
     Windows CE/Mobile device you want to test it for. This can either
-    be done manually or automated using VS2005.
+    be done manually or automated using Visual Studio.
 
     To do it manually, simply copy the executable, the Qt \c{.dll}
     files needed for the application to run, and the C-runtime library
     into a folder on the device, and then click on the executable to
     start the program. You can either use the \e Explorer found in
-    ActiveSync or the \e{Remote File Viewer} found in VS2005 to do
+    ActiveSync or the \e{Remote File Viewer} found in Visual Studio to do
     this.
 
-    VS2005 can do this step automatically for you as well. If you have
-    built the project inside VS2005, simply select \e Deploy and then
+    Visual Studio can do this step automatically for you as well. If you have
+    built the project inside Visual Studio, simply select \e Deploy and then
     \e Debug to deploy and then run the application. You can change the
     device type by changing the \e{Target Device} specified in the
-    VS2005 toolbar.
+    Visual Studio toolbar.
 
     Further information on deploying Qt applications for Windows can
     be found in the \l{Deploying an Application on Windows}
diff --git a/doc/src/s60-introduction.qdoc b/doc/src/s60-introduction.qdoc
index 53ad562..0fd3a30 100644
--- a/doc/src/s60-introduction.qdoc
+++ b/doc/src/s60-introduction.qdoc
@@ -90,7 +90,7 @@
     \row \o \c debug-armv5   \o Build debug binaries for hardware using RVCT.
     \row \o \c release-armv5 \o Build release binaries for hardware using RVCT.
     \row \o \c run           \o Run the emulator binaries from the build directory.
-    \row \o \c sisx          \o Create signed \c .sis file for project.
+    \row \o \c sis          \o Create signed \c .sis file for project.
     \endtable
 
     The following lines perform a debug build for the emulator
@@ -104,9 +104,9 @@
     \section1 Installing your own applications
 
     To install your own applications on hardware, you need signed \c .sis file.
-    The signed \c .sis file can be created with \c make \c sisx target. \c sisx target
+    The signed \c .sis file can be created with \c make \c sis target. \c sis target
     is only supported for executables or projects with \c DEPLOYMENT statements.
-    By default the \c sisx target will create signed \.sis file for last build
+    By default the \c sis target will create signed \.sis file for last build
     target. For example, the following sequence will generate the needed makefiles, 
     build the project for \c debug-winscw and \c release-armv5, and create 
     self-signed \c .sis file for \c release-armv5 target:
@@ -118,18 +118,18 @@
     shown in the table below:
     
     \table
-    \row \o \c QT_SISX_OPTIONS      \o Options accepted by \c .sis creation. 
+    \row \o \c QT_SIS_OPTIONS      \o Options accepted by \c .sis creation. 
                                        Currently only -i, install the package right away 
                                        using PC suite, is supported.
                                        By default no otions are given.
-    \row \o \c QT_SISX_TARGET       \o Target for which \c .sis file is created.
+    \row \o \c QT_SIS_TARGET       \o Target for which \c .sis file is created.
                                        Accepted values are build targets listed in 
                                        previous table. By default last build target.
-    \row \o \c QT_SISX_CERTIFICATE  \o The certificate file used for signing.
+    \row \o \c QT_SIS_CERTIFICATE  \o The certificate file used for signing.
                                        By default self-signed certificate. 
-    \row \o \c QT_SISX_KEY          \o The certificate's private key file.
+    \row \o \c QT_SIS_KEY          \o The certificate's private key file.
                                        By default key is associated to self-signed certificate. 
-    \row \o \c QT_SISX_PASSPHRASE   \o The certificate's private key file's passphrase.
+    \row \o \c QT_SIS_PASSPHRASE   \o The certificate's private key file's passphrase.
                                        By default empty. 
     \endtable    
     
@@ -142,8 +142,8 @@
     \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 4        
     
     If you want to install the program immediately, make sure that the device
-    is connected to the computer in "PC Suite" mode, and run \c sisx target
-    with the \c QT_SISX_OPTIONS=-i, like this:
+    is connected to the computer in "PC Suite" mode, and run \c sis target
+    with the \c QT_SIS_OPTIONS=-i, like this:
 
     \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 5
 */
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index e84e188..e294c12 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -197,10 +197,10 @@ make release-armv5
 
 //! [29]
 cd src\s60installs
-make sisx QT_SISX_OPTIONS=-i QT_SISX_CERTIFICATE=<certificate file> QT_SISX_KEY=<certificate key file>
+make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file>
 //! [29]
 
 //! [30]
 cd embedded\fluidlauncher
-make sisx QT_SISX_OPTIONS=-i
+make sis QT_SIS_OPTIONS=-i
 //! [30]
diff --git a/doc/src/snippets/code/doc_src_qtmultimedia.qdoc b/doc/src/snippets/code/doc_src_qtmultimedia.qdoc
index 87a03a4..97b3232 100644
--- a/doc/src/snippets/code/doc_src_qtmultimedia.qdoc
+++ b/doc/src/snippets/code/doc_src_qtmultimedia.qdoc
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 //! [0]
 QT += multimedia
 //! [0]
diff --git a/doc/src/snippets/code/doc_src_s60-introduction.qdoc b/doc/src/snippets/code/doc_src_s60-introduction.qdoc
index fa9fd45..8702b78 100644
--- a/doc/src/snippets/code/doc_src_s60-introduction.qdoc
+++ b/doc/src/snippets/code/doc_src_s60-introduction.qdoc
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 //! [0]
     qmake
 //! [0]
@@ -10,19 +51,19 @@
 //! [2]
     qmake
     make debug-winscw release-armv5
-    make sisx
+    make sis
 //! [2]
 
 //! [3]
-   make sisx QT_SISX_TARGET=debug-armv5
+   make sis QT_SIS_TARGET=debug-armv5
 //! [3]
 
 //! [4]
-   set QT_SISX_TARGET=debug-armv5
-   make sisx
+   set QT_SIS_TARGET=debug-armv5
+   make sis
 //! [4]
 
 //! [5]
-   set QT_SISX_OPTIONS=-i
-   make sisx
-//! [5]
\ No newline at end of file
+   set QT_SIS_OPTIONS=-i
+   make sis
+//! [5]
diff --git a/doc/src/snippets/code/src_corelib_io_qsettings.cpp b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
index 12a204b..c380d19 100644
--- a/doc/src/snippets/code/src_corelib_io_qsettings.cpp
+++ b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
     const QSettings::Format XmlFormat =
             QSettings::registerFormat("xml", readXmlFile, writeXmlFile);
 
-    QSettings settings(XmlFormat, QSettings::UserSettings, "MySoft",
+    QSettings settings(XmlFormat, QSettings::UserScope, "MySoft",
                        "Star Runner");
 
     ...
diff --git a/doc/src/snippets/complexpingpong-example.qdoc b/doc/src/snippets/complexpingpong-example.txt
index 257f702..257f702 100644
--- a/doc/src/snippets/complexpingpong-example.qdoc
+++ b/doc/src/snippets/complexpingpong-example.txt
diff --git a/doc/src/snippets/dbus-pingpong-example.qdoc b/doc/src/snippets/dbus-pingpong-example.txt
index 13a34a8..13a34a8 100644
--- a/doc/src/snippets/dbus-pingpong-example.qdoc
+++ b/doc/src/snippets/dbus-pingpong-example.txt
diff --git a/doc/src/snippets/droparea.cpp b/doc/src/snippets/droparea.cpp
index cc07fcb..34dcc33 100644
--- a/doc/src/snippets/droparea.cpp
+++ b/doc/src/snippets/droparea.cpp
@@ -3,6 +3,8 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
+** This file is part of the documentation of the Qt Toolkit.
+**
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
diff --git a/doc/src/snippets/qmacnativewidget/main.mm b/doc/src/snippets/qmacnativewidget/main.mm
index 66c6fbf..c074c2c 100644
--- a/doc/src/snippets/qmacnativewidget/main.mm
+++ b/doc/src/snippets/qmacnativewidget/main.mm
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include <QtGui/QtGui>
 #include <QtGui/qmacnativewidget_mac.h>
 #ifdef QT_MAC_USE_COCOA
diff --git a/doc/src/widgets-and-layouts/gallery-gtk.qdoc b/doc/src/widgets-and-layouts/gallery-gtk.qdoc
index 8251f04..2eb5f52 100644
--- a/doc/src/widgets-and-layouts/gallery-gtk.qdoc
+++ b/doc/src/widgets-and-layouts/gallery-gtk.qdoc
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 /*!
   \page gallery-gtk.html
 
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index 6355850..354050d 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -2067,6 +2067,9 @@
            QMenuBar, QPushButton, QRadioButton, QSizeGrip, QSpinBox,
            QSplitter, QStatusBar, QTextEdit, and QToolTip.
 
+           The value is relative to the contents rect in the \l{The
+           Box Model}{box model}.
+
            Example:
 
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 63
@@ -2084,6 +2087,9 @@
            QMenuBar, QPushButton, QRadioButton, QSizeGrip, QSpinBox,
            QSplitter, QStatusBar, QTextEdit, and QToolTip.
 
+           The value is relative to the contents rect in the \l{The
+           Box Model}{box model}.
+
            Example:
 
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 64
@@ -2121,6 +2127,9 @@
            If this property is not specified, the minimum height is
            derived based on the widget's contents and the style.
 
+           The value is relative to the contents rect in the \l{The
+           Box Model}{box model}.
+
            Example:
 
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 66
@@ -2141,6 +2150,9 @@
            If this property is not specified, the minimum width is
            derived based on the widget's contents and the style.
 
+           The value is relative to the contents rect in the \l{The
+           Box Model}{box model}.
+
            Example:
 
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 67
diff --git a/examples/animation/states/main.cpp b/examples/animation/states/main.cpp
index a78548c..9644049 100644
--- a/examples/animation/states/main.cpp
+++ b/examples/animation/states/main.cpp
@@ -179,8 +179,8 @@ int main(int argc, char *argv[])
 
     // State 3
     state3->assignProperty(button, "text", "Switch to state 1");
-    state3->assignProperty(p1, "geometry", QRectF(5, 5, 64, 64));
-    state3->assignProperty(p2, "geometry", QRectF(5, 5 + 64 + 5, 64, 64));
+    state3->assignProperty(p1, "geometry", QRectF(0, 5, 64, 64));
+    state3->assignProperty(p2, "geometry", QRectF(0, 5 + 64 + 5, 64, 64));
     state3->assignProperty(p3, "geometry", QRectF(5, 5 + (64 + 5) + 64, 64, 64));
     state3->assignProperty(p4, "geometry", QRectF(5 + 64 + 5, 5, 64, 64));
     state3->assignProperty(p5, "geometry", QRectF(5 + 64 + 5, 5 + 64 + 5, 64, 64));
diff --git a/examples/animation/stickman/lifecycle.cpp b/examples/animation/stickman/lifecycle.cpp
index 0fff529..463a27d 100644
--- a/examples/animation/stickman/lifecycle.cpp
+++ b/examples/animation/stickman/lifecycle.cpp
@@ -100,7 +100,7 @@ LifeCycle::LifeCycle(StickMan *stickMan, GraphicsView *keyReceiver)
     m_animationGroup = new QParallelAnimationGroup();
     const int stickManNodeCount = m_stickMan->nodeCount();
     for (int i=0; i<stickManNodeCount; ++i) {
-        QPropertyAnimation *pa = new QPropertyAnimation(m_stickMan->node(i), "position");
+        QPropertyAnimation *pa = new QPropertyAnimation(m_stickMan->node(i), "pos");
         m_animationGroup->addAnimation(pa);    
     }
 
@@ -186,7 +186,7 @@ QState *LifeCycle::makeState(QState *parentState, const QString &animationFileNa
         QState *frameState = new QState(topLevel);                       
         const int nodeCount = animation.nodeCount();
         for (int j=0; j<nodeCount; ++j)
-            frameState->assignProperty(m_stickMan->node(j), "position", animation.nodePos(j));
+            frameState->assignProperty(m_stickMan->node(j), "pos", animation.nodePos(j));
 //! [1]
 
         frameState->setObjectName(QString::fromLatin1("frame %0").arg(i));
diff --git a/examples/animation/stickman/main.cpp b/examples/animation/stickman/main.cpp
index 2b9e63c..f363d5d 100644
--- a/examples/animation/stickman/main.cpp
+++ b/examples/animation/stickman/main.cpp
@@ -50,6 +50,7 @@
 
 int main(int argc, char **argv)
 {
+    Q_INIT_RESOURCE(stickman);
     QApplication app(argc, argv);
 
     StickMan *stickMan = new StickMan;
@@ -72,26 +73,30 @@ int main(int argc, char **argv)
     QRectF stickManBoundingRect = stickMan->mapToScene(stickMan->boundingRect()).boundingRect();
     textItem->setPos(-w / 2.0, stickManBoundingRect.bottom() + 25.0);
 
-    QGraphicsScene *scene = new QGraphicsScene();
-    scene->addItem(stickMan);
-    scene->addItem(textItem);
-    scene->setBackgroundBrush(Qt::black);
+    QGraphicsScene scene;
+    scene.addItem(stickMan);
+    scene.addItem(textItem);
+    scene.setBackgroundBrush(Qt::black);
 
-    GraphicsView *view = new GraphicsView();
-    view->setRenderHints(QPainter::Antialiasing);
-    view->setTransformationAnchor(QGraphicsView::NoAnchor);
-    view->setScene(scene);
-    view->showFullScreen();
-    view->setFocus();    
-    view->setSceneRect(scene->sceneRect());
-    
-    LifeCycle *cycle = new LifeCycle(stickMan, view);
-    cycle->setDeathAnimation("animations/dead");
-    
-    cycle->addActivity("animations/jumping", Qt::Key_J);
-    cycle->addActivity("animations/dancing", Qt::Key_D);
-    cycle->addActivity("animations/chilling", Qt::Key_C);
-    cycle->start();
+    GraphicsView view;
+    view.setRenderHints(QPainter::Antialiasing);
+    view.setTransformationAnchor(QGraphicsView::NoAnchor);
+    view.setScene(&scene);
+    view.show();
+    view.setFocus();
+
+    QRectF sceneRect = scene.sceneRect();
+    // making enough room in the scene for stickman to jump and die
+    view.resize(sceneRect.width() + 100, sceneRect.height() + 100);
+    view.setSceneRect(sceneRect);
+
+    LifeCycle cycle(stickMan, &view);
+    cycle.setDeathAnimation(":/animations/dead");
+
+    cycle.addActivity(":/animations/jumping", Qt::Key_J);
+    cycle.addActivity(":/animations/dancing", Qt::Key_D);
+    cycle.addActivity(":/animations/chilling", Qt::Key_C);
+    cycle.start();
 
     return app.exec();
 }
diff --git a/examples/animation/stickman/node.cpp b/examples/animation/stickman/node.cpp
index 51224bb..1a138b2 100644
--- a/examples/animation/stickman/node.cpp
+++ b/examples/animation/stickman/node.cpp
@@ -47,9 +47,10 @@
 #include <QGraphicsSceneMouseEvent>
 
 Node::Node(const QPointF &pos, QGraphicsItem *parent)
-  : QGraphicsItem(parent), m_dragging(false)
+  : QGraphicsObject(parent), m_dragging(false)
 {
     setPos(pos);
+    setFlag(QGraphicsItem::ItemSendsGeometryChanges);
 }
 
 Node::~Node()
@@ -72,7 +73,7 @@ QVariant Node::itemChange(GraphicsItemChange change, const QVariant &value)
     if (change == QGraphicsItem::ItemPositionChange)
         emit positionChanged();
 
-    return QGraphicsItem::itemChange(change, value);
+    return QGraphicsObject::itemChange(change, value);
 }
 
 void Node::mousePressEvent(QGraphicsSceneMouseEvent *)
diff --git a/examples/animation/stickman/node.h b/examples/animation/stickman/node.h
index 66ee565..4360d2e 100644
--- a/examples/animation/stickman/node.h
+++ b/examples/animation/stickman/node.h
@@ -44,10 +44,9 @@
 
 #include <QGraphicsItem>
 
-class Node: public QObject, public QGraphicsItem
+class Node: public QGraphicsObject
 {
     Q_OBJECT
-    Q_PROPERTY(QPointF position READ pos WRITE setPos)
 public:
     Node(const QPointF &pos, QGraphicsItem *parent = 0);
     ~Node();
diff --git a/examples/animation/stickman/stickman.cpp b/examples/animation/stickman/stickman.cpp
index 78e9e5b..67e022b 100644
--- a/examples/animation/stickman/stickman.cpp
+++ b/examples/animation/stickman/stickman.cpp
@@ -52,7 +52,6 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-static const int NodeCount = 16;
 static const qreal Coords[NodeCount * 2] = {
     0.0, -150.0, // head, #0
 
@@ -79,7 +78,6 @@ static const qreal Coords[NodeCount * 2] = {
 
 };
 
-static const int BoneCount = 24;
 static const int Bones[BoneCount * 2] = {
     0, 1, // neck
 
@@ -116,7 +114,6 @@ static const int Bones[BoneCount * 2] = {
 
 StickMan::StickMan()
 {
-    m_nodes = new Node*[NodeCount];
     m_sticks = true;
     m_isDead = false;
     m_pixmap = QPixmap("images/head.png");
@@ -129,7 +126,6 @@ StickMan::StickMan()
         connect(m_nodes[i], SIGNAL(positionChanged()), this, SLOT(childPositionChanged()));
     }
 
-    m_perfectBoneLengths = new qreal[BoneCount];
     for (int i=0; i<BoneCount; ++i) {
         int n1 = Bones[i * 2];
         int n2 = Bones[i * 2 + 1];
@@ -146,7 +142,6 @@ StickMan::StickMan()
 
 StickMan::~StickMan()
 {
-    delete m_nodes;
 }
 
 void StickMan::childPositionChanged()
diff --git a/examples/animation/stickman/stickman.h b/examples/animation/stickman/stickman.h
index e8eedfa..d663c04 100644
--- a/examples/animation/stickman/stickman.h
+++ b/examples/animation/stickman/stickman.h
@@ -42,15 +42,15 @@
 #ifndef STICKMAN_H
 #define STICKMAN_H
 
-#include <QGraphicsItem>
+#include <QGraphicsObject>
 
-const int LimbCount = 16;
+static const int NodeCount = 16;
+static const int BoneCount = 24;
 
 class Node;
 QT_BEGIN_NAMESPACE
-class QTimer;
 QT_END_NAMESPACE
-class StickMan: public QObject, public QGraphicsItem
+class StickMan: public QGraphicsObject
 {
     Q_OBJECT
     Q_PROPERTY(QColor penColor WRITE setPenColor READ penColor)
@@ -77,7 +77,7 @@ public:
 
     bool isDead() const { return m_isDead; }
     void setIsDead(bool isDead) { m_isDead = isDead; }
-   
+
 public slots:
     void stabilize();
     void childPositionChanged();
@@ -86,10 +86,11 @@ protected:
     void timerEvent(QTimerEvent *e);
 
 private:
+
     QPointF posFor(int idx) const;
 
-    Node **m_nodes;
-    qreal *m_perfectBoneLengths;
+    Node *m_nodes[NodeCount];
+    qreal m_perfectBoneLengths[BoneCount];
     
     uint m_sticks : 1;
     uint m_isDead : 1;
diff --git a/examples/animation/stickman/stickman.pro b/examples/animation/stickman/stickman.pro
index 7f8be33..487ff3a 100644
--- a/examples/animation/stickman/stickman.pro
+++ b/examples/animation/stickman/stickman.pro
@@ -10,7 +10,7 @@ SOURCES += main.cpp \
            lifecycle.cpp \
            graphicsview.cpp
 
-INCLUDEPATH += $$PWD
+RESOURCES += stickman.qrc
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/animation/stickman
diff --git a/examples/animation/stickman/stickman.qrc b/examples/animation/stickman/stickman.qrc
new file mode 100644
index 0000000..e5d66cf
--- /dev/null
+++ b/examples/animation/stickman/stickman.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>animations/chilling</file>
+    <file>animations/dancing</file>
+    <file>animations/dead</file>
+    <file>animations/jumping</file>
+</qresource>
+</RCC>
\ No newline at end of file
diff --git a/examples/effects/lighting/lighting.cpp b/examples/effects/lighting/lighting.cpp
index 2294b36..e309e2e 100644
--- a/examples/effects/lighting/lighting.cpp
+++ b/examples/effects/lighting/lighting.cpp
@@ -43,8 +43,6 @@
 
 #include <QtGui>
 
-#include "shadoweffect.h"
-
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
@@ -98,7 +96,7 @@ void Lighting::setupScene()
 
             item->setPen(QPen(Qt::black));
             item->setBrush(QBrush(Qt::white));
-            item->setGraphicsEffect(new ShadowEffect(item, m_lightSource));
+            item->setGraphicsEffect(new QGraphicsDropShadowEffect);
             item->setZValue(1);
             item->setPos(i * 80, j * 80);
             m_scene.addItem(item);
@@ -114,6 +112,24 @@ void Lighting::animate()
     qreal xs = 200 * sin(angle) - 40 + 25;
     qreal ys = 200 * cos(angle) - 40 + 25;
     m_lightSource->setPos(xs, ys);
+
+    for (int i = 0; i < m_items.size(); ++i) {
+        QGraphicsItem *item = m_items.at(i);
+        Q_ASSERT(item);
+        QGraphicsDropShadowEffect *effect = static_cast<QGraphicsDropShadowEffect *>(item->graphicsEffect());
+        Q_ASSERT(effect);
+
+        QPointF delta(item->x() - xs, item->y() - ys);
+        effect->setOffset(delta.toPoint() / 30);
+
+        qreal dx = delta.x();
+        qreal dy = delta.y();
+        qreal dd = sqrt(dx * dx + dy * dy);
+        QColor color = effect->color();
+        color.setAlphaF(qBound(0.4, 1 - dd / 200.0, 0.7));
+        effect->setColor(color);
+    }
+
     m_scene.update();
 }
 
diff --git a/examples/effects/lighting/lighting.h b/examples/effects/lighting/lighting.h
index 3e12fdf..eef5cae 100644
--- a/examples/effects/lighting/lighting.h
+++ b/examples/effects/lighting/lighting.h
@@ -45,8 +45,6 @@
 #include <QGraphicsEffect>
 #include <QGraphicsView>
 
-#include "shadoweffect.h"
-
 class Lighting: public QGraphicsView
 {
     Q_OBJECT
diff --git a/examples/effects/lighting/lighting.pro b/examples/effects/lighting/lighting.pro
index ea9d5f6..432d1b5 100644
--- a/examples/effects/lighting/lighting.pro
+++ b/examples/effects/lighting/lighting.pro
@@ -1,5 +1,5 @@
-SOURCES += main.cpp lighting.cpp shadoweffect.cpp
-HEADERS += lighting.h shadoweffect.h
+SOURCES += main.cpp lighting.cpp
+HEADERS += lighting.h
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/effects/lighting
diff --git a/examples/gestures/imageviewer/imageviewer.pro b/examples/gestures/imageviewer/imageviewer.pro
index efbca00..124175e 100644
--- a/examples/gestures/imageviewer/imageviewer.pro
+++ b/examples/gestures/imageviewer/imageviewer.pro
@@ -1,11 +1,11 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 HEADERS += imagewidget.h \
     tapandholdgesture.h
 SOURCES += imagewidget.cpp \
     tapandholdgesture.cpp \
     main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/gestures/imageviewer
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS imageviewer.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/gestures/imageviewer
+INSTALLS += target sources
diff --git a/examples/gestures/imageviewer/imagewidget.cpp b/examples/gestures/imageviewer/imagewidget.cpp
index 7dbd084..c71c461 100644
--- a/examples/gestures/imageviewer/imagewidget.cpp
+++ b/examples/gestures/imageviewer/imagewidget.cpp
@@ -123,8 +123,10 @@ void ImageWidget::panTriggered()
 void ImageWidget::pinchTriggered()
 {
     QPinchGesture *pg = qobject_cast<QPinchGesture*>(sender());
-    rotationAngle += pg->rotationAngle();
-    scaleFactor += pg->scaleFactor();
+    if (pg->whatChanged() & QPinchGesture::RotationAngleChanged)
+        rotationAngle += pg->rotationAngle() - pg->lastRotationAngle();
+    if (pg->whatChanged() & QPinchGesture::ScaleFactorChanged)
+        scaleFactor += pg->scaleFactor() - pg->lastScaleFactor();
     update();
 }
 
diff --git a/examples/itemviews/addressbook/addresswidget.cpp b/examples/itemviews/addressbook/addresswidget.cpp
index 6d05c22..c8dcb57 100644
--- a/examples/itemviews/addressbook/addresswidget.cpp
+++ b/examples/itemviews/addressbook/addresswidget.cpp
@@ -104,7 +104,7 @@ void AddressWidget::editEntry()
     QModelIndex index, i;        
     QString name;
     QString address;
-    int row;
+    int row = -1;
 
     foreach (index, indexes) {
         row = proxy->mapToSource(index).row();
diff --git a/examples/multimedia/audio/audiodevices/audiodevices.pro b/examples/multimedia/audio/audiodevices/audiodevices.pro
index adc4890..2c078ba 100644
--- a/examples/multimedia/audio/audiodevices/audiodevices.pro
+++ b/examples/multimedia/audio/audiodevices/audiodevices.pro
@@ -10,3 +10,8 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiodevices
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audiodevices.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiodevices
 INSTALLS += target sources
+
+symbian {
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000D7BE
+}
diff --git a/examples/multimedia/audio/audioinput/audioinput.pro b/examples/multimedia/audio/audioinput/audioinput.pro
index d930750..139240e 100644
--- a/examples/multimedia/audio/audioinput/audioinput.pro
+++ b/examples/multimedia/audio/audioinput/audioinput.pro
@@ -10,3 +10,7 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audioinput.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audioinput
 INSTALLS += target sources
 
+symbian {
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000D7BF
+}
diff --git a/examples/multimedia/audio/audiooutput/audiooutput.pro b/examples/multimedia/audio/audiooutput/audiooutput.pro
index 08f43ce..e2069cf 100644
--- a/examples/multimedia/audio/audiooutput/audiooutput.pro
+++ b/examples/multimedia/audio/audiooutput/audiooutput.pro
@@ -9,3 +9,8 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiooutput
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audiooutput.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiooutput
 INSTALLS += target sources
+
+symbian {
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000D7C0
+}
diff --git a/examples/multitouch/pinchzoom/mouse.h b/examples/multitouch/pinchzoom/mouse.h
index bd47245..e4ecb75 100644
--- a/examples/multitouch/pinchzoom/mouse.h
+++ b/examples/multitouch/pinchzoom/mouse.h
@@ -42,11 +42,10 @@
 #ifndef MOUSE_H
 #define MOUSE_H
 
-#include <QGraphicsItem>
-#include <QObject>
+#include <QGraphicsObject>
 
 //! [0]
-class Mouse : public QObject, public QGraphicsItem
+class Mouse : public QGraphicsObject
 {
     Q_OBJECT
 
diff --git a/examples/network/fortuneclient/client.cpp b/examples/network/fortuneclient/client.cpp
index b850a57..7b2991a 100644
--- a/examples/network/fortuneclient/client.cpp
+++ b/examples/network/fortuneclient/client.cpp
@@ -56,7 +56,20 @@ Client::Client(QWidget *parent)
     hostLabel = new QLabel(tr("&Server name:"));
     portLabel = new QLabel(tr("S&erver port:"));
 
-    hostLineEdit = new QLineEdit("Localhost");
+    // find out which IP to connect to
+    QString ipAddress;
+    QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
+    // use the first non-localhost IPv4 address
+    for (int i = 0; i < ipAddressesList.size(); ++i) {
+        if (ipAddressesList.at(i) != QHostAddress::LocalHost &&
+            ipAddressesList.at(i).toIPv4Address())
+            ipAddress = ipAddressesList.at(i).toString();
+    }
+    // if we did not find one, use IPv4 localhost
+    if (ipAddress.isEmpty())
+        ipAddress = QHostAddress(QHostAddress::LocalHost).toString();
+
+    hostLineEdit = new QLineEdit(ipAddress);
     portLineEdit = new QLineEdit;
     portLineEdit->setValidator(new QIntValidator(1, 65535, this));
 
diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp
index 7564199..476ff283 100644
--- a/examples/network/fortuneserver/server.cpp
+++ b/examples/network/fortuneserver/server.cpp
@@ -63,15 +63,20 @@ Server::Server(QWidget *parent)
         return;
     }
 //! [0]
-    QList<QHostAddress> ipAddresseList = QNetworkInterface::allAddresses();
-    QString ipAddresses;
-    for (int i = 0; i < ipAddresseList.size(); ++i) {
-        ipAddresses.append(ipAddresseList.at(i).toString()).append("\n");
+    QString ipAddress;
+    QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
+    // use the first non-localhost IPv4 address
+    for (int i = 0; i < ipAddressesList.size(); ++i) {
+        if (ipAddressesList.at(i) != QHostAddress::LocalHost &&
+            ipAddressesList.at(i).toIPv4Address())
+            ipAddress = ipAddressesList.at(i).toString();
     }
-
-    statusLabel->setText(tr("The server is running on \n IP: \n%1 PORT: \n%2\n"
+    // if we did not find one, use IPv4 localhost
+    if (ipAddress.isEmpty())
+        ipAddress = QHostAddress(QHostAddress::LocalHost).toString();
+    statusLabel->setText(tr("The server is running on\nIP: \n%1 port:\n%2\n"
                             "Run the Fortune Client example now.")
-                         .arg(ipAddresses).arg(tcpServer->serverPort()));
+                         .arg(ipAddress).arg(tcpServer->serverPort()));
 //! [1]
 
 //! [2]
diff --git a/examples/qws/dbscreen/dbscreen.cpp b/examples/qws/dbscreen/dbscreen.cpp
index aa33a97..3d3b15b 100644
--- a/examples/qws/dbscreen/dbscreen.cpp
+++ b/examples/qws/dbscreen/dbscreen.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/examples/qws/dbscreen/dbscreen.h b/examples/qws/dbscreen/dbscreen.h
index a3c392e..b177cfc 100644
--- a/examples/qws/dbscreen/dbscreen.h
+++ b/examples/qws/dbscreen/dbscreen.h
@@ -1,11 +1,11 @@
- /****************************************************************************
- **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
- **
- ** This file is part of the examples of the Qt Toolkit.
- **
- ** $QT_BEGIN_LICENSE:LGPL$
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
@@ -36,11 +36,8 @@
 **
 **
 ** $QT_END_LICENSE$
- **
- ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- **
- ****************************************************************************/
+**
+****************************************************************************/
 
 #ifndef DBSCREEN_H
 #define DBSCREEN_H
diff --git a/examples/script/context2d/context2d.cpp b/examples/script/context2d/context2d.cpp
index 5b4a1cf..05352cd 100644
--- a/examples/script/context2d/context2d.cpp
+++ b/examples/script/context2d/context2d.cpp
@@ -369,7 +369,7 @@ void Context2D::setLineCap(const QString &capString)
         style = Qt::RoundCap;
     else if (capString == "square")
         style = Qt::SquareCap;
-    else if (capString == "butt")
+    else //if (capString == "butt")
         style = Qt::FlatCap;
     m_state.lineCap = style;
     m_state.flags |= DirtyLineCap;
@@ -397,7 +397,7 @@ void Context2D::setLineJoin(const QString &joinString)
         style = Qt::RoundJoin;
     else if (joinString == "bevel")
         style = Qt::BevelJoin;
-    else if (joinString == "miter")
+    else //if (joinString == "miter")
         style = Qt::MiterJoin;
     m_state.lineJoin = style;
     m_state.flags |= DirtyLineJoin;
diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp
index a61452a..c9a8898 100644
--- a/examples/script/context2d/main.cpp
+++ b/examples/script/context2d/main.cpp
@@ -48,7 +48,6 @@ int main(int argc, char **argv)
 
     QApplication app(argc, argv);
     Window win;
-    //win.show();
-    win.showFullScreen();
+    win.show();
     return app.exec();
 }
diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro
index e8f59fb..b401c05 100644
--- a/examples/uitools/multipleinheritance/multipleinheritance.pro
+++ b/examples/uitools/multipleinheritance/multipleinheritance.pro
@@ -10,4 +10,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/uitools/multipleinheritance
 INSTALLS += target sources
 
-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian {
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000D7C1
+}
\ No newline at end of file
diff --git a/examples/video/videographicsitem/videographicsitem.pro b/examples/video/videographicsitem/videographicsitem.pro
index 7e0b4c5..7ebd975 100644
--- a/examples/video/videographicsitem/videographicsitem.pro
+++ b/examples/video/videographicsitem/videographicsitem.pro
@@ -14,3 +14,8 @@ target.path = $$[QT_INSTALL_EXAMPLES]/video/videographicsitem
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png images
 sources.path = $$[QT_INSTALL_EXAMPLES]/video/videographicsitem
 INSTALLS += target sources
+
+symbian {
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000D7C2
+}
diff --git a/examples/video/videowidget/videowidget.pro b/examples/video/videowidget/videowidget.pro
index a006f2f..cc0260f 100644
--- a/examples/video/videowidget/videowidget.pro
+++ b/examples/video/videowidget/videowidget.pro
@@ -12,3 +12,8 @@ SOURCES = \
     videoplayer.cpp \
     videowidget.cpp \
     videowidgetsurface.cpp
+
+symbian {
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000D7C3
+}
diff --git a/examples/xml/saxbookmarks/mainwindow.cpp b/examples/xml/saxbookmarks/mainwindow.cpp
index cdc9e72..6ee259b 100644
--- a/examples/xml/saxbookmarks/mainwindow.cpp
+++ b/examples/xml/saxbookmarks/mainwindow.cpp
@@ -67,7 +67,10 @@ MainWindow::MainWindow()
 void MainWindow::open()
 {
 #if defined(Q_OS_SYMBIAN)
-    QDir::setCurrent("/Data/qt/saxbookmarks");
+    // Always look for bookmarks on the same drive where the application is installed to.
+    QString bookmarksFolder = QCoreApplication::applicationFilePath().left(1);
+    bookmarksFolder.append(":/Data/qt/saxbookmarks");
+    QDir::setCurrent(bookmarksFolder);
 #endif
     QString fileName =
             QFileDialog::getOpenFileName(this, tr("Open Bookmark File"),
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 3ba2a8c..abc8a7a 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -64,14 +64,14 @@ QMAKE_LINK_OBJECT_SCRIPT= object_script
 
 QMAKE_LIBS		= -llibc -llibm -leuser -llibdl
 QMAKE_LIBS_CORE         = $$QMAKE_LIBS -llibpthread -lefsrv
-QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio
+QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc
 QMAKE_LIBS_NETWORK      = 
 QMAKE_LIBS_EGL          = -llibEGL
 QMAKE_LIBS_OPENGL       = 
 QMAKE_LIBS_OPENVG       = -llibOpenVG
 QMAKE_LIBS_COMPAT       = 
 QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
-QMAKE_LIBS_S60          = -lavkon -leikcoctl
+QMAKE_LIBS_S60          = -lavkon
 
 !isEmpty(QMAKE_SH) {
     QMAKE_COPY           = cp
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index 3c2944c..7c9e8ee 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -4,7 +4,7 @@ contains(TEMPLATE, ".*app") {
     contains(CONFIG, stdbinary) {
         QMAKE_LIBS +=
     } else:contains(QT, gui):contains(CONFIG,qt) {
-        S60MAIN_LIBS = -leuser -lavkon -leikcore -leiksrv -lws32 -lapparc -lcone -leikcoctl -lbafl -lefsrv
+        S60MAIN_LIBS = -leuser
         QMAKE_LIBS += -lqtmain.lib $$S60MAIN_LIBS
     } else {
         QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
diff --git a/mkspecs/features/symbian/moc.prf b/mkspecs/features/symbian/moc.prf
index 089dddc..9c21ed7 100644
--- a/mkspecs/features/symbian/moc.prf
+++ b/mkspecs/features/symbian/moc.prf
@@ -1,16 +1,16 @@
 load(moc)
 
-RET = $$find(MOC_DIR, "\.[a-z]")
+RET = $$find(MOC_DIR, "(/|^)\.[^/]+/?$")
 !isEmpty(RET):{
-    error("Symbian does not support directories starting with a dot. Please set MOC_DIR to a different value in your profile.")
+    error("Symbian does not support directories starting with a dot. Please set MOC_DIR to a different value in your profile. MOC_DIR: $$MOC_DIR")
 }
 
-RET = $$find(RCC_DIR, "\.[a-z]")
+RET = $$find(RCC_DIR, "(/|^)\.[^/]+/?$")
 !isEmpty(RET):{
-    error("Symbian does not support directories starting with a dot. Please set RCC_DIR to a different value in your profile.")
+    error("Symbian does not support directories starting with a dot. Please set RCC_DIR to a different value in your profile. RCC_DIR: $$RCC_DIR")
 }
 
-RET = $$find(OBJECTS_DIR, "\.[a-z]")
+RET = $$find(OBJECTS_DIR, "(/|^)\.[^/]+/?$")
 !isEmpty(RET):{
-    error("Symbian does not support directories starting with a dot. Please set OBJECTS_DIR to a different value in your profile.")
+    error("Symbian does not support directories starting with a dot. Please set OBJECTS_DIR to a different value in your profile. OBJECTS_DIR: $$OBJECTS_DIR")
 }
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
index 96eb189..0abc7c4 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
@@ -27,10 +27,10 @@ $(STORE_BUILD_TARGET):
 	echo "#  Name        : .make.cache" >> $(CACHE_FILENAME) && \
 	echo "#  Part of     : " >> $(CACHE_FILENAME) && \
 	echo "#  Description : This file is used to cache last build target for" >> $(CACHE_FILENAME) && \
-	echo "#                make sisx target." >> $(CACHE_FILENAME) && \
+	echo "#                make sis target." >> $(CACHE_FILENAME) && \
 	echo "#  Version     : " >> $(CACHE_FILENAME) && \
 	echo "# ==============================================================================" >> $(CACHE_FILENAME) && \
-	echo QT_SISX_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME) \
+	echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME) \
 	$(call endrule,qmake_store_build)
 endef
 
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index 519b2ed..9ddd378 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -72,10 +72,10 @@
 #define MMP_TARGETTYPE "TARGETTYPE"
 #define MMP_SECUREID "SECUREID"
 
-#define SISX_TARGET "sisx"
-#define OK_SISX_TARGET "ok_sisx"
-#define FAIL_SISX_NOPKG_TARGET "fail_sisx_nopkg"
-#define FAIL_SISX_NOCACHE_TARGET "fail_sisx_nocache"
+#define SIS_TARGET "sis"
+#define OK_SIS_TARGET "ok_sis"
+#define FAIL_SIS_NOPKG_TARGET "fail_sis_nopkg"
+#define FAIL_SIS_NOCACHE_TARGET "fail_sis_nocache"
 #define RESTORE_BUILD_TARGET "restore_build"
 
 #define PRINT_FILE_CREATE_ERROR(filename) fprintf(stderr, "Error: Could not create '%s'\n", qPrintable(filename));
@@ -329,7 +329,7 @@ void SymbianMakefileGenerator::generatePkgFile(const QString &iconFile)
         t << ":\"Vendor\"" << endl << endl;
     }
 
-    // PKG pre-rules - these are added before actual file installations i.e. SISX package body
+    // PKG pre-rules - these are added before actual file installations i.e. SIS package body
     if (rawPkgPreRules.size()) {
         t << "; Manual PKG pre-rules from PRO files" << endl;
         foreach(QString item, rawPkgPreRules) {
@@ -1632,36 +1632,36 @@ void SymbianMakefileGenerator::removeSpecialCharacters(QString& str)
     str.replace(QString(" "), QString("_"));
 }
 
-void SymbianMakefileGenerator::writeSisxTargets(QTextStream &t)
+void SymbianMakefileGenerator::writeSisTargets(QTextStream &t)
 {
-    t << SISX_TARGET ": " RESTORE_BUILD_TARGET << endl;
-    QString sisxcommand = QString("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3)," \
+    t << SIS_TARGET ": " RESTORE_BUILD_TARGET << endl;
+    QString siscommand = QString("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3)," \
                                   "$(MAKE) -s -f $(MAKEFILE) %4,$(MAKE) -s -f $(MAKEFILE) %5)," \
                                   "$(MAKE) -s -f $(MAKEFILE) %6)")
                           .arg(fixedTarget)
                           .arg("pkg")
                           .arg(MAKE_CACHE_NAME)
-                          .arg(OK_SISX_TARGET)
-                          .arg(FAIL_SISX_NOCACHE_TARGET)
-                          .arg(FAIL_SISX_NOPKG_TARGET);    
-    t << sisxcommand << endl;         
+                          .arg(OK_SIS_TARGET)
+                          .arg(FAIL_SIS_NOCACHE_TARGET)
+                          .arg(FAIL_SIS_NOPKG_TARGET);    
+    t << siscommand << endl;         
     t << endl;
 
-    t << OK_SISX_TARGET ":" << endl;
+    t << OK_SIS_TARGET ":" << endl;
 
-    QString pkgcommand = QString("\tcreatepackage.bat $(QT_SISX_OPTIONS) %1_template.%2 $(QT_SISX_TARGET) " \
-                                 "$(QT_SISX_CERTIFICATE) $(QT_SISX_KEY) $(QT_SISX_PASSPHRASE)")
+    QString pkgcommand = QString("\tcreatepackage.bat $(QT_SIS_OPTIONS) %1_template.%2 $(QT_SIS_TARGET) " \
+                                 "$(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)")
                           .arg(fixedTarget)
                           .arg("pkg");
     t << pkgcommand << endl;
     t << endl;
     
-    t << FAIL_SISX_NOPKG_TARGET ":" << endl;  
-    t << "\t$(error PKG file does not exist, 'SISX' target is only supported for executables or projects with DEPLOYMENT statement)" << endl;  
+    t << FAIL_SIS_NOPKG_TARGET ":" << endl;  
+    t << "\t$(error PKG file does not exist, 'SIS' target is only supported for executables or projects with DEPLOYMENT statement)" << endl;  
     t << endl;
     
-    t << FAIL_SISX_NOCACHE_TARGET ":" << endl;  
-    t << "\t$(error Project has to be build before calling 'SISX' target)" << endl;  
+    t << FAIL_SIS_NOCACHE_TARGET ":" << endl;  
+    t << "\t$(error Project has to be build before calling 'SIS' target)" << endl;  
     t << endl;
     
 
diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h
index b0ca5a3..0e5eb14 100644
--- a/qmake/generators/symbian/symmake.h
+++ b/qmake/generators/symbian/symmake.h
@@ -137,7 +137,7 @@ protected:
                                const QString& itemPrefix,
                                const QString& itemSuffix);
 
-    void writeSisxTargets(QTextStream &t);
+    void writeSisTargets(QTextStream &t);
     void generateDistcleanTargets(QTextStream& t);
 
     // Subclass implements
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 31ef312..bf98079 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -153,7 +153,7 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
         QString makefile(Option::fixPathToTargetOS(fileInfo(wrapperFileName).canonicalFilePath()));
         foreach(QString target, wrapperTargets) {
             t << target << " : " << makefile << endl;
-            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << " QT_SISX_TARGET=$(VISUAL_CFG)-$(PLATFORM)" << endl << endl;                    
+            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << " QT_SIS_TARGET=$(VISUAL_CFG)-$(PLATFORM)" << endl << endl;                    
         }     
         
         t << endl;
@@ -361,7 +361,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
 
     writeDeploymentTargets(t);
 
-    writeSisxTargets(t);
+    writeSisTargets(t);
 
     writeStoreBuildTarget(t);
 
@@ -428,12 +428,12 @@ void SymbianAbldMakefileGenerator::writeStoreBuildTarget(QTextStream &t)
     t << "\t@echo #  Name        : " << MAKE_CACHE_NAME << " >> " MAKE_CACHE_NAME << endl;
     t << "\t@echo #  Part of     : " << project->values("TARGET").join(" ") << " >> " MAKE_CACHE_NAME << endl;
     t << "\t@echo #  Description : This file is used to cache last build target for >> " MAKE_CACHE_NAME << endl;
-    t << "\t@echo #                make sisx target. >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo #                make sis target. >> " MAKE_CACHE_NAME << endl;
     t << "\t@echo #  Version     :  >> " MAKE_CACHE_NAME << endl;
     t << "\t@echo # >> " MAKE_CACHE_NAME << endl;
     t << "\t@echo # ============================================================================== >> " MAKE_CACHE_NAME <<  endl;
     t << "\t@echo. >> " MAKE_CACHE_NAME <<  endl;
-    t << "\t@echo QT_SISX_TARGET ?= $(QT_SISX_TARGET) >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> " MAKE_CACHE_NAME << endl;
     t << endl;
 
     generatedFiles << MAKE_CACHE_NAME;
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index a76d959..a1381c6 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -216,7 +216,7 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo
         qDeleteAll(subtargets);
     }
 
-    writeSisxTargets(t);
+    writeSisTargets(t);
 
     generateDistcleanTargets(t);
 
diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp
index e42dff9..250b94a 100644
--- a/src/3rdparty/phonon/ds9/mediaobject.cpp
+++ b/src/3rdparty/phonon/ds9/mediaobject.cpp
@@ -21,7 +21,9 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtCore/QTime>
 #include <QtCore/QLibrary>
 
+#ifndef Q_CC_MSVC
 #include <dshow.h>
+#endif
 #include <objbase.h>
 #include <initguid.h>
 #include <qnetwork.h>
diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/src/3rdparty/webkit/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
index ce5518f..711beb4 100644
--- a/src/3rdparty/webkit/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
@@ -521,7 +521,7 @@ PassRefPtr<LabelScope> BytecodeGenerator::newLabelScope(LabelScope::Type type, c
         m_labelScopes.removeLast();
 
     // Allocate new label scope.
-    LabelScope scope(type, name, scopeDepth(), newLabel(), type == LabelScope::Loop ? newLabel() : PassRefPtr<Label>()); // Only loops have continue targets.
+    LabelScope scope(type, name, scopeDepth(), newLabel(), type == LabelScope::Loop ? newLabel() : PassRefPtr<Label>(0)); // Only loops have continue targets.
     m_labelScopes.append(scope);
     return &m_labelScopes.last();
 }
diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp
index 06ddefc..29a13ca 100644
--- a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp
@@ -34,7 +34,7 @@ namespace JSC {
 RegisterFile::~RegisterFile()
 {
 #if HAVE(MMAP)
-    munmap(m_buffer, ((m_max - m_start) + m_maxGlobals) * sizeof(Register));
+    munmap(reinterpret_cast<char*>(m_buffer), ((m_max - m_start) + m_maxGlobals) * sizeof(Register));
 #elif HAVE(VIRTUALALLOC)
     VirtualFree(m_buffer, 0, MEM_RELEASE);
 #else
diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h
index 5a34d11..14e189e 100644
--- a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h
+++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h
@@ -105,7 +105,7 @@ namespace JSC {
             ReturnValueRegister = -4,
             ArgumentCount = -3,
             Callee = -2,
-            OptionalCalleeArguments = -1,
+            OptionalCalleeArguments = -1
         };
 
         enum { ProgramCodeThisRegister = -CallFrameHeaderSize - 1 };
@@ -174,7 +174,7 @@ namespace JSC {
 
         size_t bufferLength = (capacity + maxGlobals) * sizeof(Register);
     #if HAVE(MMAP)
-        m_buffer = static_cast<Register*>(mmap(0, bufferLength, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, VM_TAG_FOR_REGISTERFILE_MEMORY, 0));
+        m_buffer = reinterpret_cast<Register*>(mmap(0, bufferLength, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, VM_TAG_FOR_REGISTERFILE_MEMORY, 0));
         if (m_buffer == MAP_FAILED) {
 #if PLATFORM(WINCE)
             fprintf(stderr, "Could not allocate register file: %d\n", GetLastError());
diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp b/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp
index 8371229..4a33e67 100644
--- a/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp
@@ -684,6 +684,10 @@ void JIT::emit_op_catch(Instruction* currentInstruction)
     killLastResultRegister(); // FIXME: Implicitly treat op_catch as a labeled statement, and remove this line of code.
     peek(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*));
     emitPutVirtualRegister(currentInstruction[1].u.operand);
+#ifdef QT_BUILD_SCRIPT_LIB
+    JITStubCall stubCall(this, JITStubs::cti_op_debug_catch);
+    stubCall.call();
+#endif
 }
 
 void JIT::emit_op_jmp_scopes(Instruction* currentInstruction)
diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp
index 2563848..f0d3b84 100644
--- a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp
@@ -2713,15 +2713,22 @@ DEFINE_STUB_FUNCTION(void, op_debug)
     int debugHookID = stackFrame.args[0].int32();
     int firstLine = stackFrame.args[1].int32();
     int lastLine = stackFrame.args[2].int32();
-#ifdef QT_BUILD_SCRIPT_LIB
     int column = stackFrame.args[3].int32();
-#else
-    int column = -1;
-#endif
 
     stackFrame.globalData->interpreter->debug(callFrame, static_cast<DebugHookID>(debugHookID), firstLine, lastLine, column);
 }
 
+#ifdef QT_BUILD_SCRIPT_LIB
+DEFINE_STUB_FUNCTION(void, op_debug_catch)
+{
+    STUB_INIT_STACK_FRAME(stackFrame);
+    CallFrame* callFrame = stackFrame.callFrame;
+    if (JSC::Debugger* debugger = callFrame->lexicalGlobalObject()->debugger() ) {
+        debugger->exceptionCatch(DebuggerCallFrame(callFrame), callFrame->codeBlock()->ownerNode()->sourceID());
+    }
+}
+#endif
+
 DEFINE_STUB_FUNCTION(EncodedJSValue, vm_throw)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.h b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.h
index 0493189..60bf64a 100644
--- a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.h
+++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.h
@@ -221,6 +221,9 @@ namespace JITStubs { extern "C" {
     void JIT_STUB cti_op_create_arguments(STUB_ARGS_DECLARATION);
     void JIT_STUB cti_op_create_arguments_no_params(STUB_ARGS_DECLARATION);
     void JIT_STUB cti_op_debug(STUB_ARGS_DECLARATION);
+#ifdef QT_BUILD_SCRIPT_LIB
+    void JIT_STUB cti_op_debug_catch(STUB_ARGS_DECLARATION);
+#endif
     void JIT_STUB cti_op_end(STUB_ARGS_DECLARATION);
     void JIT_STUB cti_op_jmp_scopes(STUB_ARGS_DECLARATION);
     void JIT_STUB cti_op_pop_scope(STUB_ARGS_DECLARATION);
diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/NodeConstructors.h b/src/3rdparty/webkit/JavaScriptCore/parser/NodeConstructors.h
index c256190..a4374d3 100644
--- a/src/3rdparty/webkit/JavaScriptCore/parser/NodeConstructors.h
+++ b/src/3rdparty/webkit/JavaScriptCore/parser/NodeConstructors.h
@@ -27,23 +27,6 @@
 
 namespace JSC {
 
-    inline void* ParserArenaDeletable::operator new(size_t size, JSGlobalData* globalData)
-    {
-        ParserArenaDeletable* deletable = static_cast<ParserArenaDeletable*>(fastMalloc(size));
-        globalData->parser->arena().deleteWithArena(deletable);
-        return deletable;
-    }
-
-    inline void* ParserArenaDeletable::operator new(size_t size)
-    {
-        return fastMalloc(size);
-    }
-
-    inline void ParserArenaDeletable::operator delete(void* p)
-    {
-        fastFree(p);
-    }
-
     inline ParserArenaRefCounted::ParserArenaRefCounted(JSGlobalData* globalData)
     {
         globalData->parser->arena().derefWithArena(adoptRef(this));
diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/ParserArena.cpp b/src/3rdparty/webkit/JavaScriptCore/parser/ParserArena.cpp
index 2617506..78c5196 100644
--- a/src/3rdparty/webkit/JavaScriptCore/parser/ParserArena.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/parser/ParserArena.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "config.h"
+#include "Parser.h"
 #include "ParserArena.h"
 
 #include "Nodes.h"
@@ -57,4 +58,21 @@ void ParserArena::reset()
     m_refCountedObjects.shrink(0);
 }
 
+void* ParserArenaDeletable::operator new(size_t size, JSGlobalData* globalData)
+{
+    ParserArenaDeletable* deletable = static_cast<ParserArenaDeletable*>(fastMalloc(size));
+    globalData->parser->arena().deleteWithArena(deletable);
+    return deletable;
+}
+
+void* ParserArenaDeletable::operator new(size_t size)
+{
+    return fastMalloc(size);
+}
+
+void ParserArenaDeletable::operator delete(void* p)
+{
+    fastFree(p);
+}
+
 }
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp
index dddd83d..1268d3d 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp
@@ -506,6 +506,49 @@ static void* getStackBase(void* previousFrame)
     }
 }
 #endif
+#if PLATFORM(HPUX)
+struct hpux_get_stack_base_data
+{
+    pthread_t thread;
+    _pthread_stack_info info;
+};
+
+static void *hpux_get_stack_base_internal(void *d)
+{
+    hpux_get_stack_base_data *data = static_cast<hpux_get_stack_base_data *>(d);
+
+    // _pthread_stack_info_np requires the target thread to be suspended
+    // in order to get information about it
+    pthread_suspend(data->thread);
+
+    // _pthread_stack_info_np returns an errno code in case of failure
+    // or zero on success
+    if (_pthread_stack_info_np(data->thread, &data->info)) {
+        // failed
+        return 0;
+    }
+
+    pthread_continue(data->thread);
+    return data;
+}
+
+static void *hpux_get_stack_base()
+{
+    hpux_get_stack_base_data data;
+    data.thread = pthread_self();
+
+    // We cannot get the stack information for the current thread
+    // So we start a new thread to get that information and return it to us
+    pthread_t other;
+    pthread_create(&other, 0, hpux_get_stack_base_internal, &data);
+
+    void *result;
+    pthread_join(other, &result);
+    if (result)
+       return data.info.stk_stack_base;
+    return 0;
+}
+#endif
 
 static inline void* currentThreadStackBase()
 {
@@ -532,10 +575,24 @@ static inline void* currentThreadStackBase()
           : "=r" (pTib)
         );
     return static_cast<void*>(pTib->StackBase);
+#elif PLATFORM(HPUX)
+    return hpux_get_stack_base();
 #elif PLATFORM(SOLARIS)
     stack_t s;
     thr_stksegment(&s);
     return s.ss_sp;
+#elif PLATFORM(AIX)
+    pthread_t thread = pthread_self();
+    struct __pthrdsinfo threadinfo;
+    char regbuf[256];
+    int regbufsize = sizeof regbuf;
+
+    if (pthread_getthrds_np(&thread, PTHRDSINFO_QUERY_ALL,
+                            &threadinfo, sizeof threadinfo,
+                            &regbuf, &regbufsize) == 0)
+        return threadinfo.__pi_stackaddr;
+
+    return 0;
 #elif PLATFORM(OPENBSD)
     pthread_t thread = pthread_self();
     stack_t stack;
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Protect.h b/src/3rdparty/webkit/JavaScriptCore/runtime/Protect.h
index 224164d..6e7984c 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/Protect.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Protect.h
@@ -98,7 +98,7 @@ namespace JSC {
         
         JSValue get() const { return m_value; }
         operator JSValue() const { return m_value; }
-        JSValue operator->() const { return m_value; }
+        //JSValue operator->() const { return m_value; }
         
         operator bool() const { return m_value; }
         bool operator!() const { return !m_value; }
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.cpp
index 9f6b0c3..38c086e 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.cpp
@@ -160,7 +160,7 @@ Structure::~Structure()
             m_previous->m_transitions.singleTransition = 0;
         } else {
             ASSERT(m_previous->m_transitions.table->contains(make_pair(m_nameInPrevious.get(), make_pair(m_attributesInPrevious, m_specificValueInPrevious))));
-            m_previous->m_transitions.table->remove(make_pair(m_nameInPrevious.get(), make_pair(m_attributesInPrevious, m_specificValueInPrevious)));
+            m_previous->m_transitions.table->remove(make_pair<RefPtr<UString::Rep>, std::pair<unsigned,JSCell*> >(m_nameInPrevious.get(), make_pair(m_attributesInPrevious, m_specificValueInPrevious)));
         }
     }
 
@@ -394,7 +394,7 @@ PassRefPtr<Structure> Structure::addPropertyTransitionToExistingStructure(Struct
             return existingTransition;
         }
     } else {
-        if (Structure* existingTransition = structure->m_transitions.table->get(make_pair(propertyName.ustring().rep(), make_pair(attributes, specificValue)))) {
+        if (Structure* existingTransition = structure->m_transitions.table->get(make_pair<RefPtr<UString::Rep>, std::pair<unsigned, JSCell*> >(propertyName.ustring().rep(), make_pair(attributes, specificValue)))) {
             ASSERT(existingTransition->m_offset != noOffset);
             offset = existingTransition->m_offset;
             return existingTransition;
@@ -459,9 +459,9 @@ PassRefPtr<Structure> Structure::addPropertyTransition(Structure* structure, con
         structure->m_usingSingleTransitionSlot = false;
         StructureTransitionTable* transitionTable = new StructureTransitionTable;
         structure->m_transitions.table = transitionTable;
-        transitionTable->add(make_pair(existingTransition->m_nameInPrevious.get(), make_pair(existingTransition->m_attributesInPrevious, existingTransition->m_specificValueInPrevious)), existingTransition);
+        transitionTable->add(make_pair<RefPtr<UString::Rep>, std::pair<unsigned, JSCell*> >(existingTransition->m_nameInPrevious.get(), make_pair(existingTransition->m_attributesInPrevious, existingTransition->m_specificValueInPrevious)), existingTransition);
     }
-    structure->m_transitions.table->add(make_pair(propertyName.ustring().rep(), make_pair(attributes, specificValue)), transition.get());
+    structure->m_transitions.table->add(make_pair<RefPtr<UString::Rep>, std::pair<unsigned, JSCell*> >(propertyName.ustring().rep(), make_pair(attributes, specificValue)), transition.get());
     return transition.release();
 }
 
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/HashMap.h b/src/3rdparty/webkit/JavaScriptCore/wtf/HashMap.h
index 3de5ee6..8ff9170 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/HashMap.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/HashMap.h
@@ -178,7 +178,10 @@ namespace WTF {
     HashMap<T, U, V, W, X>::inlineAdd(const KeyType& key, const MappedType& mapped) 
     {
         typedef HashMapTranslator<ValueType, ValueTraits, HashFunctions> TranslatorType;
-        return m_impl.template add<KeyType, MappedType, TranslatorType>(key, mapped);
+        pair<typename HashTableType::iterator, bool> p = m_impl.template add<KeyType, MappedType, TranslatorType>(key, mapped);
+	typename HashMap<T, U, V, W, X>::iterator temp = p.first;
+        return make_pair<typename HashMap<T, U, V, W, X>::iterator, bool>(temp, p.second);
+//      return m_impl.template add<KeyType, MappedType, TranslatorType>(key, mapped);
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/HashSet.h b/src/3rdparty/webkit/JavaScriptCore/wtf/HashSet.h
index 990670d..ec809e5 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/HashSet.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/HashSet.h
@@ -204,7 +204,12 @@ namespace WTF {
     template<typename T, typename U, typename V>
     pair<typename HashSet<T, U, V>::iterator, bool> HashSet<T, U, V>::add(const ValueType& value)
     {
-        return m_impl.add(value);
+        pair<typename HashTable<T, T, IdentityExtractor<T>, U, V, V>::iterator, bool> p = m_impl.add(value);
+        typename HashSet<T, U, V>::iterator temp = p.first;
+        pair<typename HashSet<T, U, V>::iterator, bool> p2 = make_pair<typename HashSet<T, U, V>::iterator, bool>(temp, p.second);
+ //       p2.first = p.first;
+ //       p2.second = p.second;
+        return p2;
     }
 
     template<typename Value, typename HashFunctions, typename Traits>
@@ -213,7 +218,8 @@ namespace WTF {
     HashSet<Value, HashFunctions, Traits>::add(const T& value)
     {
         typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, HashTranslator> Adapter;
-        return m_impl.template addPassingHashCode<T, T, Adapter>(value, value);
+        pair<typename HashTableType::iterator, bool> p = m_impl.template addPassingHashCode<T, T, Adapter>(value, value);
+	return make_pair<iterator, bool>(p.first, p.second);
     }
 
     template<typename T, typename U, typename V>
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/MainThread.h b/src/3rdparty/webkit/JavaScriptCore/wtf/MainThread.h
index 01ce804..b8305b5 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/MainThread.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/MainThread.h
@@ -34,7 +34,9 @@ namespace WTF {
 
 class Mutex;
 
-typedef void MainThreadFunction(void*);
+extern "C" {
+    typedef void MainThreadFunction(void*);
+}
 
 void callOnMainThread(MainThreadFunction*, void* context);
 
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/MessageQueue.h b/src/3rdparty/webkit/JavaScriptCore/wtf/MessageQueue.h
index 12291cc..070b76c 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/MessageQueue.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/MessageQueue.h
@@ -41,7 +41,7 @@ namespace WTF {
     enum MessageQueueWaitResult {
         MessageQueueTerminated,       // Queue was destroyed while waiting for message.
         MessageQueueTimeout,          // Timeout was specified and it expired.
-        MessageQueueMessageReceived,  // A message was successfully received and returned.
+        MessageQueueMessageReceived   // A message was successfully received and returned.
     };
 
     template<typename DataType>
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
index e531a63..e1e4ba3 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
@@ -106,6 +106,9 @@
 /* regardless of operating environment */
 #if defined(hpux) || defined(__hpux)
 #define WTF_PLATFORM_HPUX 1
+#ifndef MAP_ANON
+#define MAP_ANON MAP_ANONYMOUS
+#endif
 #endif
 
 #if defined (__SYMBIAN32__)
@@ -301,6 +304,30 @@
 #define WTF_PLATFORM_BIG_ENDIAN 1
 #endif
 
+/* PLATFORM(HPPA) */
+/* a.k.a. PA-RISC */
+#if defined(__hppa) || defined(__hppa__)
+#define WTF_PLATFORM_HPPA 1
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#endif
+
+/* PLATFORM(IA64) */
+/* a.k.a. Itanium Processor Family, IPF */
+#if defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
+#define WTF_PLATFORM_IA64 1
+
+/* Itanium can be both big- and little-endian
+   we need to determine at compile time which one it is.
+    - HP's aCC compiler only compiles big-endian (so HP-UXi is always big-endian)
+    - GCC defines __BIG_ENDIAN__ for us (default on HP-UX)
+    - Linux is usually little-endian
+    - I've never seen AIX or Windows on IA-64, but they should be little-endian too
+*/
+#if defined(__BIG_ENDIAN__) || defined(__HP_aCC)
+# define WTF_PLATFORM_BIG_ENDIAN 1
+#endif
+#endif
+
 /* PLATFORM(WINCE) && PLATFORM(QT)
    We can not determine the endianess at compile time. For
    Qt for Windows CE the endianess is specified in the
@@ -474,7 +501,7 @@
 #endif
 
 #if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(QNX) \
-    && !PLATFORM(SYMBIAN) && !COMPILER(RVCT)
+    && !PLATFORM(SYMBIAN) && !COMPILER(RVCT) && !PLATFORM(AIX)
 #define HAVE_TM_GMTOFF 1
 #define HAVE_TM_ZONE 1
 #define HAVE_TIMEGM 1
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/RefPtrHashMap.h b/src/3rdparty/webkit/JavaScriptCore/wtf/RefPtrHashMap.h
index 1cbebb4..b3ccd3a 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/RefPtrHashMap.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/RefPtrHashMap.h
@@ -42,7 +42,7 @@ namespace WTF {
     };
 
     template<typename T, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
-    class HashMap<RefPtr<T>, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> {
+    class RefPtrHashMap {
     private:
         typedef KeyTraitsArg KeyTraits;
         typedef MappedTraitsArg MappedTraits;
@@ -67,7 +67,7 @@ namespace WTF {
         typedef HashTableIteratorAdapter<HashTableType, ValueType> iterator;
         typedef HashTableConstIteratorAdapter<HashTableType, ValueType> const_iterator;
 
-        void swap(HashMap&);
+        void swap(RefPtrHashMap&);
 
         int size() const;
         int capacity() const;
@@ -115,109 +115,123 @@ namespace WTF {
 
         HashTableType m_impl;
     };
+    template<typename T, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
+    class HashMap<RefPtr<T>, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> :
+        public RefPtrHashMap<T, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>
+    {
+    };
     
     template<typename T, typename U, typename V, typename W, typename X>
-    inline void HashMap<RefPtr<T>, U, V, W, X>::swap(HashMap& other)
+    inline void RefPtrHashMap<T, U, V, W, X>::swap(RefPtrHashMap& other)
     {
         m_impl.swap(other.m_impl); 
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline int HashMap<RefPtr<T>, U, V, W, X>::size() const
+    inline int RefPtrHashMap<T, U, V, W, X>::size() const
     {
         return m_impl.size(); 
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline int HashMap<RefPtr<T>, U, V, W, X>::capacity() const
+    inline int RefPtrHashMap<T, U, V, W, X>::capacity() const
     { 
         return m_impl.capacity(); 
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline bool HashMap<RefPtr<T>, U, V, W, X>::isEmpty() const
+    inline bool RefPtrHashMap<T, U, V, W, X>::isEmpty() const
     {
         return m_impl.isEmpty();
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline typename HashMap<RefPtr<T>, U, V, W, X>::iterator HashMap<RefPtr<T>, U, V, W, X>::begin()
+    inline typename RefPtrHashMap<T, U, V, W, X>::iterator RefPtrHashMap<T, U, V, W, X>::begin()
     {
         return m_impl.begin();
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline typename HashMap<RefPtr<T>, U, V, W, X>::iterator HashMap<RefPtr<T>, U, V, W, X>::end()
+    inline typename RefPtrHashMap<T, U, V, W, X>::iterator RefPtrHashMap<T, U, V, W, X>::end()
     {
         return m_impl.end();
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline typename HashMap<RefPtr<T>, U, V, W, X>::const_iterator HashMap<RefPtr<T>, U, V, W, X>::begin() const
+    inline typename RefPtrHashMap<T, U, V, W, X>::const_iterator RefPtrHashMap<T, U, V, W, X>::begin() const
     {
         return m_impl.begin();
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline typename HashMap<RefPtr<T>, U, V, W, X>::const_iterator HashMap<RefPtr<T>, U, V, W, X>::end() const
+    inline typename RefPtrHashMap<T, U, V, W, X>::const_iterator RefPtrHashMap<T, U, V, W, X>::end() const
     {
         return m_impl.end();
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline typename HashMap<RefPtr<T>, U, V, W, X>::iterator HashMap<RefPtr<T>, U, V, W, X>::find(const KeyType& key)
+    inline typename RefPtrHashMap<T, U, V, W, X>::iterator RefPtrHashMap<T, U, V, W, X>::find(const KeyType& key)
     {
         return m_impl.find(key);
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline typename HashMap<RefPtr<T>, U, V, W, X>::iterator HashMap<RefPtr<T>, U, V, W, X>::find(RawKeyType key)
+    inline typename RefPtrHashMap<T, U, V, W, X>::iterator RefPtrHashMap<T, U, V, W, X>::find(RawKeyType key)
     {
         return m_impl.template find<RawKeyType, RawKeyTranslator>(key);
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline typename HashMap<RefPtr<T>, U, V, W, X>::const_iterator HashMap<RefPtr<T>, U, V, W, X>::find(const KeyType& key) const
+    inline typename RefPtrHashMap<T, U, V, W, X>::const_iterator RefPtrHashMap<T, U, V, W, X>::find(const KeyType& key) const
     {
         return m_impl.find(key);
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline typename HashMap<RefPtr<T>, U, V, W, X>::const_iterator HashMap<RefPtr<T>, U, V, W, X>::find(RawKeyType key) const
+    inline typename RefPtrHashMap<T, U, V, W, X>::const_iterator RefPtrHashMap<T, U, V, W, X>::find(RawKeyType key) const
     {
         return m_impl.template find<RawKeyType, RawKeyTranslator>(key);
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline bool HashMap<RefPtr<T>, U, V, W, X>::contains(const KeyType& key) const
+    inline bool RefPtrHashMap<T, U, V, W, X>::contains(const KeyType& key) const
     {
         return m_impl.contains(key);
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline bool HashMap<RefPtr<T>, U, V, W, X>::contains(RawKeyType key) const
+    inline bool RefPtrHashMap<T, U, V, W, X>::contains(RawKeyType key) const
     {
         return m_impl.template contains<RawKeyType, RawKeyTranslator>(key);
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline pair<typename HashMap<RefPtr<T>, U, V, W, X>::iterator, bool>
-    HashMap<RefPtr<T>, U, V, W, X>::inlineAdd(const KeyType& key, const MappedType& mapped) 
+    inline pair<typename RefPtrHashMap<T, U, V, W, X>::iterator, bool>
+    RefPtrHashMap<T, U, V, W, X>::inlineAdd(const KeyType& key, const MappedType& mapped) 
     {
         typedef HashMapTranslator<ValueType, ValueTraits, HashFunctions> TranslatorType;
-        return m_impl.template add<KeyType, MappedType, TranslatorType>(key, mapped);
+        pair<typename HashTableType::iterator, bool> p = m_impl.template add<KeyType, MappedType, TranslatorType>(key, mapped);
+//        typename RefPtrHashMap<T, U, V, W, X>::iterator temp = p.first;
+        return make_pair<typename RefPtrHashMap<T, U, V, W, X>::iterator, bool>(
+            typename RefPtrHashMap<T, U, V, W, X>::iterator(p.first), p.second);
+
+//        return m_impl.template add<KeyType, MappedType, TranslatorType>(key, mapped);
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline pair<typename HashMap<RefPtr<T>, U, V, W, X>::iterator, bool>
-    HashMap<RefPtr<T>, U, V, W, X>::inlineAdd(RawKeyType key, const MappedType& mapped) 
+    inline pair<typename RefPtrHashMap<T, U, V, W, X>::iterator, bool>
+    RefPtrHashMap<T, U, V, W, X>::inlineAdd(RawKeyType key, const MappedType& mapped) 
     {
-        return m_impl.template add<RawKeyType, MappedType, RawKeyTranslator>(key, mapped);
+        pair<typename HashTableType::iterator, bool> p = m_impl.template add<RawKeyType, MappedType, RawKeyTranslator>(key, mapped);
+        return make_pair<typename RefPtrHashMap<T, U, V, W, X>::iterator, bool>(
+            typename RefPtrHashMap<T, U, V, W, X>::iterator(p.first), p.second);
+
+ //       return m_impl.template add<RawKeyType, MappedType, RawKeyTranslator>(key, mapped);
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    pair<typename HashMap<RefPtr<T>, U, V, W, X>::iterator, bool>
-    HashMap<RefPtr<T>, U, V, W, X>::set(const KeyType& key, const MappedType& mapped) 
+    pair<typename RefPtrHashMap<T, U, V, W, X>::iterator, bool>
+    RefPtrHashMap<T, U, V, W, X>::set(const KeyType& key, const MappedType& mapped) 
     {
         pair<iterator, bool> result = inlineAdd(key, mapped);
         if (!result.second) {
@@ -228,8 +242,8 @@ namespace WTF {
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    pair<typename HashMap<RefPtr<T>, U, V, W, X>::iterator, bool>
-    HashMap<RefPtr<T>, U, V, W, X>::set(RawKeyType key, const MappedType& mapped) 
+    pair<typename RefPtrHashMap<T, U, V, W, X>::iterator, bool>
+    RefPtrHashMap<T, U, V, W, X>::set(RawKeyType key, const MappedType& mapped) 
     {
         pair<iterator, bool> result = inlineAdd(key, mapped);
         if (!result.second) {
@@ -240,22 +254,22 @@ namespace WTF {
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    pair<typename HashMap<RefPtr<T>, U, V, W, X>::iterator, bool>
-    HashMap<RefPtr<T>, U, V, W, X>::add(const KeyType& key, const MappedType& mapped)
+    pair<typename RefPtrHashMap<T, U, V, W, X>::iterator, bool>
+    RefPtrHashMap<T, U, V, W, X>::add(const KeyType& key, const MappedType& mapped)
     {
         return inlineAdd(key, mapped);
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    pair<typename HashMap<RefPtr<T>, U, V, W, X>::iterator, bool>
-    HashMap<RefPtr<T>, U, V, W, X>::add(RawKeyType key, const MappedType& mapped)
+    pair<typename RefPtrHashMap<T, U, V, W, X>::iterator, bool>
+    RefPtrHashMap<T, U, V, W, X>::add(RawKeyType key, const MappedType& mapped)
     {
         return inlineAdd(key, mapped);
     }
 
     template<typename T, typename U, typename V, typename W, typename MappedTraits>
-    typename HashMap<RefPtr<T>, U, V, W, MappedTraits>::MappedType
-    HashMap<RefPtr<T>, U, V, W, MappedTraits>::get(const KeyType& key) const
+    typename RefPtrHashMap<T, U, V, W, MappedTraits>::MappedType
+    RefPtrHashMap<T, U, V, W, MappedTraits>::get(const KeyType& key) const
     {
         ValueType* entry = const_cast<HashTableType&>(m_impl).lookup(key);
         if (!entry)
@@ -264,8 +278,8 @@ namespace WTF {
     }
 
     template<typename T, typename U, typename V, typename W, typename MappedTraits>
-    typename HashMap<RefPtr<T>, U, V, W, MappedTraits>::MappedType
-    inline HashMap<RefPtr<T>, U, V, W, MappedTraits>::inlineGet(RawKeyType key) const
+    typename RefPtrHashMap<T, U, V, W, MappedTraits>::MappedType
+    inline RefPtrHashMap<T, U, V, W, MappedTraits>::inlineGet(RawKeyType key) const
     {
         ValueType* entry = const_cast<HashTableType&>(m_impl).template lookup<RawKeyType, RawKeyTranslator>(key);
         if (!entry)
@@ -274,14 +288,14 @@ namespace WTF {
     }
 
     template<typename T, typename U, typename V, typename W, typename MappedTraits>
-    typename HashMap<RefPtr<T>, U, V, W, MappedTraits>::MappedType
-    HashMap<RefPtr<T>, U, V, W, MappedTraits>::get(RawKeyType key) const
+    typename RefPtrHashMap<T, U, V, W, MappedTraits>::MappedType
+    RefPtrHashMap<T, U, V, W, MappedTraits>::get(RawKeyType key) const
     {
         return inlineGet(key);
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline void HashMap<RefPtr<T>, U, V, W, X>::remove(iterator it)
+    inline void RefPtrHashMap<T, U, V, W, X>::remove(iterator it)
     {
         if (it.m_impl == m_impl.end())
             return;
@@ -290,45 +304,45 @@ namespace WTF {
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline void HashMap<RefPtr<T>, U, V, W, X>::remove(const KeyType& key)
+    inline void RefPtrHashMap<T, U, V, W, X>::remove(const KeyType& key)
     {
         remove(find(key));
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline void HashMap<RefPtr<T>, U, V, W, X>::remove(RawKeyType key)
+    inline void RefPtrHashMap<T, U, V, W, X>::remove(RawKeyType key)
     {
         remove(find(key));
     }
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline void HashMap<RefPtr<T>, U, V, W, X>::clear()
+    inline void RefPtrHashMap<T, U, V, W, X>::clear()
     {
         m_impl.clear();
     }
 
     template<typename T, typename U, typename V, typename W, typename MappedTraits>
-    typename HashMap<RefPtr<T>, U, V, W, MappedTraits>::MappedType
-    HashMap<RefPtr<T>, U, V, W, MappedTraits>::take(const KeyType& key)
+    typename RefPtrHashMap<T, U, V, W, MappedTraits>::MappedType
+    RefPtrHashMap<T, U, V, W, MappedTraits>::take(const KeyType& key)
     {
         // This can probably be made more efficient to avoid ref/deref churn.
         iterator it = find(key);
         if (it == end())
             return MappedTraits::emptyValue();
-        typename HashMap<RefPtr<T>, U, V, W, MappedTraits>::MappedType result = it->second;
+        typename RefPtrHashMap<T, U, V, W, MappedTraits>::MappedType result = it->second;
         remove(it);
         return result;
     }
 
     template<typename T, typename U, typename V, typename W, typename MappedTraits>
-    typename HashMap<RefPtr<T>, U, V, W, MappedTraits>::MappedType
-    HashMap<RefPtr<T>, U, V, W, MappedTraits>::take(RawKeyType key)
+    typename RefPtrHashMap<T, U, V, W, MappedTraits>::MappedType
+    RefPtrHashMap<T, U, V, W, MappedTraits>::take(RawKeyType key)
     {
         // This can probably be made more efficient to avoid ref/deref churn.
         iterator it = find(key);
         if (it == end())
             return MappedTraits::emptyValue();
-        typename HashMap<RefPtr<T>, U, V, W, MappedTraits>::MappedType result = it->second;
+        typename RefPtrHashMap<T, U, V, W, MappedTraits>::MappedType result = it->second;
         remove(it);
         return result;
     }
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/TypeTraits.h b/src/3rdparty/webkit/JavaScriptCore/wtf/TypeTraits.h
index 6ce6a3e..56659a8 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/TypeTraits.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/TypeTraits.h
@@ -70,30 +70,30 @@ namespace WTF {
     template <> struct IsPod<long double>        { static const bool value = true; };
     template <typename P> struct IsPod<P*>       { static const bool value = true; };
 
-    template<typename T> class IsConvertibleToInteger {
-        // Avoid "possible loss of data" warning when using Microsoft's C++ compiler
-        // by not converting int's to doubles.
-        template<bool performCheck, typename U> class IsConvertibleToDouble;
-        template<typename U> class IsConvertibleToDouble<false, U> {
-        public:
-            static const bool value = false;
-        };
+    // Avoid "possible loss of data" warning when using Microsoft's C++ compiler
+    // by not converting int's to doubles.
+    template<bool performCheck, typename U> class CheckedIsConvertibleToDouble;
+    template<typename U> class CheckedIsConvertibleToDouble<false, U> {
+    public:
+        static const bool value = false;
+    };
 
-        template<typename U> class IsConvertibleToDouble<true, U> {
-            typedef char YesType;
-            struct NoType {
-                char padding[8];
-            };
-
-            static YesType floatCheck(long double);
-            static NoType floatCheck(...);
-            static T& t;
-        public:
-            static const bool value = sizeof(floatCheck(t)) == sizeof(YesType);
+    template<typename U> class CheckedIsConvertibleToDouble<true, U> {
+        typedef char YesType;
+        struct NoType {
+            char padding[8];
         };
 
+        static YesType floatCheck(long double);
+        static NoType floatCheck(...);
+        static U& t;
+    public:
+        static const bool value = sizeof(floatCheck(t)) == sizeof(YesType);
+    };
+
+    template<typename T> class IsConvertibleToInteger {
     public:
-        static const bool value = IsInteger<T>::value || IsConvertibleToDouble<!IsInteger<T>::value, T>::value;
+        static const bool value = IsInteger<T>::value || CheckedIsConvertibleToDouble<!IsInteger<T>::value, T>::value;
     };
 
     template <typename T, typename U> struct IsSameType {
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
index e3cb718..7decc4a 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
@@ -67,10 +67,11 @@ namespace WTF {
     template <size_t size, size_t> struct AlignedBuffer
     {
         AlignedBufferChar oversizebuffer[size + 64];
-        AlignedBufferChar *buffer;
-        inline AlignedBuffer() : buffer(oversizebuffer)
+        AlignedBufferChar *buffer()
         {
-            buffer += 64 - (reinterpret_cast<size_t>(buffer) & 0x3f);
+            AlignedBufferChar *ptr = oversizebuffer;
+            ptr += 64 - (reinterpret_cast<size_t>(ptr) & 0x3f);
+            return ptr;
         }
     };
     #endif
@@ -128,7 +129,7 @@ namespace WTF {
     template<typename T>
     struct VectorMover<false, T>
     {
-        static void move(const T* src, const T* srcEnd, T* dst)
+        static void move(T* src, const T* srcEnd, T* dst)
         {
             while (src != srcEnd) {
                 new (dst) T(*src);
@@ -137,7 +138,7 @@ namespace WTF {
                 ++src;
             }
         }
-        static void moveOverlapping(const T* src, const T* srcEnd, T* dst)
+        static void moveOverlapping(T* src, const T* srcEnd, T* dst)
         {
             if (src > dst)
                 move(src, srcEnd, dst);
@@ -156,11 +157,11 @@ namespace WTF {
     template<typename T>
     struct VectorMover<true, T>
     {
-        static void move(const T* src, const T* srcEnd, T* dst) 
+        static void move(T* src, const T* srcEnd, T* dst) 
         {
             memcpy(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src));
         }
-        static void moveOverlapping(const T* src, const T* srcEnd, T* dst) 
+        static void moveOverlapping(T* src, const T* srcEnd, T* dst) 
         {
             memmove(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src));
         }
@@ -253,12 +254,12 @@ namespace WTF {
             VectorInitializer<VectorTraits<T>::needsInitialization, VectorTraits<T>::canInitializeWithMemset, T>::initialize(begin, end);
         }
 
-        static void move(const T* src, const T* srcEnd, T* dst)
+        static void move(T* src, const T* srcEnd, T* dst)
         {
             VectorMover<VectorTraits<T>::canMoveWithMemcpy, T>::move(src, srcEnd, dst);
         }
 
-        static void moveOverlapping(const T* src, const T* srcEnd, T* dst)
+        static void moveOverlapping(T* src, const T* srcEnd, T* dst)
         {
             VectorMover<VectorTraits<T>::canMoveWithMemcpy, T>::moveOverlapping(src, srcEnd, dst);
         }
@@ -440,7 +441,11 @@ namespace WTF {
         using Base::m_capacity;
 
         static const size_t m_inlineBufferSize = inlineCapacity * sizeof(T);
+        #ifdef WTF_ALIGNED
         T* inlineBuffer() { return reinterpret_cast<T*>(m_inlineBuffer.buffer); }
+        #else
+        T* inlineBuffer() { return reinterpret_cast<T*>(m_inlineBuffer.buffer()); }
+        #endif
 
         AlignedBuffer<m_inlineBufferSize, WTF_ALIGN_OF(T)> m_inlineBuffer;
     };
diff --git a/src/3rdparty/webkit/WebCore/bridge/npapi.h b/src/3rdparty/webkit/WebCore/bridge/npapi.h
index 07fed86..2ff657e 100644
--- a/src/3rdparty/webkit/WebCore/bridge/npapi.h
+++ b/src/3rdparty/webkit/WebCore/bridge/npapi.h
@@ -350,9 +350,10 @@ typedef enum {
     NPPVpluginWantsAllNetworkStreams = 18,
 
     /* Checks to see if the plug-in would like the browser to load the "src" attribute. */
-    NPPVpluginCancelSrcStream = 20,
+    NPPVpluginCancelSrcStream = 20
 
 #ifdef XP_MACOSX
+    ,
     /* Used for negotiating drawing models */
     NPPVpluginDrawingModel = 1000,
     /* Used for negotiating event models */
diff --git a/src/3rdparty/webkit/WebCore/dom/ExceptionCode.h b/src/3rdparty/webkit/WebCore/dom/ExceptionCode.h
index 58b18e2..08bffa6 100644
--- a/src/3rdparty/webkit/WebCore/dom/ExceptionCode.h
+++ b/src/3rdparty/webkit/WebCore/dom/ExceptionCode.h
@@ -57,7 +57,7 @@ namespace WebCore {
         NETWORK_ERR = 19,
         ABORT_ERR = 20,
         URL_MISMATCH_ERR = 21,
-        QUOTA_EXCEEDED_ERR = 22,
+        QUOTA_EXCEEDED_ERR = 22
     };
 
     enum ExceptionType {
diff --git a/src/3rdparty/webkit/WebCore/dom/ScriptExecutionContext.h b/src/3rdparty/webkit/WebCore/dom/ScriptExecutionContext.h
index 3f8febc..f95f0045 100644
--- a/src/3rdparty/webkit/WebCore/dom/ScriptExecutionContext.h
+++ b/src/3rdparty/webkit/WebCore/dom/ScriptExecutionContext.h
@@ -45,7 +45,7 @@ namespace WebCore {
 
     enum MessageDestination {
         InspectorControllerDestination,
-        ConsoleDestination,
+        ConsoleDestination
     };
 
     class ScriptExecutionContext {
diff --git a/src/3rdparty/webkit/WebCore/editing/CompositeEditCommand.cpp b/src/3rdparty/webkit/WebCore/editing/CompositeEditCommand.cpp
index 9737e92..dcb3326 100644
--- a/src/3rdparty/webkit/WebCore/editing/CompositeEditCommand.cpp
+++ b/src/3rdparty/webkit/WebCore/editing/CompositeEditCommand.cpp
@@ -795,7 +795,7 @@ void CompositeEditCommand::moveParagraphs(const VisiblePosition& startOfParagrap
 
     // FIXME: This is an inefficient way to preserve style on nodes in the paragraph to move.  It 
     // shouldn't matter though, since moved paragraphs will usually be quite small.
-    RefPtr<DocumentFragment> fragment = startOfParagraphToMove != endOfParagraphToMove ? createFragmentFromMarkup(document(), createMarkup(range.get(), 0, DoNotAnnotateForInterchange, true), "") : 0;
+    RefPtr<DocumentFragment> fragment = startOfParagraphToMove != endOfParagraphToMove ? createFragmentFromMarkup(document(), createMarkup(range.get(), 0, DoNotAnnotateForInterchange, true), "") : PassRefPtr<DocumentFragment>(0);
     
     // A non-empty paragraph's style is moved when we copy and move it.  We don't move 
     // anything if we're given an empty paragraph, but an empty paragraph can have style
diff --git a/src/3rdparty/webkit/WebCore/editing/EditorInsertAction.h b/src/3rdparty/webkit/WebCore/editing/EditorInsertAction.h
index 5b732dc..b8b137d 100644
--- a/src/3rdparty/webkit/WebCore/editing/EditorInsertAction.h
+++ b/src/3rdparty/webkit/WebCore/editing/EditorInsertAction.h
@@ -32,7 +32,7 @@ namespace WebCore {
 enum EditorInsertAction {
     EditorInsertActionTyped,
     EditorInsertActionPasted,
-    EditorInsertActionDropped,
+    EditorInsertActionDropped
 };
 
 } // namespace
diff --git a/src/3rdparty/webkit/WebCore/editing/markup.cpp b/src/3rdparty/webkit/WebCore/editing/markup.cpp
index 6b6d326..1c737a0 100644
--- a/src/3rdparty/webkit/WebCore/editing/markup.cpp
+++ b/src/3rdparty/webkit/WebCore/editing/markup.cpp
@@ -970,7 +970,7 @@ String createMarkup(const Range* range, Vector<Node*>* nodes, EAnnotateForInterc
     Node* body = enclosingNodeWithTag(Position(commonAncestor, 0), bodyTag);
     // FIXME: Do this for all fully selected blocks, not just the body.
     Node* fullySelectedRoot = body && *VisibleSelection::selectionFromContentsOfNode(body).toNormalizedRange() == *updatedRange ? body : 0;
-    RefPtr<CSSMutableStyleDeclaration> fullySelectedRootStyle = fullySelectedRoot ? styleFromMatchedRulesAndInlineDecl(fullySelectedRoot) : 0;
+    RefPtr<CSSMutableStyleDeclaration> fullySelectedRootStyle = fullySelectedRoot ? styleFromMatchedRulesAndInlineDecl(fullySelectedRoot) : PassRefPtr<CSSMutableStyleDeclaration>(0);
     if (annotate && fullySelectedRoot) {
         if (shouldIncludeWrapperForFullySelectedRoot(fullySelectedRoot, fullySelectedRootStyle.get()))
             specialCommonAncestor = fullySelectedRoot;
diff --git a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h
index cc3627d..fdd854c 100644
--- a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h
+++ b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h
@@ -275,7 +275,7 @@ enum CSSPropertyID {
     CSSPropertyGlyphOrientationVertical = 1268,
     CSSPropertyKerning = 1269,
     CSSPropertyTextAnchor = 1270,
-    CSSPropertyWritingMode = 1271,
+    CSSPropertyWritingMode = 1271
 };
 
 const int firstCSSProperty = 1001;
diff --git a/src/3rdparty/webkit/WebCore/html/HTMLParser.cpp b/src/3rdparty/webkit/WebCore/html/HTMLParser.cpp
index 722f4e2..928a1bf 100644
--- a/src/3rdparty/webkit/WebCore/html/HTMLParser.cpp
+++ b/src/3rdparty/webkit/WebCore/html/HTMLParser.cpp
@@ -137,7 +137,7 @@ HTMLParser::HTMLParser(HTMLDocument* doc, bool reportErrors)
     , m_reportErrors(reportErrors)
     , m_handlingResidualStyleAcrossBlocks(false)
     , m_inStrayTableContent(0)
-    , m_parserQuirks(m_document->page() ? m_document->page()->chrome()->client()->createHTMLParserQuirks() : 0)
+    , m_parserQuirks(m_document->page() ? m_document->page()->chrome()->client()->createHTMLParserQuirks() : PassOwnPtr<HTMLParserQuirks>(0))
 {
 }
 
@@ -155,7 +155,7 @@ HTMLParser::HTMLParser(DocumentFragment* frag)
     , m_reportErrors(false)
     , m_handlingResidualStyleAcrossBlocks(false)
     , m_inStrayTableContent(0)
-    , m_parserQuirks(m_document->page() ? m_document->page()->chrome()->client()->createHTMLParserQuirks() : 0)
+    , m_parserQuirks(m_document->page() ? m_document->page()->chrome()->client()->createHTMLParserQuirks() : PassOwnPtr<HTMLParserQuirks>(0))
 {
     if (frag)
         frag->ref();
diff --git a/src/3rdparty/webkit/WebCore/loader/DocumentLoader.cpp b/src/3rdparty/webkit/WebCore/loader/DocumentLoader.cpp
index 87cb725..812d17b 100644
--- a/src/3rdparty/webkit/WebCore/loader/DocumentLoader.cpp
+++ b/src/3rdparty/webkit/WebCore/loader/DocumentLoader.cpp
@@ -519,7 +519,7 @@ ArchiveResource* DocumentLoader::archiveResourceForURL(const KURL& url) const
 
 PassRefPtr<Archive> DocumentLoader::popArchiveForSubframe(const String& frameName)
 {
-    return m_archiveResourceCollection ? m_archiveResourceCollection->popSubframeArchive(frameName) : 0;
+    return m_archiveResourceCollection ? m_archiveResourceCollection->popSubframeArchive(frameName) : PassRefPtr<Archive>(0);
 }
 
 void DocumentLoader::clearArchiveResources()
diff --git a/src/3rdparty/webkit/WebCore/loader/FrameLoader.h b/src/3rdparty/webkit/WebCore/loader/FrameLoader.h
index 58bf2c0..c41e491 100644
--- a/src/3rdparty/webkit/WebCore/loader/FrameLoader.h
+++ b/src/3rdparty/webkit/WebCore/loader/FrameLoader.h
@@ -355,7 +355,7 @@ namespace WebCore {
         enum LocalLoadPolicy {
             AllowLocalLoadsForAll,  // No restriction on local loads.
             AllowLocalLoadsForLocalAndSubstituteData,
-            AllowLocalLoadsForLocalOnly,
+            AllowLocalLoadsForLocalOnly
         };
         static void setLocalLoadPolicy(LocalLoadPolicy);
         static bool restrictAccessToLocal();
diff --git a/src/3rdparty/webkit/WebCore/loader/FrameLoaderTypes.h b/src/3rdparty/webkit/WebCore/loader/FrameLoaderTypes.h
index c264b47..b3823ba 100644
--- a/src/3rdparty/webkit/WebCore/loader/FrameLoaderTypes.h
+++ b/src/3rdparty/webkit/WebCore/loader/FrameLoaderTypes.h
@@ -42,7 +42,7 @@ namespace WebCore {
     enum PolicyAction {
         PolicyUse,
         PolicyDownload,
-        PolicyIgnore,
+        PolicyIgnore
     };
 
     enum FrameLoadType {
diff --git a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp
index dc73353..fd6a8b4 100644
--- a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp
+++ b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp
@@ -772,7 +772,7 @@ void ApplicationCacheGroup::checkIfLoadIsComplete()
             ASSERT(cacheStorage().isMaximumSizeReached() && m_calledReachedMaxAppCacheSize);
         }
 
-        RefPtr<ApplicationCache> oldNewestCache = (m_newestCache == m_cacheBeingUpdated) ? 0 : m_newestCache;
+        RefPtr<ApplicationCache> oldNewestCache = (m_newestCache == m_cacheBeingUpdated) ? RefPtr<ApplicationCache>(0) : m_newestCache;
 
         setNewestCache(m_cacheBeingUpdated.release());
         if (cacheStorage().storeNewestCache(this)) {
diff --git a/src/3rdparty/webkit/WebCore/loader/archive/ArchiveFactory.cpp b/src/3rdparty/webkit/WebCore/loader/archive/ArchiveFactory.cpp
index 1322dbb..753c3c3 100644
--- a/src/3rdparty/webkit/WebCore/loader/archive/ArchiveFactory.cpp
+++ b/src/3rdparty/webkit/WebCore/loader/archive/ArchiveFactory.cpp
@@ -75,7 +75,7 @@ bool ArchiveFactory::isArchiveMimeType(const String& mimeType)
 PassRefPtr<Archive> ArchiveFactory::create(SharedBuffer* data, const String& mimeType)
 {
     RawDataCreationFunction* function = archiveMIMETypes().get(mimeType);
-    return function ? function(data) : 0;
+    return function ? function(data) : PassRefPtr<Archive>(0);
 }
 
 void ArchiveFactory::registerKnownArchiveMIMETypes()
diff --git a/src/3rdparty/webkit/WebCore/loader/archive/ArchiveResource.cpp b/src/3rdparty/webkit/WebCore/loader/archive/ArchiveResource.cpp
index 691f66a..b6317da 100644
--- a/src/3rdparty/webkit/WebCore/loader/archive/ArchiveResource.cpp
+++ b/src/3rdparty/webkit/WebCore/loader/archive/ArchiveResource.cpp
@@ -35,17 +35,17 @@ namespace WebCore {
 
 PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const ResourceResponse& response)
 {
-    return data ? adoptRef(new ArchiveResource(data, url, response)) : 0;
+    return data ? adoptRef(new ArchiveResource(data, url, response)) : PassRefPtr<ArchiveResource>(0);
 }
 
 PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const String& mimeType, const String& textEncoding, const String& frameName)
 {
-    return data ? adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frameName)) : 0;
+    return data ? adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frameName)) : PassRefPtr<ArchiveResource>(0);
 }
 
 PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const String& mimeType, const String& textEncoding, const String& frameName, const ResourceResponse& resourceResponse)
 {
-    return data ? adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frameName, resourceResponse)) : 0;
+    return data ? adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frameName, resourceResponse)) : PassRefPtr<ArchiveResource>(0);
 }
 
 ArchiveResource::ArchiveResource(PassRefPtr<SharedBuffer> data, const KURL& url, const ResourceResponse& response)
diff --git a/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.cpp b/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.cpp
index b78291d..7201661 100644
--- a/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.cpp
+++ b/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.cpp
@@ -511,7 +511,7 @@ void IconDatabase::setIconDataForIconURL(PassRefPtr<SharedBuffer> dataOriginal,
     if (!isOpen() || iconURLOriginal.isEmpty())
         return;
     
-    RefPtr<SharedBuffer> data = dataOriginal ? dataOriginal->copy() : 0;
+    RefPtr<SharedBuffer> data = dataOriginal ? dataOriginal->copy() : PassRefPtr<SharedBuffer>(0);
     String iconURL = iconURLOriginal.copy();
     
     Vector<String> pageURLs;
diff --git a/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp b/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp
index e8f9004..c54aab2 100644
--- a/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp
+++ b/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp
@@ -582,7 +582,7 @@ Storage* DOMWindow::localStorage() const
         return 0;
 
     StorageNamespace* localStorage = page->group().localStorage();
-    RefPtr<StorageArea> storageArea = localStorage ? localStorage->storageArea(document->securityOrigin()) : 0; 
+    RefPtr<StorageArea> storageArea = localStorage ? localStorage->storageArea(document->securityOrigin()) : PassRefPtr<StorageArea>(0);
     if (storageArea) {
         page->inspectorController()->didUseDOMStorage(storageArea.get(), true, m_frame);
         m_localStorage = Storage::create(m_frame, storageArea.release());
diff --git a/src/3rdparty/webkit/WebCore/page/animation/AnimationBase.cpp b/src/3rdparty/webkit/WebCore/page/animation/AnimationBase.cpp
index dad763c..8769a59 100644
--- a/src/3rdparty/webkit/WebCore/page/animation/AnimationBase.cpp
+++ b/src/3rdparty/webkit/WebCore/page/animation/AnimationBase.cpp
@@ -144,7 +144,7 @@ static inline TransformOperations blendFunc(const AnimationBase* anim, const Tra
         for (unsigned i = 0; i < size; i++) {
             RefPtr<TransformOperation> fromOp = (i < fromSize) ? from.operations()[i].get() : 0;
             RefPtr<TransformOperation> toOp = (i < toSize) ? to.operations()[i].get() : 0;
-            RefPtr<TransformOperation> blendedOp = toOp ? toOp->blend(fromOp.get(), progress) : (fromOp ? fromOp->blend(0, progress, true) : 0);
+            RefPtr<TransformOperation> blendedOp = toOp ? toOp->blend(fromOp.get(), progress) : (fromOp ? fromOp->blend(0, progress, true) : PassRefPtr<TransformOperation>(0));
             if (blendedOp)
                 result.operations().append(blendedOp);
             else {
diff --git a/src/3rdparty/webkit/WebCore/platform/PlatformKeyboardEvent.h b/src/3rdparty/webkit/WebCore/platform/PlatformKeyboardEvent.h
index 4a6bc9e..d9701b7 100644
--- a/src/3rdparty/webkit/WebCore/platform/PlatformKeyboardEvent.h
+++ b/src/3rdparty/webkit/WebCore/platform/PlatformKeyboardEvent.h
@@ -81,7 +81,7 @@ namespace WebCore {
             AltKey = 1 << 0,
             CtrlKey = 1 << 1,
             MetaKey = 1 << 2,
-            ShiftKey = 1 << 3,
+            ShiftKey = 1 << 3
         };
 
         Type type() const { return m_type; }
diff --git a/src/3rdparty/webkit/WebCore/platform/ScrollTypes.h b/src/3rdparty/webkit/WebCore/platform/ScrollTypes.h
index eba9055..b0df470 100644
--- a/src/3rdparty/webkit/WebCore/platform/ScrollTypes.h
+++ b/src/3rdparty/webkit/WebCore/platform/ScrollTypes.h
@@ -53,7 +53,7 @@ namespace WebCore {
     enum ScrollbarControlStateMask {
         ActiveScrollbarState = 1,
         EnabledScrollbarState = 1 << 1,
-        PressedScrollbarState = 1 << 2,
+        PressedScrollbarState = 1 << 2
     };
 
     enum ScrollbarPart {
@@ -67,7 +67,7 @@ namespace WebCore {
         ForwardButtonEndPart = 1 << 6,
         ScrollbarBGPart = 1 << 7,
         TrackBGPart = 1 << 8,
-        AllParts = 0xffffffff,
+        AllParts = 0xffffffff
     };
 
     enum ScrollbarButtonsPlacement {
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/BitmapImage.h b/src/3rdparty/webkit/WebCore/platform/graphics/BitmapImage.h
index 8b770a1..a3a0493 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/BitmapImage.h
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/BitmapImage.h
@@ -150,7 +150,7 @@ protected:
     enum RepetitionCountStatus {
       Unknown,    // We haven't checked the source's repetition count.
       Uncertain,  // We have a repetition count, but it might be wrong (some GIFs have a count after the image data, and will report "loop once" until all data has been decoded).
-      Certain,    // The repetition count is known to be correct.
+      Certain     // The repetition count is known to be correct.
     };
 
     BitmapImage(NativeImagePtr, ImageObserver* = 0);
diff --git a/src/3rdparty/webkit/WebCore/platform/image-decoders/ImageDecoder.h b/src/3rdparty/webkit/WebCore/platform/image-decoders/ImageDecoder.h
index 9c2a9d7..494e2bb 100644
--- a/src/3rdparty/webkit/WebCore/platform/image-decoders/ImageDecoder.h
+++ b/src/3rdparty/webkit/WebCore/platform/image-decoders/ImageDecoder.h
@@ -52,7 +52,7 @@ namespace WebCore {
             DisposeNotSpecified,       // Leave frame in framebuffer
             DisposeKeep,               // Leave frame in framebuffer
             DisposeOverwriteBgcolor,   // Clear frame to transparent
-            DisposeOverwritePrevious,  // Clear frame to previous framebuffer contents
+            DisposeOverwritePrevious   // Clear frame to previous framebuffer contents
         };
 #if PLATFORM(SKIA)
         typedef uint32_t PixelData;
diff --git a/src/3rdparty/webkit/WebCore/platform/network/ProtectionSpace.h b/src/3rdparty/webkit/WebCore/platform/network/ProtectionSpace.h
index 9a73cff..b7d4574 100644
--- a/src/3rdparty/webkit/WebCore/platform/network/ProtectionSpace.h
+++ b/src/3rdparty/webkit/WebCore/platform/network/ProtectionSpace.h
@@ -46,7 +46,7 @@ enum ProtectionSpaceAuthenticationScheme {
   ProtectionSpaceAuthenticationSchemeHTTPDigest = 3,
   ProtectionSpaceAuthenticationSchemeHTMLForm = 4,
   ProtectionSpaceAuthenticationSchemeNTLM = 5,
-  ProtectionSpaceAuthenticationSchemeNegotiate = 6,
+  ProtectionSpaceAuthenticationSchemeNegotiate = 6
 };
 
 class ProtectionSpace {
diff --git a/src/3rdparty/webkit/WebCore/platform/network/ResourceHandleClient.h b/src/3rdparty/webkit/WebCore/platform/network/ResourceHandleClient.h
index c99be54..b8a8cbb 100644
--- a/src/3rdparty/webkit/WebCore/platform/network/ResourceHandleClient.h
+++ b/src/3rdparty/webkit/WebCore/platform/network/ResourceHandleClient.h
@@ -56,7 +56,7 @@ namespace WebCore {
     enum CacheStoragePolicy {
         StorageAllowed,
         StorageAllowedInMemoryOnly,
-        StorageNotAllowed,
+        StorageNotAllowed
     };
     
     class ResourceHandleClient {
diff --git a/src/3rdparty/webkit/WebCore/platform/network/ResourceRequestBase.h b/src/3rdparty/webkit/WebCore/platform/network/ResourceRequestBase.h
index 2d87d6e..740ebed 100644
--- a/src/3rdparty/webkit/WebCore/platform/network/ResourceRequestBase.h
+++ b/src/3rdparty/webkit/WebCore/platform/network/ResourceRequestBase.h
@@ -41,7 +41,7 @@ namespace WebCore {
         UseProtocolCachePolicy, // normal load
         ReloadIgnoringCacheData, // reload
         ReturnCacheDataElseLoad, // back/forward or encoding change - allow stale data
-        ReturnCacheDataDontLoad, // results of a post - allow stale data and only use cache
+        ReturnCacheDataDontLoad // results of a post - allow stale data and only use cache
     };
 
     const int unspecifiedTimeoutInterval = INT_MAX;
diff --git a/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h b/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h
index 38439ed..4325925 100644
--- a/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h
+++ b/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h
@@ -199,7 +199,7 @@ private:
 
     enum StringImplFlags {
         HasTerminatingNullCharacter,
-        InTable,
+        InTable
     };
 
     unsigned m_length;
diff --git a/src/3rdparty/webkit/WebCore/platform/text/TextCodec.h b/src/3rdparty/webkit/WebCore/platform/text/TextCodec.h
index 3c74165..36d7c6e 100644
--- a/src/3rdparty/webkit/WebCore/platform/text/TextCodec.h
+++ b/src/3rdparty/webkit/WebCore/platform/text/TextCodec.h
@@ -51,7 +51,7 @@ namespace WebCore {
         // Encodes the character as en entity as above, but escaped
         // non-alphanumeric characters. This is used in URLs.
         // For example, U+6DE would be "%26%231758%3B".
-        URLEncodedEntitiesForUnencodables,
+        URLEncodedEntitiesForUnencodables
     };
 
     typedef char UnencodableReplacementArray[32];
diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginQuirkSet.h b/src/3rdparty/webkit/WebCore/plugins/PluginQuirkSet.h
index b652c6e..8183050 100644
--- a/src/3rdparty/webkit/WebCore/plugins/PluginQuirkSet.h
+++ b/src/3rdparty/webkit/WebCore/plugins/PluginQuirkSet.h
@@ -45,7 +45,7 @@ namespace WebCore {
         PluginQuirkDontClipToZeroRectWhenScrolling = 1 << 9,
         PluginQuirkDontSetNullWindowHandleOnDestroy = 1 << 10,
         PluginQuirkDontAllowMultipleInstances = 1 << 11,
-        PluginQuirkRequiresGtkToolKit = 1 << 12,
+        PluginQuirkRequiresGtkToolKit = 1 << 12
     };
 
     class PluginQuirkSet {
diff --git a/src/3rdparty/webkit/WebCore/plugins/npapi.cpp b/src/3rdparty/webkit/WebCore/plugins/npapi.cpp
index 4135b64..d275a39 100644
--- a/src/3rdparty/webkit/WebCore/plugins/npapi.cpp
+++ b/src/3rdparty/webkit/WebCore/plugins/npapi.cpp
@@ -171,7 +171,9 @@ void NPN_PopPopupsEnabledState(NPP instance)
     pluginViewForInstance(instance)->popPopupsEnabledState();
 }
 
+extern "C" {
 void NPN_PluginThreadAsyncCall(NPP instance, void (*func) (void *), void *userData)
 {
     PluginMainThreadScheduler::scheduler().scheduleCall(instance, func, userData);
 }
+}
diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp
index 4b6d291..d92746b 100644
--- a/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp
+++ b/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp
@@ -3211,7 +3211,7 @@ void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle*)
 void RenderLayer::updateScrollCornerStyle()
 {
     RenderObject* actualRenderer = renderer()->node() ? renderer()->node()->shadowAncestorNode()->renderer() : renderer();
-    RefPtr<RenderStyle> corner = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(SCROLLBAR_CORNER, actualRenderer->style()) : 0;
+    RefPtr<RenderStyle> corner = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(SCROLLBAR_CORNER, actualRenderer->style()) : PassRefPtr<RenderStyle>(0);
     if (corner) {
         if (!m_scrollCorner) {
             m_scrollCorner = new (renderer()->renderArena()) RenderScrollbarPart(renderer()->document());
@@ -3227,7 +3227,7 @@ void RenderLayer::updateScrollCornerStyle()
 void RenderLayer::updateResizerStyle()
 {
     RenderObject* actualRenderer = renderer()->node() ? renderer()->node()->shadowAncestorNode()->renderer() : renderer();
-    RefPtr<RenderStyle> resizer = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(RESIZER, actualRenderer->style()) : 0;
+    RefPtr<RenderStyle> resizer = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(RESIZER, actualRenderer->style()) : PassRefPtr<RenderStyle>(0);
     if (resizer) {
         if (!m_resizer) {
             m_resizer = new (renderer()->renderArena()) RenderScrollbarPart(renderer()->document());
diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderLayer.h b/src/3rdparty/webkit/WebCore/rendering/RenderLayer.h
index 1772c66..541002f 100644
--- a/src/3rdparty/webkit/WebCore/rendering/RenderLayer.h
+++ b/src/3rdparty/webkit/WebCore/rendering/RenderLayer.h
@@ -298,7 +298,7 @@ public:
     enum UpdateLayerPositionsFlag {
         DoFullRepaint = 1,
         CheckForRepaint = 1 << 1,
-        UpdateCompositingLayers = 1 << 2,
+        UpdateCompositingLayers = 1 << 2
     };
     typedef unsigned UpdateLayerPositionsFlags;
     void updateLayerPositions(UpdateLayerPositionsFlags = DoFullRepaint | UpdateCompositingLayers);
diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderScrollbar.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderScrollbar.cpp
index db24a06..32cea92 100644
--- a/src/3rdparty/webkit/WebCore/rendering/RenderScrollbar.cpp
+++ b/src/3rdparty/webkit/WebCore/rendering/RenderScrollbar.cpp
@@ -183,7 +183,7 @@ void RenderScrollbar::updateScrollbarPart(ScrollbarPart partType, bool destroy)
     if (partType == NoPart)
         return;
 
-    RefPtr<RenderStyle> partStyle = !destroy ? getScrollbarPseudoStyle(partType,  pseudoForScrollbarPart(partType)) : 0;
+    RefPtr<RenderStyle> partStyle = !destroy ? getScrollbarPseudoStyle(partType,  pseudoForScrollbarPart(partType)) : PassRefPtr<RenderStyle>(0);
     
     bool needRenderer = !destroy && partStyle && partStyle->display() != NONE && partStyle->visibility() == VISIBLE;
     
diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderTextFragment.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderTextFragment.cpp
index 7da9e5a..1d8fca6 100644
--- a/src/3rdparty/webkit/WebCore/rendering/RenderTextFragment.cpp
+++ b/src/3rdparty/webkit/WebCore/rendering/RenderTextFragment.cpp
@@ -28,7 +28,7 @@
 namespace WebCore {
 
 RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str, int startOffset, int length)
-    : RenderText(node, str ? str->substring(startOffset, length) : 0)
+    : RenderText(node, str ? str->substring(startOffset, length) : PassRefPtr<StringImpl>(0))
     , m_start(startOffset)
     , m_end(length)
     , m_firstLetter(0)
diff --git a/src/3rdparty/webkit/WebCore/svg/SVGElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGElement.cpp
index 3a7d3d4..a04b095 100644
--- a/src/3rdparty/webkit/WebCore/svg/SVGElement.cpp
+++ b/src/3rdparty/webkit/WebCore/svg/SVGElement.cpp
@@ -214,7 +214,7 @@ void SVGElement::sendSVGLoadEventIfPossible(bool sendParentLoadEvents)
             event->setTarget(currentTarget);
             currentTarget->dispatchGenericEvent(event.release());
         }
-        currentTarget = (parent && parent->isSVGElement()) ? static_pointer_cast<SVGElement>(parent) : 0;
+        currentTarget = (parent && parent->isSVGElement()) ? static_pointer_cast<SVGElement>(parent) : RefPtr<SVGElement>(0);
     }
 }
 
diff --git a/src/3rdparty/webkit/WebCore/workers/Worker.cpp b/src/3rdparty/webkit/WebCore/workers/Worker.cpp
index 866687f..22c7d71 100644
--- a/src/3rdparty/webkit/WebCore/workers/Worker.cpp
+++ b/src/3rdparty/webkit/WebCore/workers/Worker.cpp
@@ -74,7 +74,7 @@ void Worker::postMessage(const String& message, ExceptionCode& ec)
 void Worker::postMessage(const String& message, MessagePort* messagePort, ExceptionCode& ec)
 {
     // Disentangle the port in preparation for sending it to the remote context.
-    OwnPtr<MessagePortChannel> channel = messagePort ? messagePort->disentangle(ec) : 0;
+    OwnPtr<MessagePortChannel> channel = messagePort ? messagePort->disentangle(ec) : PassOwnPtr<MessagePortChannel>(0);
     if (ec)
         return;
     m_contextProxy->postMessageToWorkerContext(message, channel.release());
diff --git a/src/corelib/arch/alpha/qatomic_alpha.s b/src/corelib/arch/alpha/qatomic_alpha.s
index 9363b35..44fa932 100644
--- a/src/corelib/arch/alpha/qatomic_alpha.s
+++ b/src/corelib/arch/alpha/qatomic_alpha.s
@@ -1,3 +1,43 @@
+;/****************************************************************************
+;**
+;** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+;** Contact: Nokia Corporation (qt-info@nokia.com)
+;**
+;** This file is part of the QtGui module of the Qt Toolkit.
+;**
+;** $QT_BEGIN_LICENSE:LGPL$
+;** No Commercial Usage
+;** This file contains pre-release code and may not be distributed.
+;** You may use this file in accordance with the terms and conditions
+;** contained in the Technology Preview License Agreement accompanying
+;** this package.
+;**
+;** GNU Lesser General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU Lesser
+;** General Public License version 2.1 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.LGPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU Lesser General Public License version 2.1 requirements
+;** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+;**
+;** In addition, as a special exception, Nokia gives you certain
+;** additional rights.  These rights are described in the Nokia Qt LGPL
+;** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+;** package.
+;**
+;** If you have questions regarding the use of this file, please contact
+;** Nokia at qt-info@nokia.com.
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;** $QT_END_LICENSE$
+;**
+;****************************************************************************/
 	.set noreorder
 	.set volatile
 	.set noat
diff --git a/src/corelib/arch/ia64/qatomic_ia64.s b/src/corelib/arch/ia64/qatomic_ia64.s
index 6b8a204..f6be4dd 100644
--- a/src/corelib/arch/ia64/qatomic_ia64.s
+++ b/src/corelib/arch/ia64/qatomic_ia64.s
@@ -1,3 +1,43 @@
+;/****************************************************************************
+;**
+;** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+;** Contact: Nokia Corporation (qt-info@nokia.com)
+;**
+;** This file is part of the QtGui module of the Qt Toolkit.
+;**
+;** $QT_BEGIN_LICENSE:LGPL$
+;** No Commercial Usage
+;** This file contains pre-release code and may not be distributed.
+;** You may use this file in accordance with the terms and conditions
+;** contained in the Technology Preview License Agreement accompanying
+;** this package.
+;**
+;** GNU Lesser General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU Lesser
+;** General Public License version 2.1 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.LGPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU Lesser General Public License version 2.1 requirements
+;** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+;**
+;** In addition, as a special exception, Nokia gives you certain
+;** additional rights.  These rights are described in the Nokia Qt LGPL
+;** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+;** package.
+;**
+;** If you have questions regarding the use of this file, please contact
+;** Nokia at qt-info@nokia.com.
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;** $QT_END_LICENSE$
+;**
+;****************************************************************************/
 	.pred.safe_across_calls p1-p5,p16-p63
 .text
 	.align 16
diff --git a/src/corelib/arch/macosx/qatomic32_ppc.s b/src/corelib/arch/macosx/qatomic32_ppc.s
index 13fff67..f87a152 100644
--- a/src/corelib/arch/macosx/qatomic32_ppc.s
+++ b/src/corelib/arch/macosx/qatomic32_ppc.s
@@ -1,3 +1,43 @@
+;/****************************************************************************
+;**
+;** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+;** Contact: Nokia Corporation (qt-info@nokia.com)
+;**
+;** This file is part of the QtGui module of the Qt Toolkit.
+;**
+;** $QT_BEGIN_LICENSE:LGPL$
+;** No Commercial Usage
+;** This file contains pre-release code and may not be distributed.
+;** You may use this file in accordance with the terms and conditions
+;** contained in the Technology Preview License Agreement accompanying
+;** this package.
+;**
+;** GNU Lesser General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU Lesser
+;** General Public License version 2.1 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.LGPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU Lesser General Public License version 2.1 requirements
+;** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+;**
+;** In addition, as a special exception, Nokia gives you certain
+;** additional rights.  These rights are described in the Nokia Qt LGPL
+;** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+;** package.
+;**
+;** If you have questions regarding the use of this file, please contact
+;** Nokia at qt-info@nokia.com.
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;** $QT_END_LICENSE$
+;**
+;****************************************************************************/
 	.section __TEXT,__text,regular,pure_instructions
 	.section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32
         .section __TEXT,__text,regular,pure_instructions
diff --git a/src/corelib/arch/mips/qatomic_mips32.s b/src/corelib/arch/mips/qatomic_mips32.s
index e7a449b..2bd2dc3 100644
--- a/src/corelib/arch/mips/qatomic_mips32.s
+++ b/src/corelib/arch/mips/qatomic_mips32.s
@@ -1,3 +1,43 @@
+;/****************************************************************************
+;**
+;** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+;** Contact: Nokia Corporation (qt-info@nokia.com)
+;**
+;** This file is part of the QtGui module of the Qt Toolkit.
+;**
+;** $QT_BEGIN_LICENSE:LGPL$
+;** No Commercial Usage
+;** This file contains pre-release code and may not be distributed.
+;** You may use this file in accordance with the terms and conditions
+;** contained in the Technology Preview License Agreement accompanying
+;** this package.
+;**
+;** GNU Lesser General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU Lesser
+;** General Public License version 2.1 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.LGPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU Lesser General Public License version 2.1 requirements
+;** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+;**
+;** In addition, as a special exception, Nokia gives you certain
+;** additional rights.  These rights are described in the Nokia Qt LGPL
+;** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+;** package.
+;**
+;** If you have questions regarding the use of this file, please contact
+;** Nokia at qt-info@nokia.com.
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;** $QT_END_LICENSE$
+;**
+;****************************************************************************/
 	.set nobopt
 	.set noreorder
 	.option pic2
diff --git a/src/corelib/arch/mips/qatomic_mips64.s b/src/corelib/arch/mips/qatomic_mips64.s
index d2bd8fe..08dc76f 100644
--- a/src/corelib/arch/mips/qatomic_mips64.s
+++ b/src/corelib/arch/mips/qatomic_mips64.s
@@ -1,3 +1,43 @@
+;/****************************************************************************
+;**
+;** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+;** Contact: Nokia Corporation (qt-info@nokia.com)
+;**
+;** This file is part of the QtGui module of the Qt Toolkit.
+;**
+;** $QT_BEGIN_LICENSE:LGPL$
+;** No Commercial Usage
+;** This file contains pre-release code and may not be distributed.
+;** You may use this file in accordance with the terms and conditions
+;** contained in the Technology Preview License Agreement accompanying
+;** this package.
+;**
+;** GNU Lesser General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU Lesser
+;** General Public License version 2.1 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.LGPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU Lesser General Public License version 2.1 requirements
+;** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+;**
+;** In addition, as a special exception, Nokia gives you certain
+;** additional rights.  These rights are described in the Nokia Qt LGPL
+;** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+;** package.
+;**
+;** If you have questions regarding the use of this file, please contact
+;** Nokia at qt-info@nokia.com.
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;** $QT_END_LICENSE$
+;**
+;****************************************************************************/
 	.set nobopt
 	.set noreorder
 	.option pic2
diff --git a/src/corelib/arch/parisc/q_ldcw.s b/src/corelib/arch/parisc/q_ldcw.s
index f901ad9..99205fc 100644
--- a/src/corelib/arch/parisc/q_ldcw.s
+++ b/src/corelib/arch/parisc/q_ldcw.s
@@ -1,3 +1,43 @@
+;/****************************************************************************
+;**
+;** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+;** Contact: Nokia Corporation (qt-info@nokia.com)
+;**
+;** This file is part of the QtGui module of the Qt Toolkit.
+;**
+;** $QT_BEGIN_LICENSE:LGPL$
+;** No Commercial Usage
+;** This file contains pre-release code and may not be distributed.
+;** You may use this file in accordance with the terms and conditions
+;** contained in the Technology Preview License Agreement accompanying
+;** this package.
+;**
+;** GNU Lesser General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU Lesser
+;** General Public License version 2.1 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.LGPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU Lesser General Public License version 2.1 requirements
+;** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+;**
+;** In addition, as a special exception, Nokia gives you certain
+;** additional rights.  These rights are described in the Nokia Qt LGPL
+;** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+;** package.
+;**
+;** If you have questions regarding the use of this file, please contact
+;** Nokia at qt-info@nokia.com.
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;**
+;** $QT_END_LICENSE$
+;**
+;****************************************************************************/
 	.SPACE $PRIVATE$
 	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
 	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
diff --git a/src/corelib/arch/powerpc/qatomic32.s b/src/corelib/arch/powerpc/qatomic32.s
index 811ba84..a84e0a3 100644
--- a/src/corelib/arch/powerpc/qatomic32.s
+++ b/src/corelib/arch/powerpc/qatomic32.s
@@ -1,3 +1,43 @@
+############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the QtGui module of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+############################################################################
 	.machine "ppc"
 	.toc
 	.csect .text[PR]
diff --git a/src/corelib/arch/powerpc/qatomic64.s b/src/corelib/arch/powerpc/qatomic64.s
index 88c2bbd..e56a239 100644
--- a/src/corelib/arch/powerpc/qatomic64.s
+++ b/src/corelib/arch/powerpc/qatomic64.s
@@ -1,3 +1,43 @@
+############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the QtGui module of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+############################################################################
 	.machine	"ppc64"
 	.toc
 	.csect .text[PR]
diff --git a/src/corelib/arch/qatomic_windows.h b/src/corelib/arch/qatomic_windows.h
index 9b7ff5d..6082d0b 100644
--- a/src/corelib/arch/qatomic_windows.h
+++ b/src/corelib/arch/qatomic_windows.h
@@ -144,7 +144,6 @@ extern "C" {
 #endif // QT_INTERLOCKED_DECLARE_PROTOTYPES
 
 #undef QT_INTERLOCKED_PROTOTYPE
-#undef QT_INTERLOCKED_VOLATILE
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -215,13 +214,13 @@ extern "C" {
 
 # define QT_INTERLOCKED_COMPARE_EXCHANGE_POINTER(value, newValue, expectedValue) \
     QT_INTERLOCKED_FUNCTION(InterlockedCompareExchangePointer)( \
-            QT_INTERLOCKED_REMOVE_VOLATILE( value ), \
+            reinterpret_cast<void * QT_INTERLOCKED_VOLATILE *>( QT_INTERLOCKED_REMOVE_VOLATILE( value ) ), \
             newValue, \
             expectedValue )
 
 # define QT_INTERLOCKED_EXCHANGE_POINTER(value, newValue) \
     QT_INTERLOCKED_FUNCTION(InterlockedExchangePointer)( \
-            QT_INTERLOCKED_REMOVE_VOLATILE( value ), \
+            reinterpret_cast<void * QT_INTERLOCKED_VOLATILE *>( QT_INTERLOCKED_REMOVE_VOLATILE( value ) ), \
             newValue )
 
 # define QT_INTERLOCKED_EXCHANGE_ADD_POINTER(value, valueToAdd) \
@@ -471,6 +470,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueTo
 #undef QT_INTERLOCKED_PREFIX
 
 #undef QT_INTERLOCKED_NO_VOLATILE
+#undef QT_INTERLOCKED_VOLATILE
 #undef QT_INTERLOCKED_REMOVE_VOLATILE
 
 #undef QT_INTERLOCKED_INCREMENT
diff --git a/src/corelib/arch/sparc/qatomic32.s b/src/corelib/arch/sparc/qatomic32.s
index f0ab0d1..6e6b199 100644
--- a/src/corelib/arch/sparc/qatomic32.s
+++ b/src/corelib/arch/sparc/qatomic32.s
@@ -1,3 +1,43 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!
+!! Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+!! Contact: Nokia Corporation (qt-info@nokia.com)
+!!
+!! This file is part of the QtGui module of the Qt Toolkit.
+!!
+!! $QT_BEGIN_LICENSE:LGPL$
+!! No Commercial Usage
+!! This file contains pre-release code and may not be distributed.
+!! You may use this file in accordance with the terms and conditions
+!! contained in the Technology Preview License Agreement accompanying
+!! this package.
+!!
+!! GNU Lesser General Public License Usage
+!! Alternatively, this file may be used under the terms of the GNU Lesser
+!! General Public License version 2.1 as published by the Free Software
+!! Foundation and appearing in the file LICENSE.LGPL included in the
+!! packaging of this file.  Please review the following information to
+!! ensure the GNU Lesser General Public License version 2.1 requirements
+!! will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+!!
+!! In addition, as a special exception, Nokia gives you certain
+!! additional rights.  These rights are described in the Nokia Qt LGPL
+!! Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+!! package.
+!!
+!! If you have questions regarding the use of this file, please contact
+!! Nokia at qt-info@nokia.com.
+!!
+!!
+!!
+!!
+!!
+!!
+!!
+!!
+!! $QT_END_LICENSE$
+!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	.section ".text"
 
 	.align 4
diff --git a/src/corelib/arch/sparc/qatomic64.s b/src/corelib/arch/sparc/qatomic64.s
index edd1716..64560a0 100644
--- a/src/corelib/arch/sparc/qatomic64.s
+++ b/src/corelib/arch/sparc/qatomic64.s
@@ -1,3 +1,43 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!
+!! Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+!! Contact: Nokia Corporation (qt-info@nokia.com)
+!!
+!! This file is part of the QtGui module of the Qt Toolkit.
+!!
+!! $QT_BEGIN_LICENSE:LGPL$
+!! No Commercial Usage
+!! This file contains pre-release code and may not be distributed.
+!! You may use this file in accordance with the terms and conditions
+!! contained in the Technology Preview License Agreement accompanying
+!! this package.
+!!
+!! GNU Lesser General Public License Usage
+!! Alternatively, this file may be used under the terms of the GNU Lesser
+!! General Public License version 2.1 as published by the Free Software
+!! Foundation and appearing in the file LICENSE.LGPL included in the
+!! packaging of this file.  Please review the following information to
+!! ensure the GNU Lesser General Public License version 2.1 requirements
+!! will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+!!
+!! In addition, as a special exception, Nokia gives you certain
+!! additional rights.  These rights are described in the Nokia Qt LGPL
+!! Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+!! package.
+!!
+!! If you have questions regarding the use of this file, please contact
+!! Nokia at qt-info@nokia.com.
+!!
+!!
+!!
+!!
+!!
+!!
+!!
+!!
+!! $QT_END_LICENSE$
+!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	.section ".text"
 
 	.align 4
diff --git a/src/corelib/arch/x86_64/qatomic_sun.s b/src/corelib/arch/x86_64/qatomic_sun.s
index 37969e6..4517fe4 100644
--- a/src/corelib/arch/x86_64/qatomic_sun.s
+++ b/src/corelib/arch/x86_64/qatomic_sun.s
@@ -1,3 +1,43 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!
+!! Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+!! Contact: Nokia Corporation (qt-info@nokia.com)
+!!
+!! This file is part of the QtGui module of the Qt Toolkit.
+!!
+!! $QT_BEGIN_LICENSE:LGPL$
+!! No Commercial Usage
+!! This file contains pre-release code and may not be distributed.
+!! You may use this file in accordance with the terms and conditions
+!! contained in the Technology Preview License Agreement accompanying
+!! this package.
+!!
+!! GNU Lesser General Public License Usage
+!! Alternatively, this file may be used under the terms of the GNU Lesser
+!! General Public License version 2.1 as published by the Free Software
+!! Foundation and appearing in the file LICENSE.LGPL included in the
+!! packaging of this file.  Please review the following information to
+!! ensure the GNU Lesser General Public License version 2.1 requirements
+!! will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+!!
+!! In addition, as a special exception, Nokia gives you certain
+!! additional rights.  These rights are described in the Nokia Qt LGPL
+!! Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+!! package.
+!!
+!! If you have questions regarding the use of this file, please contact
+!! Nokia at qt-info@nokia.com.
+!!
+!!
+!!
+!!
+!!
+!!
+!!
+!!
+!! $QT_END_LICENSE$
+!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         .code64
 
 	.globl q_atomic_increment
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 935c99b..787eba7 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1189,6 +1189,7 @@ bool qSharedBuild()
     \value SV_S60_3_2 S60 3rd Edition Feature Pack 2
     \value SV_S60_5_0 S60 5th Edition
     \value SV_S60_Unknown An unknown and currently unsupported platform
+    \omitvalue SV_S60_None
 
     \sa SymbianVersion, WinVersion, MacVersion
 */
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index c34fc31..a2c532f 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1364,6 +1364,9 @@ inline void qt_noop() {}
 #ifdef QT_BOOTSTRAPPED
 #  define QT_NO_EXCEPTIONS
 #endif
+#if defined(Q_CC_GNU) && !defined (__EXCEPTIONS) && !defined(Q_MOC_RUN)
+#  define QT_NO_EXCEPTIONS
+#endif
 
 #ifdef QT_NO_EXCEPTIONS
 #  define QT_TRY if (true)
@@ -2161,7 +2164,7 @@ public:
 
     inline bool operator!() const { return !i; }
 
-    inline bool testFlag(Enum f) const { return (i & f) == f && (f != 0 || i == f ); }
+    inline bool testFlag(Enum f) const { return (i & f) == f && (f != 0 || i == int(f) ); }
 };
 
 #define Q_DECLARE_FLAGS(Flags, Enum)\
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index a6f5907..8f34e30 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -501,6 +501,8 @@ public:
         WA_WState_AcceptedTouchBeginEvent = 122,
         WA_TouchPadAcceptSingleTouchEvents = 123,
 
+        WA_DontUseStandardGestures = 124,
+
         // Add new attributes before this line
         WA_AttributeCount
     };
@@ -1652,7 +1654,8 @@ public:
         Pbuffer       = 0x06,    // GL pbuffer
         FramebufferObject = 0x07, // GL framebuffer object
         CustomRaster  = 0x08,
-        MacQuartz     = 0x09
+        MacQuartz     = 0x09,
+        PaintBuffer   = 0x0a
     };
     enum RelayoutType {
         RelayoutNormal,
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index ace70ff..06eea68 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -612,6 +612,12 @@
 */
 
 /*!
+  \enum Qt::CoordinateSystem 
+  \value DeviceCoordinates
+  \value LogicalCoordinates
+ */
+
+/*!
     \enum Qt::CaseSensitivity
 
     \value CaseInsensitive
@@ -1216,6 +1222,8 @@
     \value WA_TouchPadAcceptSingleTouchEvents Allows touchpad single
     touch events to be sent to the widget. 
 
+    \value WA_DontUseStandardGestures Disables standard gestures on Qt widgets.
+
     \omitvalue WA_SetLayoutDirection
     \omitvalue WA_InputMethodTransparent
     \omitvalue WA_WState_CompressKeys
diff --git a/src/corelib/io/qfile_p.h b/src/corelib/io/qfile_p.h
index f35cdeb..781c6d5 100644
--- a/src/corelib/io/qfile_p.h
+++ b/src/corelib/io/qfile_p.h
@@ -72,7 +72,6 @@ protected:
 
     QString fileName;
     mutable QAbstractFileEngine *fileEngine;
-    bool isOpen;
 
     bool lastWasWrite;
     QRingBuffer writeBuffer;
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index 5ff0716..a5ed95c 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -89,7 +89,8 @@ typedef INT_PTR intptr_t;
 #  define INVALID_FILE_ATTRIBUTES (DWORD (-1))
 #endif
 
-#if !defined(REPARSE_DATA_BUFFER_HEADER_SIZE) && !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE)
+#  if !defined(REPARSE_DATA_BUFFER_HEADER_SIZE)
 typedef struct _REPARSE_DATA_BUFFER {
     ULONG  ReparseTag;
     USHORT ReparseDataLength;
@@ -115,8 +116,9 @@ typedef struct _REPARSE_DATA_BUFFER {
         } GenericReparseBuffer;
     };
 } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
+#    define REPARSE_DATA_BUFFER_HEADER_SIZE  FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer)
+#  endif // !defined(REPARSE_DATA_BUFFER_HEADER_SIZE)
 
-#  define REPARSE_DATA_BUFFER_HEADER_SIZE  FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer)
 #  ifndef MAXIMUM_REPARSE_DATA_BUFFER_SIZE
 #    define MAXIMUM_REPARSE_DATA_BUFFER_SIZE 16384
 #  endif
@@ -126,7 +128,7 @@ typedef struct _REPARSE_DATA_BUFFER {
 #  ifndef FSCTL_GET_REPARSE_POINT
 #    define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #  endif
-#endif
+#endif // !defined(Q_OS_WINCE)
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 5b6830c..1e3b6eb 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -1572,7 +1572,7 @@ void QProcess::setProcessEnvironment(const QProcessEnvironment &environment)
     \note The environment settings are ignored on Windows CE,
     as there is no concept of an environment.
 
-    \sa setProcessEnvironment(), setEnvironment(), QProcessEnvironment::isValid()
+    \sa setProcessEnvironment(), setEnvironment(), QProcessEnvironment::isEmpty()
 */
 QProcessEnvironment QProcess::processEnvironment() const
 {
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index 72388b5..c70804a 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -937,7 +937,7 @@ inline bool QTextStreamPrivate::putString(const QString &s, bool number)
     // handle padding
     int padSize = fieldWidth - s.size();
     if (padSize > 0) {
-        QString pad(padSize > 0 ? padSize : 0, padChar);
+        QString pad(padSize, padChar);
         if (fieldAlignment == QTextStream::AlignLeft) {
             tmp.append(QString(padSize, padChar));
         } else if (fieldAlignment == QTextStream::AlignRight
diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h
index c922833..d83455a 100644
--- a/src/corelib/io/qtextstream.h
+++ b/src/corelib/io/qtextstream.h
@@ -274,7 +274,7 @@ class Q_CORE_EXPORT QTextStreamManipulator
 {
 public:
     QTextStreamManipulator(QTSMFI m, int a) { mf = m; mc = 0; arg = a; }
-    QTextStreamManipulator(QTSMFC m, QChar c) { mf = 0; mc = m; ch = c; }
+    QTextStreamManipulator(QTSMFC m, QChar c) { mf = 0; mc = m; ch = c; arg = -1; }
     void exec(QTextStream &s) { if (mf) { (s.*mf)(arg); } else { (s.*mc)(ch); } }
 
 private:
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 4d9d3b2..c0c97b8 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -3364,10 +3364,10 @@ void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_sign
                  && (currentThreadData != sender->d_func()->threadData
                      || receiver->d_func()->threadData != sender->d_func()->threadData))
                 || (c->connectionType == Qt::QueuedConnection)) {
-                queued_activate(sender, signal_absolute_index, c, argv);
+                queued_activate(sender, signal_absolute_index, c, argv ? argv : empty_argv);
                 continue;
             } else if (c->connectionType == Qt::BlockingQueuedConnection) {
-                blocking_activate(sender, signal_absolute_index, c, argv);
+                blocking_activate(sender, signal_absolute_index, c, argv ? argv : empty_argv);
                 continue;
             }
 
@@ -3442,7 +3442,7 @@ void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_sign
 void QMetaObject::activate(QObject *sender, int signal_index, void **argv)
 {
     const QMetaObject *mo = sender->metaObject();
-    while (mo && mo->methodOffset() > signal_index)
+    while (mo->methodOffset() > signal_index)
         mo = mo->superClass();
     activate(sender, mo, signal_index - mo->methodOffset(), argv);
 }
@@ -3706,7 +3706,7 @@ void QObject::dumpObjectInfo()
                 const QMetaObject *mo = metaObject();
                 int signalOffset, methodOffset;
                 computeOffsets(mo, &signalOffset, &methodOffset);
-                while (mo && signalOffset > signal_index) {
+                while (signalOffset > signal_index) {
                     mo = mo->superClass();
                     offsetToNextMetaObject = signalOffset;
                     computeOffsets(mo, &signalOffset, &methodOffset);
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
index e411681..f62577e 100644
--- a/src/corelib/kernel/qsharedmemory_unix.cpp
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
@@ -283,7 +283,6 @@ bool QSharedMemoryPrivate::detach()
     // If there are no attachments then remove it.
     if (shmid_ds.shm_nattch == 0) {
         // mark for removal
-        struct shmid_ds shmid_ds;
         if (-1 == shmctl(id, IPC_RMID, &shmid_ds)) {
             setErrorString(QLatin1String("QSharedMemory::remove"));
             switch (errno) {
diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp
index ac2aac8..2fc6a58 100644
--- a/src/corelib/statemachine/qsignaltransition.cpp
+++ b/src/corelib/statemachine/qsignaltransition.cpp
@@ -249,17 +249,15 @@ void QSignalTransitionPrivate::callOnTransition(QEvent *e)
 {
     Q_Q(QSignalTransition);
 
-    QSignalEvent *se = static_cast<QSignalEvent *>(e);
-    int savedSignalIndex;
     if (e->type() == QEvent::Signal) {
-        savedSignalIndex = se->m_signalIndex;
+        QSignalEvent *se = static_cast<QSignalEvent *>(e);
+        int savedSignalIndex = se->m_signalIndex;
         se->m_signalIndex = originalSignalIndex;
-    }
-
-    q->onTransition(e);
-
-    if (e->type() == QEvent::Signal)
+        q->onTransition(e);
         se->m_signalIndex = savedSignalIndex;
+    } else {
+        q->onTransition(e);
+    }
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index 840f6a5..145b631 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -1467,8 +1467,19 @@ QByteArray &QByteArray::prepend(const QByteArray &ba)
 
 QByteArray &QByteArray::prepend(const char *str)
 {
+    return prepend(str, qstrlen(str));
+}
+
+/*!
+    \overload
+    \since 4.6
+
+    Prepends \a len bytes of the string \a str to this byte array.
+*/
+
+QByteArray &QByteArray::prepend(const char *str, int len)
+{
     if (str) {
-        int len = qstrlen(str);
         if (d->ref != 1 || d->size + len > d->alloc)
             realloc(qAllocMore(d->size + len, sizeof(Data)));
         memmove(d->data+len, d->data, d->size);
@@ -1679,6 +1690,22 @@ QByteArray &QByteArray::insert(int i, const char *str)
 
 /*!
     \overload
+    \since 4.6
+
+    Inserts \a len bytes of the string \a str at position
+    \a i in the byte array.
+
+    If \a i is greater than size(), the array is first extended using
+    resize().
+*/
+
+QByteArray &QByteArray::insert(int i, const char *str, int len)
+{
+    return qbytearray_insert(this, i, str, len);
+}
+
+/*!
+    \overload
 
     Inserts character \a ch at index position \a i in the byte array.
     If \a i is greater than size(), the array is first extended using
@@ -4099,6 +4126,10 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA
     \internal
 */
 
+/*! \typedef QByteArray::value_type
+  \internal
+ */
+
 /*!
     \fn QByteArray::QByteArray(int size)
 
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h
index f7e790d..34dd44f 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/tools/qbytearray.h
@@ -224,6 +224,7 @@ public:
 
     QByteArray &prepend(char c);
     QByteArray &prepend(const char *s);
+    QByteArray &prepend(const char *s, int len);
     QByteArray &prepend(const QByteArray &a);
     QByteArray &append(char c);
     QByteArray &append(const char *s);
@@ -231,6 +232,7 @@ public:
     QByteArray &append(const QByteArray &a);
     QByteArray &insert(int i, char c);
     QByteArray &insert(int i, const char *s);
+    QByteArray &insert(int i, const char *s, int len);
     QByteArray &insert(int i, const QByteArray &a);
     QByteArray &remove(int index, int len);
     QByteArray &replace(int index, int len, const char *s);
diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h
index b369e53..8621908 100644
--- a/src/corelib/tools/qcache.h
+++ b/src/corelib/tools/qcache.h
@@ -131,7 +131,7 @@ private:
 
 template <class Key, class T>
 inline QCache<Key, T>::QCache(int amaxCost)
-    : f(0), l(0), mx(amaxCost), total(0) {}
+    : f(0), l(0), unused(0), mx(amaxCost), total(0) {}
 
 template <class Key, class T>
 inline void QCache<Key,T>::clear()
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index ded36c2..623d63e 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -636,6 +636,9 @@ static QString winSystemPMText()
     return QString();
 }
 
+/*!
+  Returns the fallback locale obtained from the system.
+ */
 QLocale QSystemLocale::fallbackLocale() const
 {
     return QLocale(QString::fromLatin1(getWinLocaleName()));
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index 44238a8..7dcac71 100644
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -219,4 +219,8 @@ QT_BEGIN_NAMESPACE
     \sa isNull()
 */
 
+/*! \fn void QScopedPointer::swap(QScopedPointer<T, Cleanup> &other)
+  Swap this pointer with \a other.
+ */
+
 QT_END_NAMESPACE
diff --git a/src/corelib/xml/make-parser.sh b/src/corelib/xml/make-parser.sh
index 0e2cbe1..e18dda3 100755
--- a/src/corelib/xml/make-parser.sh
+++ b/src/corelib/xml/make-parser.sh
@@ -1,4 +1,44 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 me=$(dirname $0)
 mkdir -p $me/out
diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g
index b9659ba..39edcbc 100644
--- a/src/corelib/xml/qxmlstream.g
+++ b/src/corelib/xml/qxmlstream.g
@@ -37,9 +37,6 @@
 --
 -- $QT_END_LICENSE$
 --
--- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
---
 ----------------------------------------------------------------------------
 
 %parser QXmlStreamReader_Table
diff --git a/src/gui/accessible/qaccessible_mac_cocoa.mm b/src/gui/accessible/qaccessible_mac_cocoa.mm
index dd02f6c..9a50036 100644
--- a/src/gui/accessible/qaccessible_mac_cocoa.mm
+++ b/src/gui/accessible/qaccessible_mac_cocoa.mm
@@ -1,4 +1,3 @@
-
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -40,6 +39,7 @@
 **
 ****************************************************************************/
 
+
 #include "qaccessible.h"
 #include "qaccessible_mac_p.h"
 #include "qdebug.h"
diff --git a/src/gui/dialogs/qdialog_p.h b/src/gui/dialogs/qdialog_p.h
index 5239d09..a90d6e6 100644
--- a/src/gui/dialogs/qdialog_p.h
+++ b/src/gui/dialogs/qdialog_p.h
@@ -98,7 +98,7 @@ public:
 #endif
 
 #ifdef Q_WS_MAC
-    virtual void mac_nativeDialogModalHelp(){};
+    virtual void mac_nativeDialogModalHelp() {}
 #endif
 
     int rescode;
diff --git a/src/gui/dialogs/qfiledialog_embedded.ui b/src/gui/dialogs/qfiledialog_embedded.ui
index 454af4b..f134f64 100644
--- a/src/gui/dialogs/qfiledialog_embedded.ui
+++ b/src/gui/dialogs/qfiledialog_embedded.ui
@@ -2,6 +2,7 @@
  <comment>*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
@@ -37,9 +38,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 *********************************************************************</comment>
  <class>QFileDialog</class>
  <widget class="QDialog" name="QFileDialog" >
diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp
index 54e0046..cb19511 100644
--- a/src/gui/dialogs/qprintdialog_unix.cpp
+++ b/src/gui/dialogs/qprintdialog_unix.cpp
@@ -193,12 +193,12 @@ public:
           description(desc),
           selected(-1),
           selDescription(0),
-          parentItem(pi) {};
+          parentItem(pi) {}
 
     ~QOptionTreeItem() {
         while (!childItems.isEmpty())
             delete childItems.takeFirst();
-    };
+    }
 
     ItemType type;
     int index;
@@ -238,8 +238,8 @@ class QPPDOptionsEditor : public QStyledItemDelegate
 {
     Q_OBJECT
 public:
-    QPPDOptionsEditor(QObject* parent = 0) : QStyledItemDelegate(parent) {};
-    ~QPPDOptionsEditor() {};
+    QPPDOptionsEditor(QObject* parent = 0) : QStyledItemDelegate(parent) {}
+    ~QPPDOptionsEditor() {}
 
     QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
     void setEditorData(QWidget* editor, const QModelIndex& index) const;
diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp
index f60e80e..6629a6d 100644
--- a/src/gui/effects/qgraphicseffect.cpp
+++ b/src/gui/effects/qgraphicseffect.cpp
@@ -256,7 +256,8 @@ QPixmap QGraphicsEffectSource::pixmap(Qt::CoordinateSystem system, QPoint *offse
 }
 
 /*!
-    Constructs a new QGraphicsEffect instance.
+    Constructs a new QGraphicsEffect instance having the
+    specified \a parent.
 */
 QGraphicsEffect::QGraphicsEffect(QObject *parent)
     : QObject(*new QGraphicsEffectPrivate, parent)
diff --git a/src/gui/effects/qgraphicseffect.h b/src/gui/effects/qgraphicseffect.h
index aee7834..61aa21a 100644
--- a/src/gui/effects/qgraphicseffect.h
+++ b/src/gui/effects/qgraphicseffect.h
@@ -292,7 +292,7 @@ class QGraphicsOpacityEffectPrivate;
 class Q_GUI_EXPORT QGraphicsOpacityEffect: public QGraphicsEffect
 {
     Q_OBJECT
-    Q_PROPERTY(int opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
+    Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
     Q_PROPERTY(QBrush opacityMask READ opacityMask WRITE setOpacityMask NOTIFY opacityMaskChanged)
 public:
     QGraphicsOpacityEffect(QObject *parent = 0);
diff --git a/src/gui/embedded/directfb.pri b/src/gui/embedded/directfb.pri
new file mode 100644
index 0000000..7dae9d5
--- /dev/null
+++ b/src/gui/embedded/directfb.pri
@@ -0,0 +1,39 @@
+# These defines might be necessary if your DirectFB driver doesn't
+# support all of the DirectFB API.
+#
+#DEFINES += QT_NO_DIRECTFB_SUBSURFACE
+#DEFINES += QT_DIRECTFB_WINDOW_AS_CURSOR
+#DEFINES += QT_NO_DIRECTFB_IMAGEPROVIDER
+#DEFINES += QT_DIRECTFB_IMAGEPROVIDER_KEEPALIVE
+#DEFINES += QT_DIRECTFB_IMAGECACHE
+#DEFINES += QT_NO_DIRECTFB_WM
+#DEFINES += QT_NO_DIRECTFB_LAYER
+#DEFINES += QT_NO_DIRECTFB_PALETTE
+#DEFINES += QT_NO_DIRECTFB_PREALLOCATED
+#DEFINES += QT_NO_DIRECTFB_MOUSE
+#DEFINES += QT_NO_DIRECTFB_KEYBOARD
+#DEFINES += QT_DIRECTFB_TIMING
+#DEFINES += QT_NO_DIRECTFB_OPAQUE_DETECTION
+#DIRECTFB_DRAWINGOPERATIONS=DRAW_RECTS|DRAW_LINES|DRAW_IMAGE|DRAW_PIXMAP|DRAW_TILED_PIXMAP|STROKE_PATH|DRAW_PATH|DRAW_POINTS|DRAW_ELLIPSE|DRAW_POLYGON|DRAW_TEXT|FILL_PATH|FILL_RECT|DRAW_COLORSPANS
+#DEFINES += \"QT_DIRECTFB_WARN_ON_RASTERFALLBACKS=$$DIRECTFB_DRAWINGOPERATIONS\"
+#DEFINES += \"QT_DIRECTFB_DISABLE_RASTERFALLBACKS=$$DIRECTFB_DRAWINGOPERATIONS\"
+
+HEADERS += $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h
+
+SOURCES += $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp \
+           $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
+
+
+QMAKE_CXXFLAGS += $$QT_CFLAGS_DIRECTFB
+LIBS += $$QT_LIBS_DIRECTFB
diff --git a/src/gui/embedded/embedded.pri b/src/gui/embedded/embedded.pri
index 255a504..eb13d8d 100644
--- a/src/gui/embedded/embedded.pri
+++ b/src/gui/embedded/embedded.pri
@@ -139,6 +139,10 @@ embedded {
 		SOURCES += embedded/qscreentransformed_qws.cpp
 	}
 
+	contains( gfx-drivers, directfb ) {
+		INCLUDEPATH += $$QT_SOURCE_TREE/src/plugins/gfxdrivers/directfb
+                include($$PWD/directfb.pri)
+	}
 #
 # Keyboard drivers
 #
diff --git a/src/gui/embedded/qscreendriverfactory_qws.cpp b/src/gui/embedded/qscreendriverfactory_qws.cpp
index 21058af..99ee8f2 100644
--- a/src/gui/embedded/qscreendriverfactory_qws.cpp
+++ b/src/gui/embedded/qscreendriverfactory_qws.cpp
@@ -51,7 +51,9 @@
 #include <stdlib.h>
 #include "private/qfactoryloader_p.h"
 #include "qscreendriverplugin_qws.h"
-
+#ifndef QT_NO_QWS_DIRECTFB
+#include "qdirectfbscreen.h"
+#endif
 #ifndef QT_NO_QWS_VNC
 #include "qscreenvnc_qws.h"
 #endif
@@ -118,6 +120,10 @@ QScreen *QScreenDriverFactory::create(const QString& key, int displayId)
     if (driver == QLatin1String("linuxfb") || driver.isEmpty())
         return new QLinuxFbScreen(displayId);
 #endif
+#ifndef QT_NO_QWS_DIRECTFB
+    if (driver == QLatin1String("directfb") || driver.isEmpty())
+        return new QDirectFBScreen(displayId);
+#endif
 #ifndef QT_NO_QWS_TRANSFORMED
     if (driver == QLatin1String("transformed"))
         return new QTransformedScreen(displayId);
@@ -130,7 +136,6 @@ QScreen *QScreenDriverFactory::create(const QString& key, int displayId)
     if (driver == QLatin1String("multi"))
         return new QMultiScreen(displayId);
 #endif
-
 #if !defined(Q_OS_WIN32) || defined(QT_MAKEDLL)
 #ifndef QT_NO_LIBRARY
 
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index 8065526..871f009 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -525,23 +525,33 @@ bool QGraphicsAnchorLayoutPrivate::simplifyGraphIteration(QGraphicsAnchorLayoutP
                 endOfSequence = true;
             }
         }
-        if (endOfSequence && candidates.count() >= 2) {
+        if (endOfSequence && candidates.count() >= 1) {
             int i;
             AnchorVertex *afterSequence= 0;
-            QList<AnchorVertex *> adjacentOfSecondLastVertex = g.adjacentVertices(candidates.last());
-            Q_ASSERT(adjacentOfSecondLastVertex.count() == 2);
-            if (adjacentOfSecondLastVertex.first() == candidates.at(candidates.count() - 2))
-                afterSequence = adjacentOfSecondLastVertex.last();
-            else
-                afterSequence = adjacentOfSecondLastVertex.first();
-
             AnchorVertex *beforeSequence = 0;
-            QList<AnchorVertex *> adjacentOfSecondVertex = g.adjacentVertices(candidates.first());
-            Q_ASSERT(adjacentOfSecondVertex.count() == 2);
-            if (adjacentOfSecondVertex.first() == candidates.at(1))
-                beforeSequence = adjacentOfSecondVertex.last();
-            else
-                beforeSequence = adjacentOfSecondVertex.first();
+            // find the items before and after the valid sequence
+            if (candidates.count() == 1) {
+                QList<AnchorVertex *> beforeAndAfterVertices = g.adjacentVertices(candidates.at(0));
+                Q_ASSERT(beforeAndAfterVertices.count() == 2);
+                // Since we only have one vertex, we can pick
+                // any of the two vertices to become before/after.
+                afterSequence = beforeAndAfterVertices.last();
+                beforeSequence = beforeAndAfterVertices.first();
+            } else {
+                QList<AnchorVertex *> adjacentOfSecondLastVertex = g.adjacentVertices(candidates.last());
+                Q_ASSERT(adjacentOfSecondLastVertex.count() == 2);
+                if (adjacentOfSecondLastVertex.first() == candidates.at(candidates.count() - 2))
+                    afterSequence = adjacentOfSecondLastVertex.last();
+                else
+                    afterSequence = adjacentOfSecondLastVertex.first();
+
+                QList<AnchorVertex *> adjacentOfSecondVertex = g.adjacentVertices(candidates.first());
+                Q_ASSERT(adjacentOfSecondVertex.count() == 2);
+                if (adjacentOfSecondVertex.first() == candidates.at(1))
+                    beforeSequence = adjacentOfSecondVertex.last();
+                else
+                    beforeSequence = adjacentOfSecondVertex.first();
+            }
             // The complete path of the sequence to simplify is: beforeSequence, <candidates>, afterSequence
             // where beforeSequence and afterSequence are the endpoints where the anchor is inserted
             // between.
@@ -583,34 +593,37 @@ bool QGraphicsAnchorLayoutPrivate::simplifyGraphIteration(QGraphicsAnchorLayoutP
                         // start and the end of the sequence. We never want to simplify internal
                         // center anchors where there is an external anchor connected to the center.
                         AnchorVertex *intervalVertexFrom = intervalFrom == 0 ? beforeSequence : candidates.at(intervalFrom - 1);
+                        int effectiveIntervalFrom = intervalFrom;
                         if (intervalVertexFrom->m_edge == centerEdge
-                            && intervalVertexFrom->m_item == candidates.at(intervalFrom)->m_item) {
-                            ++intervalFrom;
-                            intervalVertexFrom = candidates.at(intervalFrom - 1);
+                            && intervalVertexFrom->m_item == candidates.at(effectiveIntervalFrom)->m_item) {
+                            ++effectiveIntervalFrom;
+                            intervalVertexFrom = candidates.at(effectiveIntervalFrom - 1);
                         }
                         AnchorVertex *intervalVertexTo = intervalTo <= candidates.count() ? candidates.at(intervalTo - 1) : afterSequence;
+                        int effectiveIntervalTo = intervalTo;
                         if (intervalVertexTo->m_edge == centerEdge
-                            && intervalVertexTo->m_item == candidates.at(intervalTo - 2)->m_item) {
-                            --intervalTo;
-                            intervalVertexTo = candidates.at(intervalTo - 1);
-                        }
-
-                        QVector<AnchorVertex*> subCandidates;
-                        if (forward) {
-                           subCandidates = candidates.mid(intervalFrom, intervalTo - intervalFrom - 1);
-                        } else {
-                            // reverse the order of the candidates.
-                            qSwap(intervalVertexFrom, intervalVertexTo);
-                            do {
-                                ++intervalFrom;
-                                subCandidates.prepend(candidates.at(intervalFrom - 1));
-                            } while (intervalFrom < intervalTo - 1);
+                            && intervalVertexTo->m_item == candidates.at(effectiveIntervalTo - 2)->m_item) {
+                            --effectiveIntervalTo;
+                            intervalVertexTo = candidates.at(effectiveIntervalTo - 1);
                         }
-                        if (simplifySequentialChunk(&g, intervalVertexFrom, subCandidates, intervalVertexTo)) {
-                            dirty = true;
-                            break;
+                        if (effectiveIntervalTo - effectiveIntervalFrom >= 2) {
+                            QVector<AnchorVertex*> subCandidates;
+                            if (forward) {
+                               subCandidates = candidates.mid(effectiveIntervalFrom, effectiveIntervalTo - effectiveIntervalFrom - 1);
+                            } else {
+                                // reverse the order of the candidates.
+                                qSwap(intervalVertexFrom, intervalVertexTo);
+                                do {
+                                    ++effectiveIntervalFrom;
+                                    subCandidates.prepend(candidates.at(effectiveIntervalFrom - 1));
+                                } while (effectiveIntervalFrom < effectiveIntervalTo - 1);
+                            }
+                            if (simplifySequentialChunk(&g, intervalVertexFrom, subCandidates, intervalVertexTo)) {
+                                dirty = true;
+                                break;
+                            }
+                            // finished simplification of chunk with same direction
                         }
-                        // finished simplification of chunk with same direction
                     }
                     if (forward == (prev == data->from))
                         --intervalTo;
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index b64f787..098407c 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -170,7 +170,7 @@ struct AnchorData : public QSimplexVariable {
           skipInPreferred(0), type(Normal), hasSize(false),
           isLayoutAnchor(false) {}
 
-    virtual void updateChildrenSizes() { };
+    virtual void updateChildrenSizes() {}
     virtual void refreshSizeHints(qreal effectiveSpacing);
 
     virtual ~AnchorData() {}
@@ -299,7 +299,7 @@ struct ParallelAnchorData : public AnchorData
 class GraphPath
 {
 public:
-    GraphPath() {};
+    GraphPath() {}
 
     QSimplexConstraint *constraint(const GraphPath &path) const;
 #ifdef QT_DEBUG
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 822c208..cdcb0c4 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -198,20 +198,19 @@
     \o hoverEnterEvent(), hoverMoveEvent(), and hoverLeaveEvent() handles
     hover enter, move and leave events
     \o inputMethodEvent() handles input events, for accessibility support
-    \o keyPressEvent() and keyReleaseEvent handle key press and release events
+    \o keyPressEvent() and keyReleaseEvent() handle key press and release events
     \o mousePressEvent(), mouseMoveEvent(), mouseReleaseEvent(), and
     mouseDoubleClickEvent() handles mouse press, move, release, click and
     doubleclick events
     \endlist
 
-    You can filter events for any other item by installing event
-    filters. This functionaly is separate from from Qt's regular
-    event filters (see QObject::installEventFilter()), which only
-    work on subclasses of QObject. After installing your item as an
-    event filter for another item by calling
-    installSceneEventFilter(), the filtered events will be received
-    by the virtual function sceneEventFilter(). You can remove item
-    event filters by calling removeSceneEventFilter().
+    You can filter events for any other item by installing event filters. This
+    functionality is separate from Qt's regular event filters (see
+    QObject::installEventFilter()), which only work on subclasses of QObject. After
+    installing your item as an event filter for another item by calling
+    installSceneEventFilter(), the filtered events will be received by the virtual
+    function sceneEventFilter(). You can remove item event filters by calling
+    removeSceneEventFilter().
 
     \section1 Custom Data
 
@@ -304,13 +303,17 @@
     drop shadow effects and for decoration objects that follow the parent
     item's geometry without drawing on top of it.
 
-    \value ItemUsesExtendedStyleOption The item makes use of either the
-    exposedRect or matrix member of the QStyleOptionGraphicsItem. Implementers
-    of QGraphicsItem subclasses should set that flag if this data is required.
-    By default, the exposedRect is initialized to the item's boundingRect and
-    the matrix is untransformed. Enable this flag for more fine-grained values.
-    Use QStyleOptionGraphicsItem::levelOfDetailFromTransform() for a more
-    fine-grained value.
+    \value ItemUsesExtendedStyleOption The item makes use of either
+    \l{QStyleOptionGraphicsItem::}{exposedRect} or
+    \l{QStyleOptionGraphicsItem::}{matrix} in QStyleOptionGraphicsItem. By default,
+    the \l{QStyleOptionGraphicsItem::}{exposedRect} is initialized to the item's
+    boundingRect() and the \l{QStyleOptionGraphicsItem::}{matrix} is untransformed.
+    You can enable this flag for the style options to be set up with more
+    fine-grained values.
+    Note that QStyleOptionGraphicsItem::levelOfDetail is unaffected by this flag
+    and always initialized to 1. Use
+    QStyleOptionGraphicsItem::levelOfDetailFromTransform() if you need a higher
+    value.
 
     \value ItemHasNoContents The item does not paint anything (i.e., calling
     paint() on the item has no effect). You should set this flag on items that
@@ -414,11 +417,11 @@
     (same as transform()), and QGraphicsItem ignores the return value for this
     notification (i.e., a read-only notification).
 
-    \value ItemSelectedChange The item's selected state changes. If the item
-    is presently selected, it will become unselected, and vice verca. The
-    value argument is the new selected state (i.e., true or false). Do not
-    call setSelected() in itemChange() as this notification is delivered();
-    instead, you can return the new selected state from itemChange().
+    \value ItemSelectedChange The item's selected state changes. If the item is
+    presently selected, it will become unselected, and vice verca. The value
+    argument is the new selected state (i.e., true or false). Do not call
+    setSelected() in itemChange() as this notification is delivered; instead, you
+    can return the new selected state from itemChange().
 
     \value ItemSelectedHasChanged The item's selected state has changed. The
     value argument is the new selected state (i.e., true or false). Do not
@@ -10358,10 +10361,14 @@ QPixmap QGraphicsItemEffectSourcePrivate::pixmap(Qt::CoordinateSystem system, QP
             effectRect.setY(0);
         }
         // NB! We use +-1 for historical reasons (see QRect documentation).
-        if (right + 1 > info->widget->width())
-            effectRect.setRight(info->widget->width() - 1);
-        if (bottom + 1 > info->widget->height())
-            effectRect.setBottom(info->widget->height() -1);
+        QPaintDevice *device = info->painter->device();
+        const int deviceWidth = device->width();
+        const int deviceHeight = device->height();
+        if (right + 1 > deviceWidth)
+            effectRect.setRight(deviceWidth - 1);
+        if (bottom + 1 > deviceHeight)
+            effectRect.setBottom(deviceHeight -1);
+        
     }
 
     if (effectRect.isEmpty())
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 49361cf..1bf8993 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -517,17 +517,20 @@ struct QGraphicsItemPrivate::TransformData
             return transform * *postmultiplyTransform;
         }
 
-        QMatrix4x4 x(transform);
-        for (int i = 0; i < graphicsTransforms.size(); ++i)
-            graphicsTransforms.at(i)->applyTo(&x);
+        QTransform x(transform);
+        if (!graphicsTransforms.isEmpty()) {
+            QMatrix4x4 m;
+            for (int i = 0; i < graphicsTransforms.size(); ++i)
+                graphicsTransforms.at(i)->applyTo(&m);
+            x *= m.toTransform();
+        }
         x.translate(xOrigin, yOrigin);
-        x.rotate(rotation, 0, 0, 1);
-        x.scale(scale);
+        x.rotate(rotation);
+        x.scale(scale, scale);
         x.translate(-xOrigin, -yOrigin);
-        QTransform t = x.toTransform(); // project the 3D matrix back to 2D.
         if (postmultiplyTransform)
-            t *= *postmultiplyTransform;
-        return t;
+            x *= *postmultiplyTransform;
+        return x;
     }
 };
 
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 2ac1dca..5dd71e2 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -4616,7 +4616,8 @@ void QGraphicsScenePrivate::markDirty(QGraphicsItem *item, const QRectF &rect, b
         return;
     }
 
-    bool hasNoContents = item->d_ptr->flags & QGraphicsItem::ItemHasNoContents;
+    bool hasNoContents = item->d_ptr->flags & QGraphicsItem::ItemHasNoContents
+                         && !item->d_ptr->graphicsEffect;
     if (!hasNoContents) {
         item->d_ptr->dirty = 1;
         if (fullItemUpdate)
@@ -4706,11 +4707,15 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
         return;
     }
 
-    const bool itemHasContents = !(item->d_ptr->flags & QGraphicsItem::ItemHasNoContents);
+    bool itemHasContents = !(item->d_ptr->flags & QGraphicsItem::ItemHasNoContents);
     const bool itemHasChildren = !item->d_ptr->children.isEmpty();
-    if (!itemHasContents && !itemHasChildren) {
-        resetDirtyItem(item);
-        return; // Item has neither contents nor children!(?)
+    if (!itemHasContents) {
+        if (!itemHasChildren) {
+            resetDirtyItem(item);
+            return; // Item has neither contents nor children!(?)
+        }
+        if (item->d_ptr->graphicsEffect)
+            itemHasContents = true;
     }
 
     const qreal opacity = item->d_ptr->combineOpacityFromParent(parentOpacity);
diff --git a/src/gui/graphicsview/qsimplex_p.h b/src/gui/graphicsview/qsimplex_p.h
index 9ee3863..eac74ac 100644
--- a/src/gui/graphicsview/qsimplex_p.h
+++ b/src/gui/graphicsview/qsimplex_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 struct QSimplexVariable
 {
-    QSimplexVariable() : result(0), index(0) {};
+    QSimplexVariable() : result(0), index(0) {}
 
     qreal result;
     uint index;
@@ -80,7 +80,7 @@ struct QSimplexVariable
 */
 struct QSimplexConstraint
 {
-    QSimplexConstraint() : constant(0), ratio(Equal), artificial(0) {};
+    QSimplexConstraint() : constant(0), ratio(Equal), artificial(0) {}
 
     enum Ratio {
         LessOrEqual = 0,
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index eb3a33f..7c24002 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -17,7 +17,10 @@ x11:include(kernel/x11.pri)
 mac:include(kernel/mac.pri)
 win32:include(kernel/win.pri)
 embedded:include(embedded/embedded.pri)
-symbian:include(kernel/symbian.pri)
+symbian {
+    include(kernel/symbian.pri)
+    include(s60framework/s60framework.pri)
+}
 
 #modules
 include(animation/animation.pri)
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index 8c3b9be..b5ffeed 100644
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -92,13 +92,15 @@ QT_BEGIN_NAMESPACE
     \sa  QPixmap, QImage, QImageReader, QImageWriter
 */
 
+/*! \typedef QBitmap::DataPtr
+  \internal
+ */
 
 /*!
     Constructs a null bitmap.
 
     \sa QPixmap::isNull()
 */
-
 QBitmap::QBitmap()
     : QPixmap(QSize(0, 0), QPixmapData::BitmapType)
 {
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index e23677f..1140cd8 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -879,20 +879,20 @@ void QIcon::setThemeSearchPaths(const QStringList &paths)
 }
 
 /*!
-    \since 4.6
+  \since 4.6
 
-    Returns the search paths for icon themes.
+  Returns the search paths for icon themes.
 
-    The default value will depend on the platform:
+  The default value will depend on the platform:
 
-    On X11, the search path will use the XDG_DATA_DIRS environment
-    variable if available.
+  On X11, the search path will use the XDG_DATA_DIRS environment
+  variable if available.
 
-    By default all platforms will have the resource directory
-    ":\icons" as their fallback. You can use "rcc -project"
-    to generate a resource file from your icon theme.
+  By default all platforms will have the resource directory
+  \c{:\icons} as a fallback. You can use "rcc -project" to generate a
+  resource file from your icon theme.
 
-    \sa setThemeSearchPaths(), fromTheme(), setThemeName()
+  \sa setThemeSearchPaths(), fromTheme(), setThemeName()
 */
 QStringList QIcon::themeSearchPaths()
 {
diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h
index ba05a54..8c1cd4e 100644
--- a/src/gui/image/qiconloader_p.h
+++ b/src/gui/image/qiconloader_p.h
@@ -139,7 +139,7 @@ class QIconTheme
 {
 public:
     QIconTheme(const QString &name);
-    QIconTheme() : m_valid(false) {};
+    QIconTheme() : m_valid(false) {}
     QStringList parents() { return m_parents; }
     QList <QIconDirInfo> keyList() { return m_keyList; }
     QString contentDir() { return m_contentDir; }
diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp
index 2422355..ed30810 100644
--- a/src/gui/inputmethod/qinputcontext.cpp
+++ b/src/gui/inputmethod/qinputcontext.cpp
@@ -176,7 +176,7 @@ QWidget *QInputContext::focusWidget() const
 
 
 /*!
-    Sets the widget that has an input focus for this input context.
+    Sets the \a widget that has an input focus for this input context.
 
     \warning Ordinary input methods must not call this function
     directly.
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 07c5454..ea98cb2 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -956,6 +956,7 @@ QModelIndex QAbstractItemView::currentIndex() const
 void QAbstractItemView::reset()
 {
     Q_D(QAbstractItemView);
+    d->delayedReset.stop(); //make sure we stop the timer
     QList<QEditorInfo>::const_iterator it = d->editors.constBegin();
     for (; it != d->editors.constEnd(); ++it)
         d->releaseEditor(it->editor);
@@ -2208,7 +2209,9 @@ void QAbstractItemView::timerEvent(QTimerEvent *event)
     Q_D(QAbstractItemView);
     if (event->timerId() == d->fetchMoreTimer.timerId())
         d->fetchMore();
-    if (event->timerId() == d->autoScrollTimer.timerId())
+    else if (event->timerId() == d->delayedReset.timerId())
+        reset();
+    else if (event->timerId() == d->autoScrollTimer.timerId())
         doAutoScroll();
     else if (event->timerId() == d->updateTimer.timerId())
         d->updateDirtyRegion();
@@ -3132,9 +3135,8 @@ void QAbstractItemViewPrivate::_q_columnsInserted(const QModelIndex &, int, int)
 */
 void QAbstractItemViewPrivate::_q_modelDestroyed()
 {
-    Q_Q(QAbstractItemView);
     model = QAbstractItemModelPrivate::staticEmptyModel();
-    QMetaObject::invokeMethod(q, "reset", Qt::QueuedConnection);
+    doDelayedReset();
 }
 
 /*!
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h
index 4517941..434d644 100644
--- a/src/gui/itemviews/qabstractitemview_p.h
+++ b/src/gui/itemviews/qabstractitemview_p.h
@@ -328,6 +328,15 @@ public:
 
     QStyleOptionViewItemV4 viewOptionsV4() const;
 
+    void doDelayedReset()
+    {
+        //we delay the reset of the timer because some views (QTableView)
+        //with headers can't handle the fact that the model has been destroyed
+        //all _q_modelDestroyed slots must have been called
+        if (!delayedReset.isActive())
+            delayedReset.start(0, q_func());
+    }
+
     QAbstractItemModel *model;
     QPointer<QAbstractItemDelegate> itemDelegate;
     QMap<int, QPointer<QAbstractItemDelegate> > rowDelegates;
@@ -389,6 +398,7 @@ public:
     QBasicTimer updateTimer;
     QBasicTimer delayedEditing;
     QBasicTimer delayedAutoScroll; //used when an item is clicked
+    QBasicTimer delayedReset;
 
     QAbstractItemView::ScrollMode verticalScrollMode;
     QAbstractItemView::ScrollMode horizontalScrollMode;
diff --git a/src/gui/itemviews/qcolumnview_p.h b/src/gui/itemviews/qcolumnview_p.h
index 97def07..ca1d334 100644
--- a/src/gui/itemviews/qcolumnview_p.h
+++ b/src/gui/itemviews/qcolumnview_p.h
@@ -174,8 +174,8 @@ class QColumnViewDelegate : public QItemDelegate
 {
 
 public:
-    explicit QColumnViewDelegate(QObject *parent = 0) : QItemDelegate(parent) {};
-    ~QColumnViewDelegate() {};
+    explicit QColumnViewDelegate(QObject *parent = 0) : QItemDelegate(parent) {}
+    ~QColumnViewDelegate() {}
 
     void paint(QPainter *painter,
                const QStyleOptionViewItem &option,
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index 7d6439f..6a7b27c 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -622,6 +622,10 @@ void QTreeModel::ensureSorted(int column, Qt::SortOrder order,
         QTreeWidgetItem *item = lst.takeAt(oldRow);
         lit = sortedInsertionIterator(lit, lst.end(), order, item);
         int newRow = qMax(lit - lst.begin(), 0);
+
+        if ((newRow < oldRow) && !(*item < *lst.at(oldRow - 1)))
+            newRow = oldRow;
+
         lit = lst.insert(lit, item);
         if (newRow != oldRow) {
             // we are going to change the persistent indexes, so we need to prepare
@@ -2074,7 +2078,7 @@ void QTreeWidgetItemPrivate::sortChildren(int column, Qt::SortOrder order, bool
 {
     QTreeModel *model = (q->view ? qobject_cast<QTreeModel*>(q->view->model()) : 0);
     if (!model)
-        return;   
+        return;
     model->sortItems(&q->children, column, order);
     if (climb) {
         QList<QTreeWidgetItem*>::iterator it = q->children.begin();
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp
index d2a25fd..2a28c71 100644
--- a/src/gui/kernel/qaction.cpp
+++ b/src/gui/kernel/qaction.cpp
@@ -269,6 +269,26 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
     MenuRole for the actions in that submenu have no effect. They will never be moved.
 */
 
+/*! \enum QAction::SoftKeyRole
+  \value OptionsSoftKey
+  \value SelectSoftKey
+  \value BackSoftKey
+  \value NextSoftKey
+  \value PreviousSoftKey
+  \value OkSoftKey
+  \value CancelSoftKey
+  \value EditSoftKey
+  \value ViewSoftKey
+  \value BackSpaceSoftKey
+  \value EndEditSoftKey
+  \value RevertEditSoftKey
+  \value DeselectSoftKey
+  \value FinishSoftKey
+  \value MenuSoftKey
+  \value ContextMenuSoftKey
+  \value ExitSoftKey
+ */
+
 /*!
     Constructs an action with \a parent. If \a parent is an action
     group the action will be automatically inserted into the group.
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index f049a58..511c797 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -3625,6 +3625,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
     case QEvent::MouseButtonRelease:
     case QEvent::MouseButtonDblClick:
         d->toolTipFallAsleep.stop();
+        // fall-through
     case QEvent::Leave:
         d->toolTipWakeUp.stop();
     default:
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 92cf0f8..f1e3cb0 100644
--- a/src/gui/kernel/qapplication.h
+++ b/src/gui/kernel/qapplication.h
@@ -327,7 +327,7 @@ public:
     { if (replace) changeOverrideCursor(cursor); else setOverrideCursor(cursor); }
 #  endif
     inline static QT3_SUPPORT bool hasGlobalMouseTracking() {return true;}
-    inline static QT3_SUPPORT void setGlobalMouseTracking(bool) {};
+    inline static QT3_SUPPORT void setGlobalMouseTracking(bool) {}
     inline static QT3_SUPPORT void flushX() { flush(); }
     static inline QT3_SUPPORT void setWinStyleHighlightColor(const QColor &c) {
         QPalette p(palette());
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 1bbf332..220b222 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -63,10 +63,13 @@
 #include "apgwgnam.h" // For CApaWindowGroupName
 #include <MdaAudioTonePlayer.h>     // For CMdaAudioToneUtility
 
-#if !defined(QT_NO_IM) && defined(Q_WS_S60)
-#include "qinputcontext.h"
-#include <private/qcoefepinputcontext_p.h>
-#endif // !defined(QT_NO_IM) && defined(Q_WS_S60)
+#if defined(Q_WS_S60)
+# if !defined(QT_NO_IM)
+#  include "qinputcontext.h"
+#  include <private/qcoefepinputcontext_p.h>
+# endif
+# include <private/qs60mainapplication_p.h>
+#endif
 
 #include "private/qstylesheetstyle_p.h"
 
@@ -347,21 +350,21 @@ void QSymbianControl::HandleLongTapEventL( const TPoint& aPenEventLocation, cons
     QApplicationPrivate::mouse_buttons = QApplicationPrivate::mouse_buttons | Qt::RightButton;
     QMouseEvent mEvent(QEvent::MouseButtonPress, alienWidget->mapFrom(qwidget, widgetPos), globalPos,
         Qt::RightButton, QApplicationPrivate::mouse_buttons, Qt::NoModifier);
-    
+
     bool res = sendMouseEvent(alienWidget, &mEvent);
 
 #if !defined(QT_NO_CONTEXTMENU)
     QContextMenuEvent contextMenuEvent(QContextMenuEvent::Mouse, widgetPos, globalPos, mEvent.modifiers());
     qt_sendSpontaneousEvent(alienWidget, &contextMenuEvent);
-#endif     
-    
+#endif
+
     m_previousEventLongTap = true;
 }
 
 void QSymbianControl::HandlePointerEventL(const TPointerEvent& pEvent)
 {
     m_longTapDetector->PointerEventL(pEvent);
-    QT_TRYCATCH_LEAVING(HandlePointerEvent(pEvent));  
+    QT_TRYCATCH_LEAVING(HandlePointerEvent(pEvent));
 }
 
 void QSymbianControl::HandlePointerEvent(const TPointerEvent& pEvent)
@@ -396,15 +399,6 @@ void QSymbianControl::HandlePointerEvent(const TPointerEvent& pEvent)
         if (!alienWidget)
             alienWidget = qwidget;
         S60->mousePressTarget = alienWidget;
-        //pointer grab
-        SetGloballyCapturing(ETrue);
-        SetPointerCapture(ETrue);
-    }
-    else if (type == QEvent::MouseButtonRelease)
-    {
-        //release pointer grab
-        SetGloballyCapturing(EFalse);
-        SetPointerCapture(EFalse);
     }
     alienWidget = S60->mousePressTarget;
 
@@ -724,6 +718,22 @@ TTypeUid::Ptr QSymbianControl::MopSupplyObject(TTypeUid id)
 
 void qt_init(QApplicationPrivate * /* priv */, int)
 {
+    if (!CCoeEnv::Static()) {
+        // The S60 framework has not been initalized. We need to do it.
+        TApaApplicationFactory factory(NewApplication);
+        CApaCommandLine* commandLine = 0;
+        TInt err = CApaCommandLine::GetCommandLineFromProcessEnvironment(commandLine);
+        // After this construction, CEikonEnv will be available from CEikonEnv::Static().
+        // (much like our qApp).
+        CEikonEnv* coe = new CEikonEnv;
+        QT_TRAP_THROWING(coe->ConstructAppFromCommandLineL(factory,*commandLine));
+        delete commandLine;
+
+        S60->qtOwnsS60Environment = true;
+    } else {
+        S60->qtOwnsS60Environment = false;
+    }
+
 #ifdef QT_NO_DEBUG
     if (!qgetenv("QT_S60_AUTO_FLUSH_WSERV").isEmpty())
 #endif
@@ -775,6 +785,13 @@ void qt_cleanup()
     // it dies.
     delete QApplicationPrivate::inputContext;
     QApplicationPrivate::inputContext = 0;
+
+    if (S60->qtOwnsS60Environment) {
+        CEikonEnv* coe = CEikonEnv::Static();
+        coe->PrepareToExit();
+        // The CEikonEnv itself is destroyed in here.
+        coe->DestroyEnvironment();
+    }
 }
 
 void QApplicationPrivate::initializeWidgetPaletteHash()
@@ -801,14 +818,27 @@ bool QApplicationPrivate::modalState()
 
 void QApplicationPrivate::enterModal_sys(QWidget *widget)
 {
+    if (widget) {
+        widget->effectiveWinId()->DrawableWindow()->FadeBehind(ETrue);
+        // Modal partial screen dialogs (like queries) capture pointer events.
+        // ### FixMe: Add specialized behaviour for fullscreen modal dialogs
+        widget->effectiveWinId()->SetGloballyCapturing(ETrue);
+        widget->effectiveWinId()->SetPointerCapture(ETrue);
+    }
     if (!qt_modal_stack)
         qt_modal_stack = new QWidgetList;
     qt_modal_stack->insert(0, widget);
-    app_do_modal = true;    
+    app_do_modal = true;
 }
 
 void QApplicationPrivate::leaveModal_sys(QWidget *widget)
 {
+    if (widget) {
+        widget->effectiveWinId()->DrawableWindow()->FadeBehind(EFalse);
+        // ### FixMe: Add specialized behaviour for fullscreen modal dialogs
+        widget->effectiveWinId()->SetGloballyCapturing(EFalse);
+        widget->effectiveWinId()->SetPointerCapture(EFalse);
+    }
     if (qt_modal_stack && qt_modal_stack->removeAll(widget)) {
         if (qt_modal_stack->isEmpty()) {
             delete qt_modal_stack;
@@ -824,18 +854,31 @@ void QApplicationPrivate::openPopup(QWidget *popup)
         QApplicationPrivate::popupWidgets = new QWidgetList;
     QApplicationPrivate::popupWidgets->append(popup);
 
-    if (QApplicationPrivate::popupWidgets->count() == 1 && !qt_nograb()) {
+
+    // Cancel focus widget pointer capture and long tap timer
+    if (QApplication::focusWidget()) {
+        static_cast<QSymbianControl*>(QApplication::focusWidget()->effectiveWinId())->CancelLongTapTimer();
+        QApplication::focusWidget()->effectiveWinId()->SetPointerCapture(false);
+        }
+
+    if (!qt_nograb()) {
+        // Cancel pointer capture and long tap timer for earlier popup
+        int popupCount = QApplicationPrivate::popupWidgets->count();
+        if (popupCount > 1) {
+            QWidget* prevPopup = QApplicationPrivate::popupWidgets->at(popupCount-2);
+            static_cast<QSymbianControl*>(prevPopup->effectiveWinId())->CancelLongTapTimer();
+            prevPopup->effectiveWinId()->SetPointerCapture(false);
+        }
+
+        // Enable pointer capture for this (topmost) popup
         Q_ASSERT(popup->testAttribute(Qt::WA_WState_Created));
         WId id = popup->effectiveWinId();
         id->SetPointerCapture(true);
-        id->SetGloballyCapturing(true);
     }
 
     // popups are not focus-handled by the window system (the first
     // popup grabbed the keyboard), so we have to do that manually: A
     // new popup gets the focus
-    if (QApplication::focusWidget())
-        static_cast<QSymbianControl*>(QApplication::focusWidget()->effectiveWinId())->CancelLongTapTimer();
     QWidget *fw = popup->focusWidget();
     if (fw) {
         fw->setFocus(Qt::PopupFocusReason);
@@ -854,14 +897,16 @@ void QApplicationPrivate::closePopup(QWidget *popup)
         return;
     QApplicationPrivate::popupWidgets->removeAll(popup);
 
+    // Cancel pointer capture and long tap for this popup
+    WId id = popup->effectiveWinId();
+    id->SetPointerCapture(false);
+    static_cast<QSymbianControl*>(id)->CancelLongTapTimer();
+
     if (QApplicationPrivate::popupWidgets->isEmpty()) { // this was the last popup
         delete QApplicationPrivate::popupWidgets;
         QApplicationPrivate::popupWidgets = 0;
         if (!qt_nograb()) {                        // grabbing not disabled
             Q_ASSERT(popup->testAttribute(Qt::WA_WState_Created));
-            WId id = popup->effectiveWinId();
-            id->SetPointerCapture(false);
-            id->SetGloballyCapturing(false);
             if (QWidgetPrivate::mouseGrabber != 0)
                 QWidgetPrivate::mouseGrabber->grabMouse();
 
@@ -880,6 +925,7 @@ void QApplicationPrivate::closePopup(QWidget *popup)
           }
         }
     } else {
+
         // popups are not focus-handled by the window system (the
         // first popup grabbed the keyboard), so we have to do that
         // manually: A popup was closed, so the previous popup gets
@@ -889,6 +935,11 @@ void QApplicationPrivate::closePopup(QWidget *popup)
             QFocusEvent e(QEvent::FocusOut, Qt::PopupFocusReason);
             q_func()->sendEvent(fw, &e);
         }
+
+        // Enable pointer capture for previous popup
+        if (aw) {
+            aw->effectiveWinId()->SetPointerCapture(true);
+        }
     }
 }
 
@@ -972,11 +1023,14 @@ void QApplication::beep()
     beep=NULL;
 }
 
-/*! \fn int QApplication::s60ProcessEvent(TWsEvent *event)
-    This function does the core processing of individual s60
-    \a{event}s. It returns 1 if the event was handled, 0 if
+/*!
+    \warning This function is only available on Symbian.
+
+    This function processes an individual Symbian window server
+    \a event. It returns 1 if the event was handled, 0 if
     the \a event was not handled, and -1 if the event was
-    not handled because the event handle was not in the map.
+    not handled because the event handle (\c{TWsEvent::Handle()})
+    is not known to Qt.
  */
 int QApplication::s60ProcessEvent(TWsEvent *event)
 {
@@ -1065,7 +1119,16 @@ int QApplication::s60ProcessEvent(TWsEvent *event)
 }
 
 /*!
-  Returns false. Does nothing with the TWsEvent \a aEvent.
+  \warning This virtual function is only available on Symbian.
+
+  If you create an application that inherits QApplication and reimplement
+  this function, you get direct access to events that the are received
+  from the Symbian window server. The events are passed in the TWsEvent
+  \a aEvent parameter.
+
+  Return true if you want to stop the event from being processed. Return
+  false for normal event dispatching. The default implementation
+  false, and does nothing with \a aEvent.
  */
 bool QApplication::s60EventFilter(TWsEvent * /* aEvent */)
 {
@@ -1073,9 +1136,11 @@ bool QApplication::s60EventFilter(TWsEvent * /* aEvent */)
 }
 
 /*!
+  \warning This function is only available on Symbian.
+
   Handles \a{command}s which are typically handled by
   CAknAppUi::HandleCommandL(). Qts Ui integration into Symbian is
-  partially achieved by deriving from CAknAppUi.  Currently, exit,
+  partially achieved by deriving from CAknAppUi. Currently, exit,
   menu and softkey commands are handled.
 
   \sa s60EventFilter(), s60ProcessEvent()
@@ -1107,7 +1172,12 @@ void QApplication::symbianHandleCommand(int command)
 }
 
 /*!
+  \warning This function is only available on Symbian.
+
   Handles the resource change specified by \a type.
+
+  Currently, KEikDynamicLayoutVariantSwitch and
+  KAknsMessageSkinChange are handled.
  */
 void QApplication::symbianResourceChange(int type)
 {
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index a3de120..729b791 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -1903,11 +1903,9 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
                     QHideEvent e;
                     qt_sendSpontaneousEvent(widget, &e);
                     widget->hideChildren(true);
-#ifndef Q_WS_WINCE
                     const QString title = widget->windowIconText();
                     if (!title.isEmpty())
                         widget->setWindowTitle_helper(title);
-#endif
                 }
                 result = false;
                 break;
@@ -1926,11 +1924,9 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
                     widget->showChildren(true);
                     QShowEvent e;
                     qt_sendSpontaneousEvent(widget, &e);
-#ifndef Q_WS_WINCE
                     const QString title = widget->windowTitle();
                     if (!title.isEmpty())
                         widget->setWindowTitle_helper(title);
-#endif
                 }
                 result = false;
                 break;
@@ -1943,7 +1939,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
                 QWindowStateChangeEvent e(oldstate);
                 qt_sendSpontaneousEvent(widget, &e);
             }
-#endif
+#endif // #ifndef Q_OS_WINCE
 
             break;
         }
@@ -2030,13 +2026,15 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
                 // WM_ACTIVATEAPP handles the "true" false case, as this is only when the application
                 // loses focus. Doing it here would result in the widget getting focus to not know
                 // where it got it from; it would simply get a 0 value as the old focus widget.
-#ifndef Q_WS_WINCE_WM
-                if (!(widget->windowState() & Qt::WindowMinimized)) {
-                    // Ignore the activate message send by WindowsXP to a minimized window
-#else
+#ifdef Q_WS_WINCE
                 {
                     if (widget->windowState() & Qt::WindowMinimized)
                         widget->dataPtr()->window_state &= ~Qt::WindowMinimized;
+#else
+                if (!(widget->windowState() & Qt::WindowMinimized)) {
+#endif
+                    // Ignore the activate message send by WindowsXP to a minimized window
+#ifdef Q_WS_WINCE_WM
                     if  (widget->windowState() & Qt::WindowFullScreen)
                         qt_wince_hide_taskbar(widget->winId());
 #endif
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 0056b9e..a7a6504 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -79,6 +79,7 @@
 #include <private/qcolor_p.h>
 #include <private/qcursor_p.h>
 #include <private/qiconloader_p.h>
+#include <private/gtksymbols_p.h>
 #include "qstyle.h"
 #include "qmetaobject.h"
 #include "qtimer.h"
@@ -2287,6 +2288,12 @@ void qt_init(QApplicationPrivate *priv, int,
         if (X11->desktopEnvironment == DE_KDE)
             X11->desktopVersion = QString::fromLocal8Bit(qgetenv("KDE_SESSION_VERSION")).toInt();
 
+#if !defined(QT_NO_STYLE_GTK)
+        if (X11->desktopEnvironment == DE_GNOME) {
+            static bool menusHaveIcons = QGtk::getGConfBool(QLatin1String("/desktop/gnome/interface/menus_have_icons"), true);
+            QApplication::setAttribute(Qt::AA_DontShowIconsInMenus, !menusHaveIcons);
+        }
+#endif
         qt_set_input_encoding();
 
         qt_set_x11_resources(appFont, appFGCol, appBGCol, appBTNCol);
diff --git a/src/gui/kernel/qcocoaapplication_mac.mm b/src/gui/kernel/qcocoaapplication_mac.mm
index ed62d02..2f1d88d 100644
--- a/src/gui/kernel/qcocoaapplication_mac.mm
+++ b/src/gui/kernel/qcocoaapplication_mac.mm
@@ -37,9 +37,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 ****************************************************************************/
 
 /****************************************************************************
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index cbf5cb6..b6aa454 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -37,9 +37,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 ****************************************************************************/
 
 /****************************************************************************
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm
index 1bdb123..14e4510 100644
--- a/src/gui/kernel/qcocoamenuloader_mac.mm
+++ b/src/gui/kernel/qcocoamenuloader_mac.mm
@@ -37,9 +37,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 ****************************************************************************/
 
 #include "qmacdefines_mac.h"
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index bc32078..59494a7 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -201,7 +201,6 @@ extern "C" {
     composingText = new QString();
     composing = false;
     sendKeyEvents = true;
-    inKeyDown = false;
     currentCustomTypes = 0;
     [self setHidden:YES];
     return self;
@@ -1037,7 +1036,6 @@ extern "C" {
 
 - (void)keyDown:(NSEvent *)theEvent
 {
-    inKeyDown = true;
     sendKeyEvents = true;
 
     QWidget *widgetToGetKey = qwidget;
@@ -1057,7 +1055,6 @@ extern "C" {
         if (!keyOK && !sendToPopup)
             [super keyDown:theEvent];
     }
-    inKeyDown = false;
 }
 
 
@@ -1104,13 +1101,7 @@ extern "C" {
         };
     }
 
-    if ([aString length] && !inKeyDown) {
-        // Handle the case where insertText is called from somewhere else than the keyDown
-        // implementation, for example when inserting text from the character palette.
-        QInputMethodEvent e;
-        e.setCommitString(commitText);
-        qt_sendSpontaneousEvent(qwidget, &e);
-    } else if ([aString length] && composing) {
+    if ([aString length] && composing) {
         // Send the commit string to the widget.
         composing = false;
         sendKeyEvents = false;
diff --git a/src/gui/kernel/qcocoaview_mac_p.h b/src/gui/kernel/qcocoaview_mac_p.h
index 9d4e3d0..3810a2b 100644
--- a/src/gui/kernel/qcocoaview_mac_p.h
+++ b/src/gui/kernel/qcocoaview_mac_p.h
@@ -86,7 +86,6 @@ Q_GUI_EXPORT
     bool composing;
     int composingLength;
     bool sendKeyEvents;
-    bool inKeyDown;
     QString *composingText;
     QStringList *currentCustomTypes;
     NSInteger dragEnterSequence;
diff --git a/src/gui/kernel/qcocoawindow_mac.mm b/src/gui/kernel/qcocoawindow_mac.mm
index 59e8254..57dca6d 100644
--- a/src/gui/kernel/qcocoawindow_mac.mm
+++ b/src/gui/kernel/qcocoawindow_mac.mm
@@ -37,9 +37,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 ****************************************************************************/
 
 #include "qmacdefines_mac.h"
diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/kernel/qcocoawindowdelegate_mac.mm
index 0a7a00f..6704fda 100644
--- a/src/gui/kernel/qcocoawindowdelegate_mac.mm
+++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm
@@ -37,9 +37,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 ****************************************************************************/
 
 #import "private/qcocoawindowdelegate_mac_p.h"
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index a61b6fa..0b282bc 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -3648,13 +3648,13 @@ QMenubarUpdatedEvent::QMenubarUpdatedEvent(QMenuBar * const menuBar)
     \i As mentioned above, enabling touch events means multiple widgets can be receiving touch
     events simultaneously. Combined with the default QWidget::event() handling for QTouchEvents,
     this gives you great flexibility in designing multi-touch user interfaces. Be aware of the
-    implications. For example, is is possible that the user is moving a QSlider with one finger and
+    implications. For example, it is possible that the user is moving a QSlider with one finger and
     pressing a QPushButton with another. The signals emitted by these widgets will be
     interleaved.
 
     \i Recursion into the event loop using one of the exec() methods (e.g., QDialog::exec() or
     QMenu::exec()) in a QTouchEvent event handler is not supported. Since there are multiple event
-    recipients, unexpected recursion may cause problems, including but not limited to lost events
+    recipients, recursion may cause problems, including but not limited to lost events
     and unexpected infinite recursion.
 
     \i QTouchEvents are not affected by a \l{QWidget::grabMouse()}{mouse grab} or an
diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp
index d5e7167..7831893 100644
--- a/src/gui/kernel/qgesture.cpp
+++ b/src/gui/kernel/qgesture.cpp
@@ -133,21 +133,22 @@ private:
 
 /*! \fn void QGesture::cancelled()
 
-    The signal is emitted when the gesture is cancelled, for example the reset()
-    function is called while the gesture was in the process of emitting a
-    triggered() signal.  Extended information about the gesture is contained in
-    the sender object.
+  The signal is emitted when the gesture is cancelled, for example the
+  reset() function is called while the gesture was in the process of
+  emitting a triggered() signal.  Extended information about the
+  gesture is contained in the sender object.
 */
 
-
 /*!
-    Creates a new gesture handler object and marks it as a child of \a parent.
+  Creates a new gesture handler object and marks it as a child of \a
+  parent.  \a gestureTarget is the object that the gesture will watch
+  for events.
 
-    The \a parent object is also the default event source for the gesture,
-    meaning that the gesture installs itself as an event filter for the \a
-    parent.
+  The \a parent object is also the default event source for the
+  gesture, meaning that the gesture installs itself as an event filter
+  for the \a parent.
 
-    \sa setGraphicsItem()
+  \sa setGraphicsItem()
 */
 QGesture::QGesture(QObject *gestureTarget, QObject *parent)
     : QObject(*new QGesturePrivate, parent)
@@ -173,7 +174,7 @@ QGesture::~QGesture()
 /*!
     \property QGesture::gestureTarget
 
-    Gesture target is the object that the gesture will observe for events.
+    Gesture target is the object that the gesture will watch for events.
     Typically this means that the gesture installs an event filter on the
     target object.
 */
@@ -240,15 +241,18 @@ void QGesture::updateState(Qt::GestureState state)
         return;
     }
     const Qt::GestureState oldState = d->state;
-    d->state = state;
     if (state != Qt::NoGesture && oldState > state) {
         // comparing the state as ints: state should only be changed from
         // started to (optionally) updated and to finished.
+        d->state = state;
         qWarning("QGesture::updateState: incorrect new state");
         return;
     }
-    if (oldState == Qt::NoGesture)
+    if (oldState == Qt::NoGesture) {
+        d->state = Qt::GestureStarted;
         emit started();
+    }
+    d->state = state;
     if (state == Qt::GestureUpdated)
         emit triggered();
     else if (state == Qt::GestureFinished)
diff --git a/src/gui/kernel/qgesture_p.h b/src/gui/kernel/qgesture_p.h
index 2cfabef..ddca79e 100644
--- a/src/gui/kernel/qgesture_p.h
+++ b/src/gui/kernel/qgesture_p.h
@@ -70,7 +70,7 @@ class QGesturePrivate : public QObjectPrivate
 public:
     QGesturePrivate()
         : gestureTarget(0), graphicsItem(0), eventFilterProxyGraphicsItem(0),
-          state(Qt::NoGesture)
+          state(Qt::NoGesture), implicitGesture(false)
     {
     }
 
@@ -81,6 +81,9 @@ public:
     QGraphicsItem *eventFilterProxyGraphicsItem;
 
     Qt::GestureState state;
+
+    // the flag specifies if the gesture was created implicitely by Qt.
+    bool implicitGesture;
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/gui/kernel/qstandardgestures.cpp
index cc30049..8e76715 100644
--- a/src/gui/kernel/qstandardgestures.cpp
+++ b/src/gui/kernel/qstandardgestures.cpp
@@ -47,6 +47,7 @@
 #include <private/qapplication_p.h>
 #include <private/qevent_p.h>
 #include <private/qwidget_p.h>
+#include <qmath.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -90,9 +91,12 @@ QPanGesture::QPanGesture(QWidget *gestureTarget, QObject *parent)
 void QPanGesturePrivate::setupGestureTarget(QObject *newGestureTarget)
 {
     Q_Q(QPanGesture);
+    QApplicationPrivate *qAppPriv = QApplicationPrivate::instance();
+
     if (gestureTarget && gestureTarget->isWidgetType()) {
         QWidget *w = static_cast<QWidget*>(gestureTarget.data());
-        QApplicationPrivate::instance()->widgetGestures[w].pan = 0;
+        if (qAppPriv->widgetGestures[w].pan == q)
+            qAppPriv->widgetGestures[w].pan = 0;
 #if defined(Q_WS_WIN)
         qt_widget_private(w)->winSetupGestures();
 #elif defined(Q_WS_MAC)
@@ -103,7 +107,7 @@ void QPanGesturePrivate::setupGestureTarget(QObject *newGestureTarget)
 
     if (newGestureTarget && newGestureTarget->isWidgetType()) {
         QWidget *w = static_cast<QWidget*>(newGestureTarget);
-        QApplicationPrivate::instance()->widgetGestures[w].pan = q;
+        qAppPriv->widgetGestures[w].pan = q;
 #if defined(Q_WS_WIN)
         qt_widget_private(w)->winSetupGestures();
 #elif defined(Q_WS_MAC)
@@ -133,8 +137,13 @@ bool QPanGesture::event(QEvent *event)
 
 bool QPanGesture::eventFilter(QObject *receiver, QEvent *event)
 {
-#ifdef Q_WS_WIN
     Q_D(QPanGesture);
+
+    if (d->implicitGesture && d->gestureTarget && d->gestureTarget->isWidgetType() &&
+        static_cast<QWidget*>(d->gestureTarget.data())->testAttribute(Qt::WA_DontUseStandardGestures))
+        return false;
+
+#ifdef Q_WS_WIN
     if (receiver->isWidgetType() && event->type() == QEvent::NativeGesture) {
         QNativeGestureEvent *ev = static_cast<QNativeGestureEvent*>(event);
         QApplicationPrivate *qAppPriv = QApplicationPrivate::instance();
@@ -164,11 +173,12 @@ bool QPanGesture::eventFilter(QObject *receiver, QEvent *event)
             return false;
         }
         if (state() == Qt::NoGesture) {
-            d->lastOffset = d->totalOffset = QSize();
+            d->lastOffset = d->totalOffset = d->offset = QSize();
         } else {
-            d->lastOffset = QSize(ev->position.x() - d->lastPosition.x(),
-                                  ev->position.y() - d->lastPosition.y());
-            d->totalOffset += d->lastOffset;
+            d->lastOffset = d->offset;
+            d->offset = QSize(ev->position.x() - d->lastPosition.x(),
+                              ev->position.y() - d->lastPosition.y());
+            d->totalOffset += d->offset;
         }
         d->lastPosition = ev->position;
         updateState(nextState);
@@ -181,23 +191,29 @@ bool QPanGesture::eventFilter(QObject *receiver, QEvent *event)
 /*! \internal */
 bool QPanGesture::filterEvent(QEvent *event)
 {
-#if defined(Q_WS_WIN)
     Q_D(QPanGesture);
+
+    if (d->implicitGesture && d->gestureTarget && d->gestureTarget->isWidgetType() &&
+        static_cast<QWidget*>(d->gestureTarget.data())->testAttribute(Qt::WA_DontUseStandardGestures))
+        return false;
+
+#if defined(Q_WS_WIN)
     const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
 
     if (event->type() == QEvent::TouchBegin) {
         QTouchEvent::TouchPoint p = ev->touchPoints().at(0);
         d->lastPosition = p.pos().toPoint();
-        d->lastOffset = d->totalOffset = QSize();
+        d->lastOffset = d->totalOffset = d->offset = QSize();
     } else if (event->type() == QEvent::TouchEnd) {
         if (state() != Qt::NoGesture) {
             if (ev->touchPoints().size() == 2) {
                 QTouchEvent::TouchPoint p1 = ev->touchPoints().at(0);
                 QTouchEvent::TouchPoint p2 = ev->touchPoints().at(1);
-                d->lastOffset =
+                d->lastOffset = d->offset;
+                d->offset =
                         QSize(p1.pos().x() - p1.lastPos().x() + p2.pos().x() - p2.lastPos().x(),
                               p1.pos().y() - p1.lastPos().y() + p2.pos().y() - p2.lastPos().y()) / 2;
-                d->totalOffset += d->lastOffset;
+                d->totalOffset += d->offset;
             }
             updateState(Qt::GestureFinished);
         }
@@ -206,10 +222,11 @@ bool QPanGesture::filterEvent(QEvent *event)
         if (ev->touchPoints().size() == 2) {
             QTouchEvent::TouchPoint p1 = ev->touchPoints().at(0);
             QTouchEvent::TouchPoint p2 = ev->touchPoints().at(1);
-            d->lastOffset =
+            d->lastOffset = d->offset;
+            d->offset =
                     QSize(p1.pos().x() - p1.lastPos().x() + p2.pos().x() - p2.lastPos().x(),
                           p1.pos().y() - p1.lastPos().y() + p2.pos().y() - p2.lastPos().y()) / 2;
-            d->totalOffset += d->lastOffset;
+            d->totalOffset += d->offset;
             if (d->totalOffset.width() > 10  || d->totalOffset.height() > 10 ||
                 d->totalOffset.width() < -10 || d->totalOffset.height() < -10) {
                 updateState(Qt::GestureUpdated);
@@ -219,7 +236,6 @@ bool QPanGesture::filterEvent(QEvent *event)
 #elif defined(QT_MAC_USE_COCOA)
     // The following implements single touch
     // panning on Mac:
-    Q_D(QPanGesture);
     const int panBeginDelay = 300;
     const int panBeginRadius = 3;
     const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
@@ -252,8 +268,9 @@ bool QPanGesture::filterEvent(QEvent *event)
                 QPointF mousePos = QCursor::pos();
                 QPointF dist = mousePos - d->lastPosition;
                 d->lastPosition = mousePos;
-                d->lastOffset = QSizeF(dist.x(), dist.y());
-                d->totalOffset += d->lastOffset;
+                d->lastOffset = d->offset;
+                d->offset = QSizeF(dist.x(), dist.y());
+                d->totalOffset += d->offset;
                 updateState(Qt::GestureUpdated);
             }
         } else if (state() == Qt::NoGesture) {
@@ -273,7 +290,7 @@ bool QPanGesture::filterEvent(QEvent *event)
 void QPanGesture::reset()
 {
     Q_D(QPanGesture);
-    d->lastOffset = d->totalOffset = QSize(0, 0);
+    d->lastOffset = d->totalOffset = d->offset = QSize(0, 0);
     d->lastPosition = QPoint(0, 0);
 
 #if defined(QT_MAC_USE_COCOA)
@@ -298,8 +315,7 @@ QSizeF QPanGesture::totalOffset() const
 /*!
     \property QPanGesture::lastOffset
 
-    Specifies a pan offset since the last time the gesture was
-    triggered.
+    Specifies a pan offset the last time the gesture was triggered.
 */
 QSizeF QPanGesture::lastOffset() const
 {
@@ -307,6 +323,18 @@ QSizeF QPanGesture::lastOffset() const
     return d->lastOffset;
 }
 
+/*!
+    \property QPanGesture::offset
+
+    Specifies the current pan offset since the last time the gesture was
+    triggered.
+*/
+QSizeF QPanGesture::offset() const
+{
+    Q_D(const QPanGesture);
+    return d->offset;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
 /*!
@@ -360,8 +388,13 @@ bool QPinchGesture::event(QEvent *event)
 
 bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event)
 {
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
     Q_D(QPinchGesture);
+
+    if (d->implicitGesture && d->gestureTarget && d->gestureTarget->isWidgetType() &&
+        static_cast<QWidget*>(d->gestureTarget.data())->testAttribute(Qt::WA_DontUseStandardGestures))
+        return false;
+
+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
     if (receiver->isWidgetType() && event->type() == QEvent::NativeGesture) {
         QNativeGestureEvent *ev = static_cast<QNativeGestureEvent*>(event);
 #if defined(Q_WS_WIN)
@@ -380,39 +413,80 @@ bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event)
             // next we might receive the first gesture update event, so we
             // prepare for it.
             d->state = Qt::NoGesture;
-            d->scaleFactor = d->lastScaleFactor = 1;
-            d->rotationAngle = d->lastRotationAngle = 0;
+            d->changes = 0;
+            d->totalScaleFactor = d->scaleFactor = d->lastScaleFactor = 1.;
+            d->totalRotationAngle = d->rotationAngle = d->lastRotationAngle = 0.;
             d->startCenterPoint = d->centerPoint = d->lastCenterPoint = QPointF();
 #if defined(Q_WS_WIN)
             d->initialDistance = 0;
+            d->lastSequenceId = ev->sequenceId;
 #endif
             return false;
-        case QNativeGestureEvent::Rotate:
-            d->scaleFactor = 0;
+        case QNativeGestureEvent::Rotate: {
+            d->lastScaleFactor = d->scaleFactor;
             d->lastRotationAngle = d->rotationAngle;
-#if defined(Q_WS_WIN)
-            d->rotationAngle = -1 * GID_ROTATE_ANGLE_FROM_ARGUMENT(ev->argument);
-#elif defined(Q_WS_MAC)
-            d->rotationAngle = ev->percentage;
-#endif
+#if defined(Q_WS_MAC)
+            d->rotationAngle += ev->percentage;
             nextState = Qt::GestureUpdated;
+#elif defined(Q_WS_WIN)
+            // This is a workaround for an issue with the native rotation
+            // gesture on Windows 7. For some reason the rotation angle in the
+            // first WM_GESTURE message in a sequence contains value that is
+            // off a little bit and causes the rotating item to "jump", so
+            // we just ignore the first WM_GESTURE in every sequence.
+            bool windowsRotateWorkaround = false;
+            if (!d->lastSequenceId) {
+                windowsRotateWorkaround = true;
+                d->lastSequenceId = ev->sequenceId;
+            }
+            if (d->lastSequenceId > 0 && d->lastSequenceId != (ulong)-1 && ev->sequenceId != d->lastSequenceId) {
+                // this is the first WM_GESTURE message in a sequence.
+                d->totalRotationAngle += d->rotationAngle;
+                windowsRotateWorkaround = true;
+                // a magic value to mark that the next WM_GESTURE message is
+                // the second message in a sequence and we should clear the
+                // lastRotationAngle
+                d->lastSequenceId = (ulong)-1;
+            }
+            if (!windowsRotateWorkaround) {
+                d->rotationAngle = -1 * GID_ROTATE_ANGLE_FROM_ARGUMENT(ev->argument) * 180. / M_PI;
+                if (d->lastSequenceId == (ulong)-1) {
+                    // a special case since we need to set the lastRotationAngle to
+                    // rotationAngle when the first WM_GESTURE is received in each
+                    // sequence.
+                    d->lastRotationAngle = d->rotationAngle;
+                }
+                d->lastSequenceId = ev->sequenceId;
+            }
+            if (!windowsRotateWorkaround)
+                nextState = Qt::GestureUpdated;
+#endif
+            d->changes = QPinchGesture::RotationAngleChanged;
             event->accept();
             break;
+        }
         case QNativeGestureEvent::Zoom:
-            d->rotationAngle = 0;
+            d->lastRotationAngle = d->rotationAngle;
+            d->lastScaleFactor = d->scaleFactor;
 #if defined(Q_WS_WIN)
             if (d->initialDistance != 0) {
-                d->lastScaleFactor = d->scaleFactor;
                 int distance = int(qint64(ev->argument));
-                d->scaleFactor = (qreal) distance / d->initialDistance;
+                if (d->lastSequenceId && ev->sequenceId != d->lastSequenceId) {
+                    d->totalScaleFactor *= d->scaleFactor;
+                    d->initialDistance = int(qint64(ev->argument));
+                    d->lastScaleFactor = d->scaleFactor = (qreal) distance / d->initialDistance;
+                } else {
+                    d->scaleFactor = (qreal) distance / d->initialDistance;
+                }
+                d->lastSequenceId = ev->sequenceId;
             } else {
                 d->initialDistance = int(qint64(ev->argument));
             }
 #elif defined(Q_WS_MAC)
-            d->lastScaleFactor = d->scaleFactor;
-            d->scaleFactor = ev->percentage;
+            d->scaleFactor += ev->percentage;
 #endif
             nextState = Qt::GestureUpdated;
+            d->changes = QPinchGesture::ScaleFactorChanged;
             event->accept();
             break;
         case QNativeGestureEvent::GestureEnd:
@@ -427,6 +501,8 @@ bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event)
             d->startCenterPoint = d->centerPoint;
         d->lastCenterPoint = d->centerPoint;
         d->centerPoint = static_cast<QWidget*>(receiver)->mapFromGlobal(ev->position);
+        if (d->lastCenterPoint != d->centerPoint)
+            d->changes |= QPinchGesture::CenterPointChanged;
         updateState(nextState);
         return true;
     }
@@ -438,6 +514,12 @@ bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event)
 /*! \internal */
 bool QPinchGesture::filterEvent(QEvent *event)
 {
+    Q_D(QPinchGesture);
+
+    if (d->implicitGesture && d->gestureTarget && d->gestureTarget->isWidgetType() &&
+        static_cast<QWidget*>(d->gestureTarget.data())->testAttribute(Qt::WA_DontUseStandardGestures))
+        return false;
+
     Q_UNUSED(event);
     return false;
 }
@@ -446,16 +528,44 @@ bool QPinchGesture::filterEvent(QEvent *event)
 void QPinchGesture::reset()
 {
     Q_D(QPinchGesture);
-    d->scaleFactor = d->lastScaleFactor = 0;
-    d->rotationAngle = d->lastRotationAngle = 0;
+    d->changes = 0;
+    d->totalScaleFactor = d->scaleFactor = d->lastScaleFactor = 1.;
+    d->totalRotationAngle = d->rotationAngle = d->lastRotationAngle = 0.;
     d->startCenterPoint = d->centerPoint = d->lastCenterPoint = QPointF();
     QGesture::reset();
 }
 
 /*!
+    \property QPinchGesture::whatChanged
+
+    Specifies which values were changed in the gesture.
+*/
+QPinchGesture::WhatChanged QPinchGesture::whatChanged() const
+{
+    return d_func()->changes;
+}
+
+/*!
+    \property QPinchGesture::totalScaleFactor
+
+    Specifies a total scale factor of the pinch gesture since the gesture
+    started.
+*/
+qreal QPinchGesture::totalScaleFactor() const
+{
+    Q_D(const QPinchGesture);
+    return d->totalScaleFactor * d->scaleFactor;
+}
+
+/*!
     \property QPinchGesture::scaleFactor
 
     Specifies a scale factor of the pinch gesture.
+
+    If the gesture consists of several pinch sequences (i.e. zoom and rotate
+    sequences), then this property specifies the scale factor in the current
+    sequence. When pinching changes the rotation angle only, the value of this
+    property is 1.
 */
 qreal QPinchGesture::scaleFactor() const
 {
@@ -473,9 +583,29 @@ qreal QPinchGesture::lastScaleFactor() const
 }
 
 /*!
+    \property QPinchGesture::totalRotationAngle
+
+    Specifies a total rotation angle of the gesture since the gesture started.
+
+    The angle is specified in degrees.
+*/
+qreal QPinchGesture::totalRotationAngle() const
+{
+    Q_D(const QPinchGesture);
+    return d->totalRotationAngle + d->rotationAngle;
+}
+
+/*!
     \property QPinchGesture::rotationAngle
 
     Specifies a rotation angle of the gesture.
+
+    If the gesture consists of several pinch sequences (i.e. zoom and rotate
+    sequences), then this property specifies the rotation angle in the current
+    sequence. When pinching changes the scale factor only, the value of this
+    property is 0.
+
+    The angle is specified in degrees.
 */
 qreal QPinchGesture::rotationAngle() const
 {
@@ -486,6 +616,8 @@ qreal QPinchGesture::rotationAngle() const
     \property QPinchGesture::lastRotationAngle
 
     Specifies a previous rotation angle of the gesture.
+
+    The angle is specified in degrees.
 */
 qreal QPinchGesture::lastRotationAngle() const
 {
diff --git a/src/gui/kernel/qstandardgestures.h b/src/gui/kernel/qstandardgestures.h
index bb6f3b6..53c4416 100644
--- a/src/gui/kernel/qstandardgestures.h
+++ b/src/gui/kernel/qstandardgestures.h
@@ -61,6 +61,7 @@ class Q_GUI_EXPORT QPanGesture : public QGesture
 
     Q_PROPERTY(QSizeF totalOffset READ totalOffset)
     Q_PROPERTY(QSizeF lastOffset READ lastOffset)
+    Q_PROPERTY(QSizeF offset READ offset)
 
 public:
     QPanGesture(QWidget *gestureTarget, QObject *parent = 0);
@@ -69,6 +70,7 @@ public:
 
     QSizeF totalOffset() const;
     QSizeF lastOffset() const;
+    QSizeF offset() const;
 
 protected:
     void reset();
@@ -78,6 +80,7 @@ private:
     bool eventFilter(QObject *receiver, QEvent *event);
 
     friend class QWidget;
+    friend class QAbstractScrollAreaPrivate;
 };
 
 class QPinchGesturePrivate;
@@ -86,31 +89,48 @@ class Q_GUI_EXPORT QPinchGesture : public QGesture
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPinchGesture)
 
-    Q_PROPERTY(qreal scaleFactor READ scaleFactor)
+public:
+    enum WhatChange {
+        ScaleFactorChanged = 0x1,
+        RotationAngleChanged = 0x2,
+        CenterPointChanged = 0x4
+    };
+    Q_DECLARE_FLAGS(WhatChanged, WhatChange)
+
+    Q_PROPERTY(WhatChanged whatChanged READ whatChanged)
+
+    Q_PROPERTY(qreal totalScaleFactor READ totalScaleFactor)
     Q_PROPERTY(qreal lastScaleFactor READ lastScaleFactor)
+    Q_PROPERTY(qreal scaleFactor READ scaleFactor)
 
-    Q_PROPERTY(qreal rotationAngle READ rotationAngle)
+    Q_PROPERTY(qreal totalRotationAngle READ totalRotationAngle)
     Q_PROPERTY(qreal lastRotationAngle READ lastRotationAngle)
+    Q_PROPERTY(qreal rotationAngle READ rotationAngle)
 
     Q_PROPERTY(QPointF startCenterPoint READ startCenterPoint)
     Q_PROPERTY(QPointF lastCenterPoint READ lastCenterPoint)
     Q_PROPERTY(QPointF centerPoint READ centerPoint)
 
 public:
+
     QPinchGesture(QWidget *gestureTarget, QObject *parent = 0);
 
     bool filterEvent(QEvent *event);
     void reset();
 
+    WhatChanged whatChanged() const;
+
     QPointF startCenterPoint() const;
     QPointF lastCenterPoint() const;
     QPointF centerPoint() const;
 
-    qreal scaleFactor() const;
+    qreal totalScaleFactor() const;
     qreal lastScaleFactor() const;
+    qreal scaleFactor() const;
 
-    qreal rotationAngle() const;
+    qreal totalRotationAngle() const;
     qreal lastRotationAngle() const;
+    qreal rotationAngle() const;
 
 private:
     bool event(QEvent *event);
diff --git a/src/gui/kernel/qstandardgestures_p.h b/src/gui/kernel/qstandardgestures_p.h
index 270f307..354ebee 100644
--- a/src/gui/kernel/qstandardgestures_p.h
+++ b/src/gui/kernel/qstandardgestures_p.h
@@ -74,6 +74,7 @@ public:
 
     QSizeF totalOffset;
     QSizeF lastOffset;
+    QSizeF offset;
     QPointF lastPosition;
 
 #if defined(QT_MAC_USE_COCOA)
@@ -88,25 +89,32 @@ class QPinchGesturePrivate : public QGesturePrivate
 
 public:
     QPinchGesturePrivate()
-        : scaleFactor(0), lastScaleFactor(0),
-          rotationAngle(0), lastRotationAngle(0)
+        : changes(0), totalScaleFactor(0.), lastScaleFactor(0.), scaleFactor(0.),
+          totalRotationAngle(0.), lastRotationAngle(0.), rotationAngle(0.)
 #ifdef Q_WS_WIN
-          ,initialDistance(0)
+          ,initialDistance(0), lastSequenceId(0)
 #endif
     {
     }
 
     void setupGestureTarget(QObject *o);
 
-    qreal scaleFactor;
+    QPinchGesture::WhatChanged changes;
+
+    qreal totalScaleFactor; // total scale factor, excluding the current sequence.
     qreal lastScaleFactor;
-    qreal rotationAngle;
+    qreal scaleFactor; // scale factor in the current sequence.
+
+    qreal totalRotationAngle; // total rotation angle, excluding the current sequence.
     qreal lastRotationAngle;
+    qreal rotationAngle; // rotation angle in the current sequence.
+
     QPointF startCenterPoint;
     QPointF lastCenterPoint;
     QPointF centerPoint;
 #ifdef Q_WS_WIN
     int initialDistance;
+    ulong lastSequenceId;
 #endif
 };
 
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index 78301af..ea1ca69 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -95,6 +95,7 @@ public:
     int screenHeightInTwips;
     int defaultDpiX;
     int defaultDpiY;
+    int qtOwnsS60Environment : 1;
     static inline void updateScreenSize();
     static inline RWsSession& wsSession();
     static inline RWindowGroup& windowGroup();
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 863c43e..44f9db1 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -82,8 +82,6 @@
 #include "private/qstyle_p.h"
 #include "private/qinputcontext_p.h"
 #include "qfileinfo.h"
-#include "qstandardgestures.h"
-#include "qstandardgestures_p.h"
 
 #if defined (Q_WS_WIN)
 # include <private/qwininputcontext_p.h>
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index f398dbd..284558f 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -830,7 +830,7 @@ public:
     inline QT3_SUPPORT void setFont(const QFont &f, bool) { setFont(f); }
     inline QT3_SUPPORT void setPalette(const QPalette &p, bool) { setPalette(p); }
     enum BackgroundOrigin { WidgetOrigin, ParentOrigin, WindowOrigin, AncestorOrigin };
-    inline QT3_SUPPORT void setBackgroundOrigin(BackgroundOrigin){};
+    inline QT3_SUPPORT void setBackgroundOrigin(BackgroundOrigin) {}
     inline QT3_SUPPORT BackgroundOrigin backgroundOrigin() const { return WindowOrigin; }
     inline QT3_SUPPORT QPoint backgroundOffset() const { return QPoint(); }
     inline QT3_SUPPORT void repaint(bool) { repaint(); }
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 6da35d8..d630143 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -722,7 +722,9 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
             // The API to get title_pane graphics size is not public -> assume square space based
             // on titlebar font height. CAknBitmap would be optimum, wihtout setting the size, since
             // then title pane would automatically scale the bitmap. Unfortunately it is not public API
-            const CFont * font = AknLayoutUtils::FontFromId(EAknLogicalFontTitleFont);
+            // Also this function is leaving, although it is not named as such.
+            const CFont * font;
+            QT_TRAP_THROWING(font = AknLayoutUtils::FontFromId(EAknLogicalFontTitleFont));
             TSize iconSize(font->HeightInPixels(), font->HeightInPixels());
 
             QIcon icon = q->windowIcon();
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp
index 8e60fb3..0ec7e7e 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/kernel/qwidget_win.cpp
@@ -2062,29 +2062,21 @@ void QWidgetPrivate::registerTouchWindow()
 void QWidgetPrivate::winSetupGestures()
 {
     Q_Q(QWidget);
-    if (!q)
-        return;
-    if (!q->isVisible())
+    if (!q || !q->isVisible())
         return;
     QApplicationPrivate *qAppPriv = QApplicationPrivate::instance();
-    bool needh = false;
-    bool needv = false;
-    bool singleFingerPanEnabled = false;
     QApplicationPrivate::WidgetStandardGesturesMap::const_iterator it =
             qAppPriv->widgetGestures.find(q);
     if (it == qAppPriv->widgetGestures.end())
         return;
     const QStandardGestures &gestures = it.value();
-    WId winid = 0;
+    WId winid = q->effectiveWinId();
 
-    if (QAbstractScrollArea *asa = qobject_cast<QAbstractScrollArea*>(q)) {
-        winid = asa->viewport()->internalWinId();
-        if (!winid) {
-            QWidget *nativeParent = asa->viewport()->nativeParentWidget();
-            if (!nativeParent)
-                return;
-            winid = nativeParent->internalWinId();
-        }
+    bool needh = false;
+    bool needv = false;
+    bool singleFingerPanEnabled = false;
+
+    if (QAbstractScrollArea *asa = qobject_cast<QAbstractScrollArea*>(q->parent())) {
         QScrollBar *hbar = asa->horizontalScrollBar();
         QScrollBar *vbar = asa->verticalScrollBar();
         Qt::ScrollBarPolicy hbarpolicy = asa->horizontalScrollBarPolicy();
@@ -2094,12 +2086,6 @@ void QWidgetPrivate::winSetupGestures()
         needv = (vbarpolicy == Qt::ScrollBarAlwaysOn ||
                  (vbarpolicy == Qt::ScrollBarAsNeeded && vbar->minimum() < vbar->maximum()));
         singleFingerPanEnabled = asa->d_func()->singleFingerPanEnabled;
-    } else {
-        winid = q->internalWinId();
-        if (!winid) {
-            if (QWidget *nativeParent = q->nativeParentWidget())
-                winid = nativeParent->internalWinId();
-        }
     }
     if (winid && qAppPriv->SetGestureConfig) {
         GESTURECONFIG gc[3];
diff --git a/src/gui/math3d/qgenericmatrix.cpp b/src/gui/math3d/qgenericmatrix.cpp
index 290c9c2..b5d8824 100644
--- a/src/gui/math3d/qgenericmatrix.cpp
+++ b/src/gui/math3d/qgenericmatrix.cpp
@@ -50,19 +50,14 @@ QT_BEGIN_NAMESPACE
     \ingroup painting
     \ingroup painting-3D
 
-    The QGenericMatrix template has four parameters:
+    The QGenericMatrix template has three parameters:
 
     \table
     \row \i N \i Number of columns.
     \row \i M \i Number of rows.
     \row \i T \i Element type that is visible to users of the class.
-    \row \i InnerT \i Element type that is used inside the class.
     \endtable
 
-    Normally T and InnerT are the same type; e.g. float or double.
-    But they can be different if the user wants to store elements
-    internally in a fixed-point format for the underlying hardware.
-
     \sa QMatrix4x4
 */
 
@@ -73,7 +68,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn QGenericMatrix::QGenericMatrix(const QGenericMatrix<N, M, T, InnerT>& other)
+    \fn QGenericMatrix::QGenericMatrix(const QGenericMatrix<N, M, T>& other)
 
     Constructs a copy of \a other.
 */
@@ -89,13 +84,14 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn T QGenericMatrix::operator()(int row, int column) const
+    \fn const T& QGenericMatrix::operator()(int row, int column) const
 
-    Returns the element at position (\a row, \a column) in this matrix.
+    Returns a constant reference to the element at position
+    (\a row, \a column) in this matrix.
 */
 
 /*!
-    \fn InnerT& QGenericMatrix::operator()(int row, int column)
+    \fn T& QGenericMatrix::operator()(int row, int column)
 
     Returns a reference to the element at position (\a row, \a column)
     in this matrix so that the element can be assigned to.
@@ -130,57 +126,57 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn QGenericMatrix<N, M, T, InnerT>& QGenericMatrix::operator+=(const QGenericMatrix<N, M, T, InnerT>& other)
+    \fn QGenericMatrix<N, M, T>& QGenericMatrix::operator+=(const QGenericMatrix<N, M, T>& other)
 
     Adds the contents of \a other to this matrix.
 */
 
 /*!
-    \fn QGenericMatrix<N, M, T, InnerT>& QGenericMatrix::operator-=(const QGenericMatrix<N, M, T, InnerT>& other)
+    \fn QGenericMatrix<N, M, T>& QGenericMatrix::operator-=(const QGenericMatrix<N, M, T>& other)
 
     Subtracts the contents of \a other from this matrix.
 */
 
 /*!
-    \fn QGenericMatrix<N, M, T, InnerT>& QGenericMatrix::operator*=(T factor)
+    \fn QGenericMatrix<N, M, T>& QGenericMatrix::operator*=(T factor)
 
     Multiplies all elements of this matrix by \a factor.
 */
 
 /*!
-    \fn QGenericMatrix<N, M, T, InnerT>& QGenericMatrix::operator/=(T divisor)
+    \fn QGenericMatrix<N, M, T>& QGenericMatrix::operator/=(T divisor)
 
     Divides all elements of this matrix by \a divisor.
 */
 
 /*!
-    \fn bool QGenericMatrix::operator==(const QGenericMatrix<N, M, T, InnerT>& other) const
+    \fn bool QGenericMatrix::operator==(const QGenericMatrix<N, M, T>& other) const
 
     Returns true if this matrix is identical to \a other; false otherwise.
 */
 
 /*!
-    \fn bool QGenericMatrix::operator!=(const QGenericMatrix<N, M, T, InnerT>& other) const
+    \fn bool QGenericMatrix::operator!=(const QGenericMatrix<N, M, T>& other) const
 
     Returns true if this matrix is not identical to \a other; false otherwise.
 */
 
 /*!
-    \fn QGenericMatrix<N, M, T, InnerT> operator+(const QGenericMatrix<N, M, T, InnerT>& m1, const QGenericMatrix<N, M, T, InnerT>& m2)
+    \fn QGenericMatrix<N, M, T> operator+(const QGenericMatrix<N, M, T>& m1, const QGenericMatrix<N, M, T>& m2)
     \relates QGenericMatrix
 
     Returns the sum of \a m1 and \a m2.
 */
 
 /*!
-    \fn QGenericMatrix<N, M, T, InnerT> operator-(const QGenericMatrix<N, M, T, InnerT>& m1, const QGenericMatrix<N, M, T, InnerT>& m2)
+    \fn QGenericMatrix<N, M, T> operator-(const QGenericMatrix<N, M, T>& m1, const QGenericMatrix<N, M, T>& m2)
     \relates QGenericMatrix
 
     Returns the difference of \a m1 and \a m2.
 */
 
 /*!
-    \fn QGenericMatrix<M1, M2, T, InnerT> operator*(const QGenericMatrix<N, M2, T, InnerT>& m1, const QGenericMatrix<M1, N, T, InnerT>& m2)
+    \fn QGenericMatrix<M1, M2, T> operator*(const QGenericMatrix<N, M2, T>& m1, const QGenericMatrix<M1, N, T>& m2)
     \relates QGenericMatrix
 
     Returns the product of the NxM2 matrix \a m1 and the M1xN matrix \a m2
@@ -188,7 +184,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn QGenericMatrix<N, M, T, InnerT> operator-(const QGenericMatrix<N, M, T, InnerT>& matrix)
+    \fn QGenericMatrix<N, M, T> operator-(const QGenericMatrix<N, M, T>& matrix)
     \overload
     \relates QGenericMatrix
 
@@ -196,21 +192,21 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn QGenericMatrix<N, M, T, InnerT> operator*(T factor, const QGenericMatrix<N, M, T, InnerT>& matrix)
+    \fn QGenericMatrix<N, M, T> operator*(T factor, const QGenericMatrix<N, M, T>& matrix)
     \relates QGenericMatrix
 
     Returns the result of multiplying all elements of \a matrix by \a factor.
 */
 
 /*!
-    \fn QGenericMatrix<N, M, T, InnerT> operator*(const QGenericMatrix<N, M, T, InnerT>& matrix, T factor)
+    \fn QGenericMatrix<N, M, T> operator*(const QGenericMatrix<N, M, T>& matrix, T factor)
     \relates QGenericMatrix
 
     Returns the result of multiplying all elements of \a matrix by \a factor.
 */
 
 /*!
-    \fn QGenericMatrix<N, M, T, InnerT> operator/(const QGenericMatrix<N, M, T, InnerT>& matrix, T divisor)
+    \fn QGenericMatrix<N, M, T> operator/(const QGenericMatrix<N, M, T>& matrix, T divisor)
     \relates QGenericMatrix
 
     Returns the result of dividing all elements of \a matrix by \a divisor.
@@ -224,28 +220,25 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn InnerT *QGenericMatrix::data()
+    \fn T *QGenericMatrix::data()
 
-    Returns a pointer to the raw data of this matrix.  This is intended
-    for use with raw GL functions.
+    Returns a pointer to the raw data of this matrix.
 
     \sa constData()
 */
 
 /*!
-    \fn const InnerT *QGenericMatrix::data() const
+    \fn const T *QGenericMatrix::data() const
 
     Returns a constant pointer to the raw data of this matrix.
-    This is intended for use with raw GL functions.
 
     \sa constData()
 */
 
 /*!
-    \fn const InnerT *QGenericMatrix::constData() const
+    \fn const T *QGenericMatrix::constData() const
 
     Returns a constant pointer to the raw data of this matrix.
-    This is intended for use with raw GL functions.
 
     \sa data()
 */
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h
index fe7ba5f..39c4ed8 100644
--- a/src/gui/math3d/qgenericmatrix.h
+++ b/src/gui/math3d/qgenericmatrix.h
@@ -51,103 +51,103 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
 
-template <int N, int M, typename T, typename InnerT = T>
+template <int N, int M, typename T>
 class QGenericMatrix
 {
 public:
     QGenericMatrix();
-    QGenericMatrix(const QGenericMatrix<N, M, T, InnerT>& other);
+    QGenericMatrix(const QGenericMatrix<N, M, T>& other);
     explicit QGenericMatrix(const T *values);
 
-    T operator()(int row, int column) const;
-    InnerT& operator()(int row, int column);
+    const T& operator()(int row, int column) const;
+    T& operator()(int row, int column);
 
     bool isIdentity() const;
     void setIdentity();
 
     void fill(T value);
 
-    QGenericMatrix<M, N, T, InnerT> transposed() const;
+    QGenericMatrix<M, N, T> transposed() const;
 
-    QGenericMatrix<N, M, T, InnerT>& operator+=(const QGenericMatrix<N, M, T, InnerT>& other);
-    QGenericMatrix<N, M, T, InnerT>& operator-=(const QGenericMatrix<N, M, T, InnerT>& other);
-    QGenericMatrix<N, M, T, InnerT>& operator*=(T factor);
-    QGenericMatrix<N, M, T, InnerT>& operator/=(T divisor);
-    bool operator==(const QGenericMatrix<N, M, T, InnerT>& other) const;
-    bool operator!=(const QGenericMatrix<N, M, T, InnerT>& other) const;
+    QGenericMatrix<N, M, T>& operator+=(const QGenericMatrix<N, M, T>& other);
+    QGenericMatrix<N, M, T>& operator-=(const QGenericMatrix<N, M, T>& other);
+    QGenericMatrix<N, M, T>& operator*=(T factor);
+    QGenericMatrix<N, M, T>& operator/=(T divisor);
+    bool operator==(const QGenericMatrix<N, M, T>& other) const;
+    bool operator!=(const QGenericMatrix<N, M, T>& other) const;
 
     void toValueArray(T *values);
 
-    InnerT *data() { return m[0]; }
-    const InnerT *data() const { return m[0]; }
-    const InnerT *constData() const { return m[0]; }
+    T *data() { return m[0]; }
+    const T *data() const { return m[0]; }
+    const T *constData() const { return m[0]; }
 
 #if !defined(Q_NO_TEMPLATE_FRIENDS)
-    template<int NN, int MM, typename TT, typename ITT>
-    friend QGenericMatrix<NN, MM, TT, ITT> operator+(const QGenericMatrix<NN, MM, TT, ITT>& m1, const QGenericMatrix<NN, MM, TT, ITT>& m2);
-    template<int NN, int MM, typename TT, typename ITT>
-    friend QGenericMatrix<NN, MM, TT, ITT> operator-(const QGenericMatrix<NN, MM, TT, ITT>& m1, const QGenericMatrix<NN, MM, TT, ITT>& m2);
-    template<int NN, int M1, int M2, typename TT, typename ITT>
-    friend QGenericMatrix<M1, M2, TT, ITT> operator*(const QGenericMatrix<NN, M2, TT, ITT>& m1, const QGenericMatrix<M1, NN, TT, ITT>& m2);
-    template<int NN, int MM, typename TT, typename ITT>
-    friend QGenericMatrix<NN, MM, TT, ITT> operator-(const QGenericMatrix<NN, MM, TT, ITT>& matrix);
-    template<int NN, int MM, typename TT, typename ITT>
-    friend QGenericMatrix<NN, MM, TT, ITT> operator*(TT factor, const QGenericMatrix<NN, MM, TT, ITT>& matrix);
-    template<int NN, int MM, typename TT, typename ITT>
-    friend QGenericMatrix<NN, MM, TT, ITT> operator*(const QGenericMatrix<NN, MM, TT, ITT>& matrix, TT factor);
-    template<int NN, int MM, typename TT, typename ITT>
-    friend QGenericMatrix<NN, MM, TT, ITT> operator/(const QGenericMatrix<NN, MM, TT, ITT>& matrix, TT divisor);
+    template<int NN, int MM, typename TT>
+    friend QGenericMatrix<NN, MM, TT> operator+(const QGenericMatrix<NN, MM, TT>& m1, const QGenericMatrix<NN, MM, TT>& m2);
+    template<int NN, int MM, typename TT>
+    friend QGenericMatrix<NN, MM, TT> operator-(const QGenericMatrix<NN, MM, TT>& m1, const QGenericMatrix<NN, MM, TT>& m2);
+    template<int NN, int M1, int M2, typename TT>
+    friend QGenericMatrix<M1, M2, TT> operator*(const QGenericMatrix<NN, M2, TT>& m1, const QGenericMatrix<M1, NN, TT>& m2);
+    template<int NN, int MM, typename TT>
+    friend QGenericMatrix<NN, MM, TT> operator-(const QGenericMatrix<NN, MM, TT>& matrix);
+    template<int NN, int MM, typename TT>
+    friend QGenericMatrix<NN, MM, TT> operator*(TT factor, const QGenericMatrix<NN, MM, TT>& matrix);
+    template<int NN, int MM, typename TT>
+    friend QGenericMatrix<NN, MM, TT> operator*(const QGenericMatrix<NN, MM, TT>& matrix, TT factor);
+    template<int NN, int MM, typename TT>
+    friend QGenericMatrix<NN, MM, TT> operator/(const QGenericMatrix<NN, MM, TT>& matrix, TT divisor);
 
 private:
 #endif
-    InnerT m[N][M];    // Column-major order to match OpenGL.
+    T m[N][M];    // Column-major order to match OpenGL.
 
     QGenericMatrix(int) {}       // Construct without initializing identity matrix.
 
 #if !defined(Q_NO_TEMPLATE_FRIENDS)
-    template <int NN, int MM, typename TT, typename ITT>
+    template <int NN, int MM, typename TT>
     friend class QGenericMatrix;
 #endif
 };
 
-template <int N, int M, typename T, typename InnerT>
-Q_INLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT>::QGenericMatrix()
+template <int N, int M, typename T>
+Q_INLINE_TEMPLATE QGenericMatrix<N, M, T>::QGenericMatrix()
 {
     setIdentity();
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_INLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT>::QGenericMatrix(const QGenericMatrix<N, M, T, InnerT>& other)
+template <int N, int M, typename T>
+Q_INLINE_TEMPLATE QGenericMatrix<N, M, T>::QGenericMatrix(const QGenericMatrix<N, M, T>& other)
 {
     for (int col = 0; col < N; ++col)
         for (int row = 0; row < M; ++row)
             m[col][row] = other.m[col][row];
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT>::QGenericMatrix(const T *values)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T>::QGenericMatrix(const T *values)
 {
     for (int col = 0; col < N; ++col)
         for (int row = 0; row < M; ++row)
             m[col][row] = values[row * N + col];
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_INLINE_TEMPLATE T QGenericMatrix<N, M, T, InnerT>::operator()(int row, int column) const
+template <int N, int M, typename T>
+Q_INLINE_TEMPLATE const T& QGenericMatrix<N, M, T>::operator()(int row, int column) const
 {
     Q_ASSERT(row >= 0 && row < M && column >= 0 && column < N);
-    return T(m[column][row]);
+    return m[column][row];
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_INLINE_TEMPLATE InnerT& QGenericMatrix<N, M, T, InnerT>::operator()(int row, int column)
+template <int N, int M, typename T>
+Q_INLINE_TEMPLATE T& QGenericMatrix<N, M, T>::operator()(int row, int column)
 {
     Q_ASSERT(row >= 0 && row < M && column >= 0 && column < N);
     return m[column][row];
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE bool QGenericMatrix<N, M, T, InnerT>::isIdentity() const
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE bool QGenericMatrix<N, M, T>::isIdentity() const
 {
     for (int col = 0; col < N; ++col) {
         for (int row = 0; row < M; ++row) {
@@ -163,8 +163,8 @@ Q_OUTOFLINE_TEMPLATE bool QGenericMatrix<N, M, T, InnerT>::isIdentity() const
     return true;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T, InnerT>::setIdentity()
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T>::setIdentity()
 {
     for (int col = 0; col < N; ++col) {
         for (int row = 0; row < M; ++row) {
@@ -176,51 +176,50 @@ Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T, InnerT>::setIdentity()
     }
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T, InnerT>::fill(T value)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T>::fill(T value)
 {
     for (int col = 0; col < N; ++col)
         for (int row = 0; row < M; ++row)
             m[col][row] = value;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<M, N, T, InnerT> QGenericMatrix<N, M, T, InnerT>::transposed() const
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<M, N, T> QGenericMatrix<N, M, T>::transposed() const
 {
-    QGenericMatrix<M, N, T, InnerT> result(1);
+    QGenericMatrix<M, N, T> result(1);
     for (int row = 0; row < M; ++row)
         for (int col = 0; col < N; ++col)
             result.m[row][col] = m[col][row];
     return result;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT>& QGenericMatrix<N, M, T, InnerT>::operator+=(const QGenericMatrix<N, M, T, InnerT>& other)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T>& QGenericMatrix<N, M, T>::operator+=(const QGenericMatrix<N, M, T>& other)
 {
     for (int index = 0; index < N * M; ++index)
         m[0][index] += other.m[0][index];
     return *this;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT>& QGenericMatrix<N, M, T, InnerT>::operator-=(const QGenericMatrix<N, M, T, InnerT>& other)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T>& QGenericMatrix<N, M, T>::operator-=(const QGenericMatrix<N, M, T>& other)
 {
     for (int index = 0; index < N * M; ++index)
         m[0][index] -= other.m[0][index];
     return *this;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT>& QGenericMatrix<N, M, T, InnerT>::operator*=(T factor)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T>& QGenericMatrix<N, M, T>::operator*=(T factor)
 {
-    InnerT f(factor);
     for (int index = 0; index < N * M; ++index)
-        m[0][index] *= f;
+        m[0][index] *= factor;
     return *this;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE bool QGenericMatrix<N, M, T, InnerT>::operator==(const QGenericMatrix<N, M, T, InnerT>& other) const
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE bool QGenericMatrix<N, M, T>::operator==(const QGenericMatrix<N, M, T>& other) const
 {
     for (int index = 0; index < N * M; ++index) {
         if (m[0][index] != other.m[0][index])
@@ -229,8 +228,8 @@ Q_OUTOFLINE_TEMPLATE bool QGenericMatrix<N, M, T, InnerT>::operator==(const QGen
     return true;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE bool QGenericMatrix<N, M, T, InnerT>::operator!=(const QGenericMatrix<N, M, T, InnerT>& other) const
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE bool QGenericMatrix<N, M, T>::operator!=(const QGenericMatrix<N, M, T>& other) const
 {
     for (int index = 0; index < N * M; ++index) {
         if (m[0][index] != other.m[0][index])
@@ -239,40 +238,39 @@ Q_OUTOFLINE_TEMPLATE bool QGenericMatrix<N, M, T, InnerT>::operator!=(const QGen
     return false;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT>& QGenericMatrix<N, M, T, InnerT>::operator/=(T divisor)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T>& QGenericMatrix<N, M, T>::operator/=(T divisor)
 {
-    InnerT d(divisor);
     for (int index = 0; index < N * M; ++index)
-        m[0][index] /= d;
+        m[0][index] /= divisor;
     return *this;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT> operator+(const QGenericMatrix<N, M, T, InnerT>& m1, const QGenericMatrix<N, M, T, InnerT>& m2)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T> operator+(const QGenericMatrix<N, M, T>& m1, const QGenericMatrix<N, M, T>& m2)
 {
-    QGenericMatrix<N, M, T, InnerT> result(1);
+    QGenericMatrix<N, M, T> result(1);
     for (int index = 0; index < N * M; ++index)
         result.m[0][index] = m1.m[0][index] + m2.m[0][index];
     return result;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT> operator-(const QGenericMatrix<N, M, T, InnerT>& m1, const QGenericMatrix<N, M, T, InnerT>& m2)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T> operator-(const QGenericMatrix<N, M, T>& m1, const QGenericMatrix<N, M, T>& m2)
 {
-    QGenericMatrix<N, M, T, InnerT> result(1);
+    QGenericMatrix<N, M, T> result(1);
     for (int index = 0; index < N * M; ++index)
         result.m[0][index] = m1.m[0][index] - m2.m[0][index];
     return result;
 }
 
-template <int N, int M1, int M2, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<M1, M2, T, InnerT> operator*(const QGenericMatrix<N, M2, T, InnerT>& m1, const QGenericMatrix<M1, N, T, InnerT>& m2)
+template <int N, int M1, int M2, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<M1, M2, T> operator*(const QGenericMatrix<N, M2, T>& m1, const QGenericMatrix<M1, N, T>& m2)
 {
-    QGenericMatrix<M1, M2, T, InnerT> result(1);
+    QGenericMatrix<M1, M2, T> result(1);
     for (int row = 0; row < M2; ++row) {
         for (int col = 0; col < M1; ++col) {
-            InnerT sum(0.0f);
+            T sum(0.0f);
             for (int j = 0; j < N; ++j)
                 sum += m1.m[j][row] * m2.m[col][j];
             result.m[col][row] = sum;
@@ -281,47 +279,44 @@ Q_OUTOFLINE_TEMPLATE QGenericMatrix<M1, M2, T, InnerT> operator*(const QGenericM
     return result;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT> operator-(const QGenericMatrix<N, M, T, InnerT>& matrix)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T> operator-(const QGenericMatrix<N, M, T>& matrix)
 {
-    QGenericMatrix<N, M, T, InnerT> result(1);
+    QGenericMatrix<N, M, T> result(1);
     for (int index = 0; index < N * M; ++index)
         result.m[0][index] = -matrix.m[0][index];
     return result;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT> operator*(T factor, const QGenericMatrix<N, M, T, InnerT>& matrix)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T> operator*(T factor, const QGenericMatrix<N, M, T>& matrix)
 {
-    InnerT f(factor);
-    QGenericMatrix<N, M, T, InnerT> result(1);
+    QGenericMatrix<N, M, T> result(1);
     for (int index = 0; index < N * M; ++index)
-        result.m[0][index] = matrix.m[0][index] * f;
+        result.m[0][index] = matrix.m[0][index] * factor;
     return result;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT> operator*(const QGenericMatrix<N, M, T, InnerT>& matrix, T factor)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T> operator*(const QGenericMatrix<N, M, T>& matrix, T factor)
 {
-    InnerT f(factor);
-    QGenericMatrix<N, M, T, InnerT> result(1);
+    QGenericMatrix<N, M, T> result(1);
     for (int index = 0; index < N * M; ++index)
-        result.m[0][index] = matrix.m[0][index] * f;
+        result.m[0][index] = matrix.m[0][index] * factor;
     return result;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T, InnerT> operator/(const QGenericMatrix<N, M, T, InnerT>& matrix, T divisor)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE QGenericMatrix<N, M, T> operator/(const QGenericMatrix<N, M, T>& matrix, T divisor)
 {
-    InnerT d(divisor);
-    QGenericMatrix<N, M, T, InnerT> result(1);
+    QGenericMatrix<N, M, T> result(1);
     for (int index = 0; index < N * M; ++index)
-        result.m[0][index] = matrix.m[0][index] / d;
+        result.m[0][index] = matrix.m[0][index] / divisor;
     return result;
 }
 
-template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T, InnerT>::toValueArray(T *values)
+template <int N, int M, typename T>
+Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T>::toValueArray(T *values)
 {
     for (int col = 0; col < N; ++col)
         for (int row = 0; row < M; ++row)
@@ -329,22 +324,22 @@ Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T, InnerT>::toValueArray(T *value
 }
 
 // Define aliases for the useful variants of QGenericMatrix.
-typedef QGenericMatrix<2, 2, qreal, float> QMatrix2x2;
-typedef QGenericMatrix<2, 3, qreal, float> QMatrix2x3;
-typedef QGenericMatrix<2, 4, qreal, float> QMatrix2x4;
-typedef QGenericMatrix<3, 2, qreal, float> QMatrix3x2;
-typedef QGenericMatrix<3, 3, qreal, float> QMatrix3x3;
-typedef QGenericMatrix<3, 4, qreal, float> QMatrix3x4;
-typedef QGenericMatrix<4, 2, qreal, float> QMatrix4x2;
-typedef QGenericMatrix<4, 3, qreal, float> QMatrix4x3;
+typedef QGenericMatrix<2, 2, qreal> QMatrix2x2;
+typedef QGenericMatrix<2, 3, qreal> QMatrix2x3;
+typedef QGenericMatrix<2, 4, qreal> QMatrix2x4;
+typedef QGenericMatrix<3, 2, qreal> QMatrix3x2;
+typedef QGenericMatrix<3, 3, qreal> QMatrix3x3;
+typedef QGenericMatrix<3, 4, qreal> QMatrix3x4;
+typedef QGenericMatrix<4, 2, qreal> QMatrix4x2;
+typedef QGenericMatrix<4, 3, qreal> QMatrix4x3;
 
 #ifndef QT_NO_DEBUG_STREAM
 
-template <int N, int M, typename T, typename InnerT>
-QDebug operator<<(QDebug dbg, const QGenericMatrix<N, M, T, InnerT> &m)
+template <int N, int M, typename T>
+QDebug operator<<(QDebug dbg, const QGenericMatrix<N, M, T> &m)
 {
     dbg.nospace() << "QGenericMatrix<" << N << ", " << M
-        << ", " << QTypeInfo<T>::name() << ", " << QTypeInfo<InnerT>::name()
+        << ", " << QTypeInfo<T>::name()
         << ">(" << endl << qSetFieldWidth(10);
     for (int row = 0; row < M; ++row) {
         for (int col = 0; col < N; ++col)
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index eb5858c..2164aca 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -103,7 +103,7 @@ QMatrix4x4::QMatrix4x4(const qreal *values)
 #if !defined(QT_NO_MEMBER_TEMPLATES) || defined(Q_QDOC)
 
 /*!
-    \fn QMatrix4x4::QMatrix4x4(const QGenericMatrix<N, M, qreal, float>& matrix)
+    \fn QMatrix4x4::QMatrix4x4(const QGenericMatrix<N, M, qreal>& matrix)
 
     Constructs a 4x4 matrix from the left-most 4 columns and top-most
     4 rows of \a matrix.  If \a matrix has less than 4 columns or rows,
@@ -114,7 +114,7 @@ QMatrix4x4::QMatrix4x4(const qreal *values)
 */
 
 /*!
-    \fn QGenericMatrix<N, M, qreal, float> QMatrix4x4::toGenericMatrix() const
+    \fn QGenericMatrix<N, M, qreal> QMatrix4x4::toGenericMatrix() const
 
     Constructs a NxM generic matrix from the left-most N columns and
     top-most M rows of this 4x4 matrix.  If N or M is greater than 4,
@@ -127,7 +127,7 @@ QMatrix4x4::QMatrix4x4(const qreal *values)
 #endif
 
 /*!
-    \fn QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix<N, M, qreal, float>& matrix)
+    \fn QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix<N, M, qreal>& matrix)
     \relates QMatrix4x4
 
     Returns a 4x4 matrix constructed from the left-most 4 columns and
@@ -139,7 +139,7 @@ QMatrix4x4::QMatrix4x4(const qreal *values)
 */
 
 /*!
-    \fn QGenericMatrix<N, M, qreal, float> qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix)
+    \fn QGenericMatrix<N, M, qreal> qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix)
     \relates QMatrix4x4
 
     Returns a NxM generic matrix constructed from the left-most N columns
@@ -153,7 +153,7 @@ QMatrix4x4::QMatrix4x4(const qreal *values)
 /*!
     \internal
 */
-QMatrix4x4::QMatrix4x4(const float *values, int cols, int rows)
+QMatrix4x4::QMatrix4x4(const qreal *values, int cols, int rows)
 {
     for (int col = 0; col < 4; ++col) {
         for (int row = 0; row < 4; ++row) {
@@ -233,15 +233,16 @@ QMatrix4x4::QMatrix4x4(const QTransform& transform)
 }
 
 /*!
-    \fn qreal QMatrix4x4::operator()(int row, int column) const
+    \fn const qreal& QMatrix4x4::operator()(int row, int column) const
 
-    Returns the element at position (\a row, \a column) in this matrix.
+    Returns a constant reference to the element at position
+    (\a row, \a column) in this matrix.
 
     \sa column(), row()
 */
 
 /*!
-    \fn float& QMatrix4x4::operator()(int row, int column)
+    \fn qreal& QMatrix4x4::operator()(int row, int column)
 
     Returns a reference to the element at position (\a row, \a column)
     in this matrix so that the element can be assigned to.
@@ -312,8 +313,8 @@ QMatrix4x4::QMatrix4x4(const QTransform& transform)
 //     | A B C |
 // M = | D E F |   det(M) = A * (EI - HF) - B * (DI - GF) + C * (DH - GE)
 //     | G H I |
-static inline float matrixDet3
-    (const float m[4][4], int col0, int col1, int col2,
+static inline qreal matrixDet3
+    (const qreal m[4][4], int col0, int col1, int col2,
      int row0, int row1, int row2)
 {
     return m[col0][row0] *
@@ -328,9 +329,9 @@ static inline float matrixDet3
 }
 
 // Calculate the determinant of a 4x4 matrix.
-static inline float matrixDet4(const float m[4][4])
+static inline qreal matrixDet4(const qreal m[4][4])
 {
-    float det;
+    qreal det;
     det  = m[0][0] * matrixDet3(m, 1, 2, 3, 1, 2, 3);
     det -= m[1][0] * matrixDet3(m, 0, 2, 3, 1, 2, 3);
     det += m[2][0] * matrixDet3(m, 0, 1, 3, 1, 2, 3);
@@ -382,7 +383,7 @@ QMatrix4x4 QMatrix4x4::inverted(bool *invertible) const
 
     QMatrix4x4 inv(1); // The "1" says to not load the identity.
 
-    float det = matrixDet4(m);
+    qreal det = matrixDet4(m);
     if (det == 0.0f) {
         if (invertible)
             *invertible = false;
@@ -436,12 +437,12 @@ QMatrix3x3 QMatrix4x4::normalMatrix() const
         return inv;
     }
 
-    float det = matrixDet3(m, 0, 1, 2, 0, 1, 2);
+    qreal det = matrixDet3(m, 0, 1, 2, 0, 1, 2);
     if (det == 0.0f)
         return inv;
     det = 1.0f / det;
 
-    float *invm = inv.data();
+    qreal *invm = inv.data();
 
     // Invert and transpose in a single step.
     invm[0 + 0 * 3] =  (m[1][1] * m[2][2] - m[2][1] * m[1][2]) * det;
@@ -697,9 +698,9 @@ QMatrix4x4 operator/(const QMatrix4x4& matrix, qreal divisor)
 */
 QMatrix4x4& QMatrix4x4::scale(const QVector3D& vector)
 {
-    float vx = vector.xp;
-    float vy = vector.yp;
-    float vz = vector.zp;
+    qreal vx = vector.x();
+    qreal vy = vector.y();
+    qreal vz = vector.z();
     if (flagBits == Identity) {
         m[0][0] = vx;
         m[1][1] = vy;
@@ -743,28 +744,26 @@ QMatrix4x4& QMatrix4x4::scale(const QVector3D& vector)
 */
 QMatrix4x4& QMatrix4x4::scale(qreal x, qreal y)
 {
-    float vx(x);
-    float vy(y);
     if (flagBits == Identity) {
-        m[0][0] = vx;
-        m[1][1] = vy;
+        m[0][0] = x;
+        m[1][1] = y;
         flagBits = Scale;
     } else if (flagBits == Scale || flagBits == (Scale | Translation)) {
-        m[0][0] *= vx;
-        m[1][1] *= vy;
+        m[0][0] *= x;
+        m[1][1] *= y;
     } else if (flagBits == Translation) {
-        m[0][0] = vx;
-        m[1][1] = vy;
+        m[0][0] = x;
+        m[1][1] = y;
         flagBits |= Scale;
     } else {
-        m[0][0] *= vx;
-        m[0][1] *= vx;
-        m[0][2] *= vx;
-        m[0][3] *= vx;
-        m[1][0] *= vy;
-        m[1][1] *= vy;
-        m[1][2] *= vy;
-        m[1][3] *= vy;
+        m[0][0] *= x;
+        m[0][1] *= x;
+        m[0][2] *= x;
+        m[0][3] *= x;
+        m[1][0] *= y;
+        m[1][1] *= y;
+        m[1][2] *= y;
+        m[1][3] *= y;
         flagBits = General;
     }
     return *this;
@@ -780,36 +779,33 @@ QMatrix4x4& QMatrix4x4::scale(qreal x, qreal y)
 */
 QMatrix4x4& QMatrix4x4::scale(qreal x, qreal y, qreal z)
 {
-    float vx(x);
-    float vy(y);
-    float vz(z);
     if (flagBits == Identity) {
-        m[0][0] = vx;
-        m[1][1] = vy;
-        m[2][2] = vz;
+        m[0][0] = x;
+        m[1][1] = y;
+        m[2][2] = z;
         flagBits = Scale;
     } else if (flagBits == Scale || flagBits == (Scale | Translation)) {
-        m[0][0] *= vx;
-        m[1][1] *= vy;
-        m[2][2] *= vz;
+        m[0][0] *= x;
+        m[1][1] *= y;
+        m[2][2] *= z;
     } else if (flagBits == Translation) {
-        m[0][0] = vx;
-        m[1][1] = vy;
-        m[2][2] = vz;
+        m[0][0] = x;
+        m[1][1] = y;
+        m[2][2] = z;
         flagBits |= Scale;
     } else {
-        m[0][0] *= vx;
-        m[0][1] *= vx;
-        m[0][2] *= vx;
-        m[0][3] *= vx;
-        m[1][0] *= vy;
-        m[1][1] *= vy;
-        m[1][2] *= vy;
-        m[1][3] *= vy;
-        m[2][0] *= vz;
-        m[2][1] *= vz;
-        m[2][2] *= vz;
-        m[2][3] *= vz;
+        m[0][0] *= x;
+        m[0][1] *= x;
+        m[0][2] *= x;
+        m[0][3] *= x;
+        m[1][0] *= y;
+        m[1][1] *= y;
+        m[1][2] *= y;
+        m[1][3] *= y;
+        m[2][0] *= z;
+        m[2][1] *= z;
+        m[2][2] *= z;
+        m[2][3] *= z;
         flagBits = General;
     }
     return *this;
@@ -866,9 +862,9 @@ QMatrix4x4& QMatrix4x4::scale(qreal factor)
 */
 QMatrix4x4& QMatrix4x4::translate(const QVector3D& vector)
 {
-    float vx = vector.xp;
-    float vy = vector.yp;
-    float vz = vector.zp;
+    qreal vx = vector.x();
+    qreal vy = vector.y();
+    qreal vz = vector.z();
     if (flagBits == Identity) {
         m[3][0] = vx;
         m[3][1] = vy;
@@ -912,28 +908,26 @@ QMatrix4x4& QMatrix4x4::translate(const QVector3D& vector)
 */
 QMatrix4x4& QMatrix4x4::translate(qreal x, qreal y)
 {
-    float vx(x);
-    float vy(y);
     if (flagBits == Identity) {
-        m[3][0] = vx;
-        m[3][1] = vy;
+        m[3][0] = x;
+        m[3][1] = y;
         flagBits = Translation;
     } else if (flagBits == Translation) {
-        m[3][0] += vx;
-        m[3][1] += vy;
+        m[3][0] += x;
+        m[3][1] += y;
     } else if (flagBits == Scale) {
-        m[3][0] = m[0][0] * vx;
-        m[3][1] = m[1][1] * vy;
+        m[3][0] = m[0][0] * x;
+        m[3][1] = m[1][1] * y;
         m[3][2] = 0.;
         flagBits |= Translation;
     } else if (flagBits == (Scale | Translation)) {
-        m[3][0] += m[0][0] * vx;
-        m[3][1] += m[1][1] * vy;
+        m[3][0] += m[0][0] * x;
+        m[3][1] += m[1][1] * y;
     } else {
-        m[3][0] += m[0][0] * vx + m[1][0] * vy;
-        m[3][1] += m[0][1] * vx + m[1][1] * vy;
-        m[3][2] += m[0][2] * vx + m[1][2] * vy;
-        m[3][3] += m[0][3] * vx + m[1][3] * vy;
+        m[3][0] += m[0][0] * x + m[1][0] * y;
+        m[3][1] += m[0][1] * x + m[1][1] * y;
+        m[3][2] += m[0][2] * x + m[1][2] * y;
+        m[3][3] += m[0][3] * x + m[1][3] * y;
         if (flagBits == Rotation)
             flagBits |= Translation;
         else if (flagBits != (Rotation | Translation))
@@ -952,32 +946,29 @@ QMatrix4x4& QMatrix4x4::translate(qreal x, qreal y)
 */
 QMatrix4x4& QMatrix4x4::translate(qreal x, qreal y, qreal z)
 {
-    float vx(x);
-    float vy(y);
-    float vz(z);
     if (flagBits == Identity) {
-        m[3][0] = vx;
-        m[3][1] = vy;
-        m[3][2] = vz;
+        m[3][0] = x;
+        m[3][1] = y;
+        m[3][2] = z;
         flagBits = Translation;
     } else if (flagBits == Translation) {
-        m[3][0] += vx;
-        m[3][1] += vy;
-        m[3][2] += vz;
+        m[3][0] += x;
+        m[3][1] += y;
+        m[3][2] += z;
     } else if (flagBits == Scale) {
-        m[3][0] = m[0][0] * vx;
-        m[3][1] = m[1][1] * vy;
-        m[3][2] = m[2][2] * vz;
+        m[3][0] = m[0][0] * x;
+        m[3][1] = m[1][1] * y;
+        m[3][2] = m[2][2] * z;
         flagBits |= Translation;
     } else if (flagBits == (Scale | Translation)) {
-        m[3][0] += m[0][0] * vx;
-        m[3][1] += m[1][1] * vy;
-        m[3][2] += m[2][2] * vz;
+        m[3][0] += m[0][0] * x;
+        m[3][1] += m[1][1] * y;
+        m[3][2] += m[2][2] * z;
     } else {
-        m[3][0] += m[0][0] * vx + m[1][0] * vy + m[2][0] * vz;
-        m[3][1] += m[0][1] * vx + m[1][1] * vy + m[2][1] * vz;
-        m[3][2] += m[0][2] * vx + m[1][2] * vy + m[2][2] * vz;
-        m[3][3] += m[0][3] * vx + m[1][3] * vy + m[2][3] * vz;
+        m[3][0] += m[0][0] * x + m[1][0] * y + m[2][0] * z;
+        m[3][1] += m[0][1] * x + m[1][1] * y + m[2][1] * z;
+        m[3][2] += m[0][2] * x + m[1][2] * y + m[2][2] * z;
+        m[3][3] += m[0][3] * x + m[1][3] * y + m[2][3] * z;
         if (flagBits == Rotation)
             flagBits |= Translation;
         else if (flagBits != (Rotation | Translation))
@@ -1126,15 +1117,15 @@ QMatrix4x4& QMatrix4x4::rotate(const QQuaternion& quaternion)
     // Algorithm from:
     // http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q54
     QMatrix4x4 m(1);
-    float xx = quaternion.xp * quaternion.xp;
-    float xy = quaternion.xp * quaternion.yp;
-    float xz = quaternion.xp * quaternion.zp;
-    float xw = quaternion.xp * quaternion.wp;
-    float yy = quaternion.yp * quaternion.yp;
-    float yz = quaternion.yp * quaternion.zp;
-    float yw = quaternion.yp * quaternion.wp;
-    float zz = quaternion.zp * quaternion.zp;
-    float zw = quaternion.zp * quaternion.wp;
+    qreal xx = quaternion.x() * quaternion.x();
+    qreal xy = quaternion.x() * quaternion.y();
+    qreal xz = quaternion.x() * quaternion.z();
+    qreal xw = quaternion.x() * quaternion.scalar();
+    qreal yy = quaternion.y() * quaternion.y();
+    qreal yz = quaternion.y() * quaternion.z();
+    qreal yw = quaternion.y() * quaternion.scalar();
+    qreal zz = quaternion.z() * quaternion.z();
+    qreal zw = quaternion.z() * quaternion.scalar();
     m.m[0][0] = 1.0f - 2 * (yy + zz);
     m.m[1][0] =        2 * (xy - zw);
     m.m[2][0] =        2 * (xz + yw);
@@ -1222,11 +1213,11 @@ QMatrix4x4& QMatrix4x4::ortho(qreal left, qreal right, qreal bottom, qreal top,
         translate(QVector3D
             (-(left + right) / width,
              -(top + bottom) / invheight,
-             0.0f, 1));
+             0.0f));
         scale(QVector3D
             (2.0f / width,
              2.0f / invheight,
-             -1.0f, 1));
+             -1.0f));
         return *this;
     }
 #endif
@@ -1356,17 +1347,17 @@ QMatrix4x4& QMatrix4x4::lookAt(const QVector3D& eye, const QVector3D& center, co
 
     QMatrix4x4 m(1);
 
-    m.m[0][0] = side.xp;
-    m.m[1][0] = side.yp;
-    m.m[2][0] = side.zp;
+    m.m[0][0] = side.x();
+    m.m[1][0] = side.y();
+    m.m[2][0] = side.z();
     m.m[3][0] = 0.0f;
-    m.m[0][1] = upVector.xp;
-    m.m[1][1] = upVector.yp;
-    m.m[2][1] = upVector.zp;
+    m.m[0][1] = upVector.x();
+    m.m[1][1] = upVector.y();
+    m.m[2][1] = upVector.z();
     m.m[3][1] = 0.0f;
-    m.m[0][2] = -forward.xp;
-    m.m[1][2] = -forward.yp;
-    m.m[2][2] = -forward.zp;
+    m.m[0][2] = -forward.x();
+    m.m[1][2] = -forward.y();
+    m.m[2][2] = -forward.z();
     m.m[3][2] = 0.0f;
     m.m[0][3] = 0.0f;
     m.m[1][3] = 0.0f;
@@ -1434,9 +1425,9 @@ void QMatrix4x4::toValueArray(qreal *values) const
 */
 QMatrix QMatrix4x4::toAffine() const
 {
-    return QMatrix(qreal(m[0][0]), qreal(m[0][1]),
-                   qreal(m[1][0]), qreal(m[1][1]),
-                   qreal(m[3][0]), qreal(m[3][1]));
+    return QMatrix(m[0][0], m[0][1],
+                   m[1][0], m[1][1],
+                   m[3][0], m[3][1]);
 }
 
 static const qreal inv_dist_to_plane = 1. / 1024.;
@@ -1462,15 +1453,12 @@ QTransform QMatrix4x4::toTransform(qreal distanceToPlane) const
 {
     if (distanceToPlane == 1024.0f) {
         // Optimize the common case with constants.
-        return QTransform(qreal(m[0][0]), qreal(m[0][1]),
-                                qreal(m[0][3]) - qreal(m[0][2]) *
-                                                 inv_dist_to_plane,
-                          qreal(m[1][0]), qreal(m[1][1]),
-                                qreal(m[1][3]) - qreal(m[1][2]) *
-                                                 inv_dist_to_plane,
-                          qreal(m[3][0]), qreal(m[3][1]),
-                                qreal(m[3][3]) - qreal(m[3][2]) *
-                                                 inv_dist_to_plane);
+        return QTransform(m[0][0], m[0][1],
+                                m[0][3] - m[0][2] * inv_dist_to_plane,
+                          m[1][0], m[1][1],
+                                m[1][3] - m[1][2] * inv_dist_to_plane,
+                          m[3][0], m[3][1],
+                                m[3][3] - m[3][2] * inv_dist_to_plane);
     } else if (distanceToPlane != 0.0f) {
         // The following projection matrix is pre-multiplied with "matrix":
         //      | 1 0 0 0 |
@@ -1480,17 +1468,14 @@ QTransform QMatrix4x4::toTransform(qreal distanceToPlane) const
         // where d = -1 / distanceToPlane.  After projection, row 3 and
         // column 3 are dropped to form the final QTransform.
         qreal d = 1.0f / distanceToPlane;
-        return QTransform(qreal(m[0][0]), qreal(m[0][1]),
-                                qreal(m[0][3]) - qreal(m[0][2]) * d,
-                          qreal(m[1][0]), qreal(m[1][1]),
-                                qreal(m[1][3]) - qreal(m[1][2]) * d,
-                          qreal(m[3][0]), qreal(m[3][1]),
-                                qreal(m[3][3]) - qreal(m[3][2]) * d);
+        return QTransform(m[0][0], m[0][1], m[0][3] - m[0][2] * d,
+                          m[1][0], m[1][1], m[1][3] - m[1][2] * d,
+                          m[3][0], m[3][1], m[3][3] - m[3][2] * d);
     } else {
         // Orthographic projection: drop row 3 and column 3.
-        return QTransform(qreal(m[0][0]), qreal(m[0][1]), qreal(m[0][3]),
-                          qreal(m[1][0]), qreal(m[1][1]), qreal(m[1][3]),
-                          qreal(m[3][0]), qreal(m[3][1]), qreal(m[3][3]));
+        return QTransform(m[0][0], m[0][1], m[0][3],
+                          m[1][0], m[1][1], m[1][3],
+                          m[3][0], m[3][1], m[3][3]);
     }
 }
 
@@ -1618,28 +1603,25 @@ QRectF QMatrix4x4::mapRect(const QRectF& rect) const
 }
 
 /*!
-    \fn float *QMatrix4x4::data()
+    \fn qreal *QMatrix4x4::data()
 
-    Returns a pointer to the raw data of this matrix.  This is intended
-    for use with raw GL functions.
+    Returns a pointer to the raw data of this matrix.
 
     \sa constData(), inferSpecialType()
 */
 
 /*!
-    \fn const float *QMatrix4x4::data() const
+    \fn const qreal *QMatrix4x4::data() const
 
     Returns a constant pointer to the raw data of this matrix.
-    This is intended for use with raw GL functions.
 
     \sa constData()
 */
 
 /*!
-    \fn const float *QMatrix4x4::constData() const
+    \fn const qreal *QMatrix4x4::constData() const
 
     Returns a constant pointer to the raw data of this matrix.
-    This is intended for use with raw GL functions.
 
     \sa data()
 */
@@ -1695,7 +1677,7 @@ void QMatrix4x4::extractAxisRotation(qreal &angle, QVector3D &axis) const
 {
     // Orientation is dependent on the upper 3x3 matrix; subtract the
     // homogeneous scaling element from the trace of the 4x4 matrix
-    float tr = m[0][0] + m[1][1] + m[2][2];
+    qreal tr = m[0][0] + m[1][1] + m[2][2];
     qreal cosa = qreal(0.5f * (tr - 1.0f));
     angle = acos(cosa) * 180.0f / M_PI;
 
@@ -1708,38 +1690,38 @@ void QMatrix4x4::extractAxisRotation(qreal &angle, QVector3D &axis) const
     }
 
     if (angle < 180.0f) {
-        axis.xp = m[1][2] - m[2][1];
-        axis.yp = m[2][0] - m[0][2];
-        axis.zp = m[0][1] - m[1][0];
+        axis.setX(m[1][2] - m[2][1]);
+        axis.setY(m[2][0] - m[0][2]);
+        axis.setZ(m[0][1] - m[1][0]);
         axis.normalize();
         return;
     }
 
     // rads == PI
-    float tmp;
+    qreal tmp;
 
     // r00 is maximum
     if ((m[0][0] >= m[2][2]) && (m[0][0] >= m[1][1])) {
-        axis.xp = 0.5f * qSqrt(m[0][0] - m[1][1] - m[2][2] + 1.0f);
+        axis.setX(0.5f * qSqrt(m[0][0] - m[1][1] - m[2][2] + 1.0f));
         tmp = 0.5f / axis.x();
-        axis.yp = m[1][0] * tmp;
-        axis.zp = m[2][0] * tmp;
+        axis.setY(m[1][0] * tmp);
+        axis.setZ(m[2][0] * tmp);
     }
 
     // r11 is maximum
     if ((m[1][1] >= m[2][2]) && (m[1][1] >= m[0][0])) {
-        axis.yp = 0.5f * qSqrt(m[1][1] - m[0][0] - m[2][2] + 1.0f);
+        axis.setY(0.5f * qSqrt(m[1][1] - m[0][0] - m[2][2] + 1.0f));
         tmp = 0.5f / axis.y();
-        axis.xp = tmp * m[1][0];
-        axis.zp = tmp * m[2][1];
+        axis.setX(tmp * m[1][0]);
+        axis.setZ(tmp * m[2][1]);
     }
 
     // r22 is maximum
     if ((m[2][2] >= m[1][1]) && (m[2][2] >= m[0][0])) {
-        axis.zp = 0.5f * qSqrt(m[2][2] - m[0][0] - m[1][1] + 1.0f);
+        axis.setZ(0.5f * qSqrt(m[2][2] - m[0][0] - m[1][1] + 1.0f));
         tmp = 0.5f / axis.z();
-        axis.xp = m[2][0]*tmp;
-        axis.yp = m[2][1]*tmp;
+        axis.setX(m[2][0]*tmp);
+        axis.setY(m[2][1]*tmp);
     }
 }
 
@@ -1756,7 +1738,7 @@ QVector3D QMatrix4x4::extractTranslation() const
     return QVector3D
         (m[0][0] * m[3][0] + m[0][1] * m[3][1] + m[0][2] * m[3][2],
          m[1][0] * m[3][0] + m[1][1] * m[3][1] + m[1][2] * m[3][2],
-         m[2][0] * m[3][0] + m[2][1] * m[3][1] + m[2][2] * m[3][2], 1);
+         m[2][0] * m[3][0] + m[2][1] * m[3][1] + m[2][2] * m[3][2]);
 }
 #endif
 
@@ -1894,7 +1876,7 @@ QDataStream &operator>>(QDataStream &stream, QMatrix4x4 &matrix)
     for (int row = 0; row < 4; ++row) {
         for (int col = 0; col < 4; ++col) {
             stream >> x;
-            matrix(row, col) = float(x);
+            matrix(row, col) = qreal(x);
         }
     }
     matrix.inferSpecialType();
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 4207bdf..8811027 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -71,14 +71,14 @@ public:
                       qreal m41, qreal m42, qreal m43, qreal m44);
 #if !defined(QT_NO_MEMBER_TEMPLATES) || defined(Q_QDOC)
     template <int N, int M>
-    explicit QMatrix4x4(const QGenericMatrix<N, M, qreal, float>& matrix);
+    explicit QMatrix4x4(const QGenericMatrix<N, M, qreal>& matrix);
 #endif
-    QMatrix4x4(const float *values, int cols, int rows);
+    QMatrix4x4(const qreal *values, int cols, int rows);
     QMatrix4x4(const QTransform& transform);
     QMatrix4x4(const QMatrix& matrix);
 
-    inline qreal operator()(int row, int column) const;
-    inline float& operator()(int row, int column);
+    inline const qreal& operator()(int row, int column) const;
+    inline qreal& operator()(int row, int column);
 
     inline QVector4D column(int index) const;
     inline void setColumn(int index, const QVector4D& value);
@@ -174,12 +174,12 @@ public:
 
 #if !defined(QT_NO_MEMBER_TEMPLATES) || defined(Q_QDOC)
     template <int N, int M>
-    QGenericMatrix<N, M, qreal, float> toGenericMatrix() const;
+    QGenericMatrix<N, M, qreal> toGenericMatrix() const;
 #endif
 
-    inline float *data();
-    inline const float *data() const { return m[0]; }
-    inline const float *constData() const { return m[0]; }
+    inline qreal *data();
+    inline const qreal *data() const { return m[0]; }
+    inline const qreal *constData() const { return m[0]; }
 
     void inferSpecialType();
 
@@ -190,7 +190,7 @@ public:
 #endif
 
 private:
-    float m[4][4];          // Column-major order to match OpenGL.
+    qreal m[4][4];          // Column-major order to match OpenGL.
     int flagBits;           // Flag bits from the enum below.
 
     enum {
@@ -224,9 +224,9 @@ inline QMatrix4x4::QMatrix4x4
 
 template <int N, int M>
 Q_INLINE_TEMPLATE QMatrix4x4::QMatrix4x4
-    (const QGenericMatrix<N, M, qreal, float>& matrix)
+    (const QGenericMatrix<N, M, qreal>& matrix)
 {
-    const float *values = matrix.constData();
+    const qreal *values = matrix.constData();
     for (int col = 0; col < 4; ++col) {
         for (int row = 0; row < 4; ++row) {
             if (col < N && row < M)
@@ -241,10 +241,10 @@ Q_INLINE_TEMPLATE QMatrix4x4::QMatrix4x4
 }
 
 template <int N, int M>
-QGenericMatrix<N, M, qreal, float> QMatrix4x4::toGenericMatrix() const
+QGenericMatrix<N, M, qreal> QMatrix4x4::toGenericMatrix() const
 {
-    QGenericMatrix<N, M, qreal, float> result;
-    float *values = result.data();
+    QGenericMatrix<N, M, qreal> result;
+    qreal *values = result.data();
     for (int col = 0; col < N; ++col) {
         for (int row = 0; row < M; ++row) {
             if (col < 4 && row < 4)
@@ -260,13 +260,13 @@ QGenericMatrix<N, M, qreal, float> QMatrix4x4::toGenericMatrix() const
 
 #endif
 
-inline qreal QMatrix4x4::operator()(int row, int column) const
+inline const qreal& QMatrix4x4::operator()(int row, int column) const
 {
     Q_ASSERT(row >= 0 && row < 4 && column >= 0 && column < 4);
-    return qreal(m[column][row]);
+    return m[column][row];
 }
 
-inline float& QMatrix4x4::operator()(int row, int column)
+inline qreal& QMatrix4x4::operator()(int row, int column)
 {
     Q_ASSERT(row >= 0 && row < 4 && column >= 0 && column < 4);
     flagBits = General;
@@ -276,32 +276,32 @@ inline float& QMatrix4x4::operator()(int row, int column)
 inline QVector4D QMatrix4x4::column(int index) const
 {
     Q_ASSERT(index >= 0 && index < 4);
-    return QVector4D(m[index][0], m[index][1], m[index][2], m[index][3], 1);
+    return QVector4D(m[index][0], m[index][1], m[index][2], m[index][3]);
 }
 
 inline void QMatrix4x4::setColumn(int index, const QVector4D& value)
 {
     Q_ASSERT(index >= 0 && index < 4);
-    m[index][0] = value.xp;
-    m[index][1] = value.yp;
-    m[index][2] = value.zp;
-    m[index][3] = value.wp;
+    m[index][0] = value.x();
+    m[index][1] = value.y();
+    m[index][2] = value.z();
+    m[index][3] = value.w();
     flagBits = General;
 }
 
 inline QVector4D QMatrix4x4::row(int index) const
 {
     Q_ASSERT(index >= 0 && index < 4);
-    return QVector4D(m[0][index], m[1][index], m[2][index], m[3][index], 1);
+    return QVector4D(m[0][index], m[1][index], m[2][index], m[3][index]);
 }
 
 inline void QMatrix4x4::setRow(int index, const QVector4D& value)
 {
     Q_ASSERT(index >= 0 && index < 4);
-    m[0][index] = value.xp;
-    m[1][index] = value.yp;
-    m[2][index] = value.zp;
-    m[3][index] = value.wp;
+    m[0][index] = value.x();
+    m[1][index] = value.y();
+    m[2][index] = value.z();
+    m[3][index] = value.w();
     flagBits = General;
 }
 
@@ -608,68 +608,68 @@ inline QMatrix4x4 operator*(const QMatrix4x4& m1, const QMatrix4x4& m2)
 
 inline QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix)
 {
-    float x, y, z, w;
-    x = vector.xp * matrix.m[0][0] +
-        vector.yp * matrix.m[0][1] +
-        vector.zp * matrix.m[0][2] +
+    qreal x, y, z, w;
+    x = vector.x() * matrix.m[0][0] +
+        vector.y() * matrix.m[0][1] +
+        vector.z() * matrix.m[0][2] +
         matrix.m[0][3];
-    y = vector.xp * matrix.m[1][0] +
-        vector.yp * matrix.m[1][1] +
-        vector.zp * matrix.m[1][2] +
+    y = vector.x() * matrix.m[1][0] +
+        vector.y() * matrix.m[1][1] +
+        vector.z() * matrix.m[1][2] +
         matrix.m[1][3];
-    z = vector.xp * matrix.m[2][0] +
-        vector.yp * matrix.m[2][1] +
-        vector.zp * matrix.m[2][2] +
+    z = vector.x() * matrix.m[2][0] +
+        vector.y() * matrix.m[2][1] +
+        vector.z() * matrix.m[2][2] +
         matrix.m[2][3];
-    w = vector.xp * matrix.m[3][0] +
-        vector.yp * matrix.m[3][1] +
-        vector.zp * matrix.m[3][2] +
+    w = vector.x() * matrix.m[3][0] +
+        vector.y() * matrix.m[3][1] +
+        vector.z() * matrix.m[3][2] +
         matrix.m[3][3];
     if (w == 1.0f)
-        return QVector3D(x, y, z, 1);
+        return QVector3D(x, y, z);
     else
-        return QVector3D(x / w, y / w, z / w, 1);
+        return QVector3D(x / w, y / w, z / w);
 }
 
 inline QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector)
 {
-    float x, y, z, w;
+    qreal x, y, z, w;
     if (matrix.flagBits == QMatrix4x4::Identity) {
         return vector;
     } else if (matrix.flagBits == QMatrix4x4::Translation) {
-        return QVector3D(vector.xp + matrix.m[3][0],
-                         vector.yp + matrix.m[3][1],
-                         vector.zp + matrix.m[3][2], 1);
+        return QVector3D(vector.x() + matrix.m[3][0],
+                         vector.y() + matrix.m[3][1],
+                         vector.z() + matrix.m[3][2]);
     } else if (matrix.flagBits ==
                     (QMatrix4x4::Translation | QMatrix4x4::Scale)) {
-        return QVector3D(vector.xp * matrix.m[0][0] + matrix.m[3][0],
-                         vector.yp * matrix.m[1][1] + matrix.m[3][1],
-                         vector.zp * matrix.m[2][2] + matrix.m[3][2], 1);
+        return QVector3D(vector.x() * matrix.m[0][0] + matrix.m[3][0],
+                         vector.y() * matrix.m[1][1] + matrix.m[3][1],
+                         vector.z() * matrix.m[2][2] + matrix.m[3][2]);
     } else if (matrix.flagBits == QMatrix4x4::Scale) {
-        return QVector3D(vector.xp * matrix.m[0][0],
-                         vector.yp * matrix.m[1][1],
-                         vector.zp * matrix.m[2][2], 1);
+        return QVector3D(vector.x() * matrix.m[0][0],
+                         vector.y() * matrix.m[1][1],
+                         vector.z() * matrix.m[2][2]);
     } else {
-        x = vector.xp * matrix.m[0][0] +
-            vector.yp * matrix.m[1][0] +
-            vector.zp * matrix.m[2][0] +
+        x = vector.x() * matrix.m[0][0] +
+            vector.y() * matrix.m[1][0] +
+            vector.z() * matrix.m[2][0] +
             matrix.m[3][0];
-        y = vector.xp * matrix.m[0][1] +
-            vector.yp * matrix.m[1][1] +
-            vector.zp * matrix.m[2][1] +
+        y = vector.x() * matrix.m[0][1] +
+            vector.y() * matrix.m[1][1] +
+            vector.z() * matrix.m[2][1] +
             matrix.m[3][1];
-        z = vector.xp * matrix.m[0][2] +
-            vector.yp * matrix.m[1][2] +
-            vector.zp * matrix.m[2][2] +
+        z = vector.x() * matrix.m[0][2] +
+            vector.y() * matrix.m[1][2] +
+            vector.z() * matrix.m[2][2] +
             matrix.m[3][2];
-        w = vector.xp * matrix.m[0][3] +
-            vector.yp * matrix.m[1][3] +
-            vector.zp * matrix.m[2][3] +
+        w = vector.x() * matrix.m[0][3] +
+            vector.y() * matrix.m[1][3] +
+            vector.z() * matrix.m[2][3] +
             matrix.m[3][3];
         if (w == 1.0f)
-            return QVector3D(x, y, z, 1);
+            return QVector3D(x, y, z);
         else
-            return QVector3D(x / w, y / w, z / w, 1);
+            return QVector3D(x / w, y / w, z / w);
     }
 }
 
@@ -679,54 +679,54 @@ inline QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector)
 
 inline QVector4D operator*(const QVector4D& vector, const QMatrix4x4& matrix)
 {
-    float x, y, z, w;
-    x = vector.xp * matrix.m[0][0] +
-        vector.yp * matrix.m[0][1] +
-        vector.zp * matrix.m[0][2] +
-        vector.wp * matrix.m[0][3];
-    y = vector.xp * matrix.m[1][0] +
-        vector.yp * matrix.m[1][1] +
-        vector.zp * matrix.m[1][2] +
-        vector.wp * matrix.m[1][3];
-    z = vector.xp * matrix.m[2][0] +
-        vector.yp * matrix.m[2][1] +
-        vector.zp * matrix.m[2][2] +
-        vector.wp * matrix.m[2][3];
-    w = vector.xp * matrix.m[3][0] +
-        vector.yp * matrix.m[3][1] +
-        vector.zp * matrix.m[3][2] +
-        vector.wp * matrix.m[3][3];
-    return QVector4D(x, y, z, w, 1);
+    qreal x, y, z, w;
+    x = vector.x() * matrix.m[0][0] +
+        vector.y() * matrix.m[0][1] +
+        vector.z() * matrix.m[0][2] +
+        vector.w() * matrix.m[0][3];
+    y = vector.x() * matrix.m[1][0] +
+        vector.y() * matrix.m[1][1] +
+        vector.z() * matrix.m[1][2] +
+        vector.w() * matrix.m[1][3];
+    z = vector.x() * matrix.m[2][0] +
+        vector.y() * matrix.m[2][1] +
+        vector.z() * matrix.m[2][2] +
+        vector.w() * matrix.m[2][3];
+    w = vector.x() * matrix.m[3][0] +
+        vector.y() * matrix.m[3][1] +
+        vector.z() * matrix.m[3][2] +
+        vector.w() * matrix.m[3][3];
+    return QVector4D(x, y, z, w);
 }
 
 inline QVector4D operator*(const QMatrix4x4& matrix, const QVector4D& vector)
 {
-    float x, y, z, w;
-    x = vector.xp * matrix.m[0][0] +
-        vector.yp * matrix.m[1][0] +
-        vector.zp * matrix.m[2][0] +
-        vector.wp * matrix.m[3][0];
-    y = vector.xp * matrix.m[0][1] +
-        vector.yp * matrix.m[1][1] +
-        vector.zp * matrix.m[2][1] +
-        vector.wp * matrix.m[3][1];
-    z = vector.xp * matrix.m[0][2] +
-        vector.yp * matrix.m[1][2] +
-        vector.zp * matrix.m[2][2] +
-        vector.wp * matrix.m[3][2];
-    w = vector.xp * matrix.m[0][3] +
-        vector.yp * matrix.m[1][3] +
-        vector.zp * matrix.m[2][3] +
-        vector.wp * matrix.m[3][3];
-    return QVector4D(x, y, z, w, 1);
+    qreal x, y, z, w;
+    x = vector.x() * matrix.m[0][0] +
+        vector.y() * matrix.m[1][0] +
+        vector.z() * matrix.m[2][0] +
+        vector.w() * matrix.m[3][0];
+    y = vector.x() * matrix.m[0][1] +
+        vector.y() * matrix.m[1][1] +
+        vector.z() * matrix.m[2][1] +
+        vector.w() * matrix.m[3][1];
+    z = vector.x() * matrix.m[0][2] +
+        vector.y() * matrix.m[1][2] +
+        vector.z() * matrix.m[2][2] +
+        vector.w() * matrix.m[3][2];
+    w = vector.x() * matrix.m[0][3] +
+        vector.y() * matrix.m[1][3] +
+        vector.z() * matrix.m[2][3] +
+        vector.w() * matrix.m[3][3];
+    return QVector4D(x, y, z, w);
 }
 
 #endif
 
 inline QPoint operator*(const QPoint& point, const QMatrix4x4& matrix)
 {
-    float xin, yin;
-    float x, y, w;
+    qreal xin, yin;
+    qreal x, y, w;
     xin = point.x();
     yin = point.y();
     x = xin * matrix.m[0][0] +
@@ -746,8 +746,8 @@ inline QPoint operator*(const QPoint& point, const QMatrix4x4& matrix)
 
 inline QPointF operator*(const QPointF& point, const QMatrix4x4& matrix)
 {
-    float xin, yin;
-    float x, y, w;
+    qreal xin, yin;
+    qreal x, y, w;
     xin = point.x();
     yin = point.y();
     x = xin * matrix.m[0][0] +
@@ -768,8 +768,8 @@ inline QPointF operator*(const QPointF& point, const QMatrix4x4& matrix)
 
 inline QPoint operator*(const QMatrix4x4& matrix, const QPoint& point)
 {
-    float xin, yin;
-    float x, y, w;
+    qreal xin, yin;
+    qreal x, y, w;
     xin = point.x();
     yin = point.y();
     if (matrix.flagBits == QMatrix4x4::Identity) {
@@ -803,8 +803,8 @@ inline QPoint operator*(const QMatrix4x4& matrix, const QPoint& point)
 
 inline QPointF operator*(const QMatrix4x4& matrix, const QPointF& point)
 {
-    float xin, yin;
-    float x, y, w;
+    qreal xin, yin;
+    qreal x, y, w;
     xin = point.x();
     yin = point.y();
     if (matrix.flagBits == QMatrix4x4::Identity) {
@@ -951,7 +951,7 @@ inline QVector4D QMatrix4x4::map(const QVector4D& point) const
 
 #endif
 
-inline float *QMatrix4x4::data()
+inline qreal *QMatrix4x4::data()
 {
     // We have to assume that the caller will modify the matrix elements,
     // so we flip it over to "General" mode.
@@ -969,17 +969,17 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QMatrix4x4 &);
 #endif
 
 template <int N, int M>
-QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix<N, M, qreal, float>& matrix)
+QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix<N, M, qreal>& matrix)
 {
     return QMatrix4x4(matrix.constData(), N, M);
 }
 
 template <int N, int M>
-QGenericMatrix<N, M, qreal, float> qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix)
+QGenericMatrix<N, M, qreal> qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix)
 {
-    QGenericMatrix<N, M, qreal, float> result;
-    const float *m = matrix.constData();
-    float *values = result.data();
+    QGenericMatrix<N, M, qreal> result;
+    const qreal *m = matrix.constData();
+    qreal *values = result.data();
     for (int col = 0; col < N; ++col) {
         for (int row = 0; row < M; ++row) {
             if (col < 4 && row < 4)
diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp
index ece4482..7206e9a 100644
--- a/src/gui/math3d/qquaternion.cpp
+++ b/src/gui/math3d/qquaternion.cpp
@@ -353,7 +353,7 @@ QQuaternion QQuaternion::fromAxisAndAngle(const QVector3D& axis, qreal angle)
     qreal s = qSin(a);
     qreal c = qCos(a);
     QVector3D ax = axis.normalized();
-    return QQuaternion(c, ax.xp * s, ax.yp * s, ax.zp * s, 1).normalized();
+    return QQuaternion(c, ax.x() * s, ax.y() * s, ax.z() * s).normalized();
 }
 
 #endif
@@ -365,19 +365,16 @@ QQuaternion QQuaternion::fromAxisAndAngle(const QVector3D& axis, qreal angle)
 QQuaternion QQuaternion::fromAxisAndAngle
         (qreal x, qreal y, qreal z, qreal angle)
 {
-    float xp = x;
-    float yp = y;
-    float zp = z;
-    qreal length = qSqrt(xp * xp + yp * yp + zp * zp);
-    if (!qIsNull(length)) {
-        xp /= length;
-        yp /= length;
-        zp /= length;
+    qreal length = qSqrt(x * x + y * y + z * z);
+    if (!qFuzzyIsNull(length - 1.0f) && !qFuzzyIsNull(length)) {
+        x /= length;
+        y /= length;
+        z /= length;
     }
     qreal a = (angle / 2.0f) * M_PI / 180.0f;
     qreal s = qSin(a);
     qreal c = qCos(a);
-    return QQuaternion(c, xp * s, yp * s, zp * s, 1).normalized();
+    return QQuaternion(c, x * s, y * s, z * s).normalized();
 }
 
 /*!
diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h
index 12576d2..f243c42 100644
--- a/src/gui/math3d/qquaternion.h
+++ b/src/gui/math3d/qquaternion.h
@@ -133,11 +133,7 @@ public:
         (const QQuaternion& q1, const QQuaternion& q2, qreal t);
 
 private:
-    float wp, xp, yp, zp;
-
-    friend class QMatrix4x4;
-
-    QQuaternion(float scalar, float xpos, float ypos, float zpos, int dummy);
+    qreal wp, xp, yp, zp;
 };
 
 inline QQuaternion::QQuaternion() : wp(1.0f), xp(0.0f), yp(0.0f), zp(0.0f) {}
@@ -145,8 +141,6 @@ inline QQuaternion::QQuaternion() : wp(1.0f), xp(0.0f), yp(0.0f), zp(0.0f) {}
 inline QQuaternion::QQuaternion(qreal scalar, qreal xpos, qreal ypos, qreal zpos) : wp(scalar), xp(xpos), yp(ypos), zp(zpos) {}
 
 
-inline QQuaternion::QQuaternion(float scalar, float xpos, float ypos, float zpos, int) : wp(scalar), xp(xpos), yp(ypos), zp(zpos) {}
-
 inline bool QQuaternion::isNull() const
 {
     return qIsNull(xp) && qIsNull(yp) && qIsNull(zp) && qIsNull(wp);
@@ -169,7 +163,7 @@ inline void QQuaternion::setScalar(qreal scalar) { wp = scalar; }
 
 inline QQuaternion QQuaternion::conjugate() const
 {
-    return QQuaternion(wp, -xp, -yp, -zp, 1);
+    return QQuaternion(wp, -xp, -yp, -zp);
 }
 
 inline QQuaternion &QQuaternion::operator+=(const QQuaternion &quaternion)
@@ -201,18 +195,18 @@ inline QQuaternion &QQuaternion::operator*=(qreal factor)
 
 inline const QQuaternion operator*(const QQuaternion &q1, const QQuaternion& q2)
 {
-    float ww = (q1.zp + q1.xp) * (q2.xp + q2.yp);
-    float yy = (q1.wp - q1.yp) * (q2.wp + q2.zp);
-    float zz = (q1.wp + q1.yp) * (q2.wp - q2.zp);
-    float xx = ww + yy + zz;
-    float qq = 0.5 * (xx + (q1.zp - q1.xp) * (q2.xp - q2.yp));
-
-    float w = qq - ww + (q1.zp - q1.yp) * (q2.yp - q2.zp);
-    float x = qq - xx + (q1.xp + q1.wp) * (q2.xp + q2.wp);
-    float y = qq - yy + (q1.wp - q1.xp) * (q2.yp + q2.zp);
-    float z = qq - zz + (q1.zp + q1.yp) * (q2.wp - q2.xp);
-
-    return QQuaternion(w, x, y, z, 1);
+    qreal ww = (q1.zp + q1.xp) * (q2.xp + q2.yp);
+    qreal yy = (q1.wp - q1.yp) * (q2.wp + q2.zp);
+    qreal zz = (q1.wp + q1.yp) * (q2.wp - q2.zp);
+    qreal xx = ww + yy + zz;
+    qreal qq = 0.5 * (xx + (q1.zp - q1.xp) * (q2.xp - q2.yp));
+
+    qreal w = qq - ww + (q1.zp - q1.yp) * (q2.yp - q2.zp);
+    qreal x = qq - xx + (q1.xp + q1.wp) * (q2.xp + q2.wp);
+    qreal y = qq - yy + (q1.wp - q1.xp) * (q2.yp + q2.zp);
+    qreal z = qq - zz + (q1.zp + q1.yp) * (q2.wp - q2.xp);
+
+    return QQuaternion(w, x, y, z);
 }
 
 inline QQuaternion &QQuaternion::operator*=(const QQuaternion &quaternion)
@@ -242,32 +236,32 @@ inline bool operator!=(const QQuaternion &q1, const QQuaternion &q2)
 
 inline const QQuaternion operator+(const QQuaternion &q1, const QQuaternion &q2)
 {
-    return QQuaternion(q1.wp + q2.wp, q1.xp + q2.xp, q1.yp + q2.yp, q1.zp + q2.zp, 1);
+    return QQuaternion(q1.wp + q2.wp, q1.xp + q2.xp, q1.yp + q2.yp, q1.zp + q2.zp);
 }
 
 inline const QQuaternion operator-(const QQuaternion &q1, const QQuaternion &q2)
 {
-    return QQuaternion(q1.wp - q2.wp, q1.xp - q2.xp, q1.yp - q2.yp, q1.zp - q2.zp, 1);
+    return QQuaternion(q1.wp - q2.wp, q1.xp - q2.xp, q1.yp - q2.yp, q1.zp - q2.zp);
 }
 
 inline const QQuaternion operator*(qreal factor, const QQuaternion &quaternion)
 {
-    return QQuaternion(quaternion.wp * factor, quaternion.xp * factor, quaternion.yp * factor, quaternion.zp * factor, 1);
+    return QQuaternion(quaternion.wp * factor, quaternion.xp * factor, quaternion.yp * factor, quaternion.zp * factor);
 }
 
 inline const QQuaternion operator*(const QQuaternion &quaternion, qreal factor)
 {
-    return QQuaternion(quaternion.wp * factor, quaternion.xp * factor, quaternion.yp * factor, quaternion.zp * factor, 1);
+    return QQuaternion(quaternion.wp * factor, quaternion.xp * factor, quaternion.yp * factor, quaternion.zp * factor);
 }
 
 inline const QQuaternion operator-(const QQuaternion &quaternion)
 {
-    return QQuaternion(-quaternion.wp, -quaternion.xp, -quaternion.yp, -quaternion.zp, 1);
+    return QQuaternion(-quaternion.wp, -quaternion.xp, -quaternion.yp, -quaternion.zp);
 }
 
 inline const QQuaternion operator/(const QQuaternion &quaternion, qreal divisor)
 {
-    return QQuaternion(quaternion.wp / divisor, quaternion.xp / divisor, quaternion.yp / divisor, quaternion.zp / divisor, 1);
+    return QQuaternion(quaternion.wp / divisor, quaternion.xp / divisor, quaternion.yp / divisor, quaternion.zp / divisor);
 }
 
 inline bool qFuzzyCompare(const QQuaternion& q1, const QQuaternion& q2)
@@ -281,18 +275,18 @@ inline bool qFuzzyCompare(const QQuaternion& q1, const QQuaternion& q2)
 #ifndef QT_NO_VECTOR3D
 
 inline QQuaternion::QQuaternion(qreal scalar, const QVector3D& vector)
-    : wp(scalar), xp(vector.xp), yp(vector.yp), zp(vector.zp) {}
+    : wp(scalar), xp(vector.x()), yp(vector.y()), zp(vector.z()) {}
 
 inline void QQuaternion::setVector(const QVector3D& vector)
 {
-    xp = vector.xp;
-    yp = vector.yp;
-    zp = vector.zp;
+    xp = vector.x();
+    yp = vector.y();
+    zp = vector.z();
 }
 
 inline QVector3D QQuaternion::vector() const
 {
-    return QVector3D(xp, yp, zp, 1);
+    return QVector3D(xp, yp, zp);
 }
 
 #endif
@@ -307,11 +301,11 @@ inline void QQuaternion::setVector(qreal x, qreal y, qreal z)
 #ifndef QT_NO_VECTOR4D
 
 inline QQuaternion::QQuaternion(const QVector4D& vector)
-    : wp(vector.wp), xp(vector.xp), yp(vector.yp), zp(vector.zp) {}
+    : wp(vector.w()), xp(vector.x()), yp(vector.y()), zp(vector.z()) {}
 
 inline QVector4D QQuaternion::toVector4D() const
 {
-    return QVector4D(xp, yp, zp, wp, 1);
+    return QVector4D(xp, yp, zp, wp);
 }
 
 #endif
diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h
index 767517e..1e95865 100644
--- a/src/gui/math3d/qvector3d.h
+++ b/src/gui/math3d/qvector3d.h
@@ -54,7 +54,6 @@ QT_MODULE(Gui)
 class QMatrix4x4;
 class QVector2D;
 class QVector4D;
-class QQuaternion;
 
 #ifndef QT_NO_VECTOR3D
 
@@ -136,8 +135,6 @@ private:
 
     friend class QVector2D;
     friend class QVector4D;
-    friend class QQuaternion;
-    friend class QMatrix4x4;
 #ifndef QT_NO_MATRIX4X4
     friend QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix);
     friend QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector);
diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h
index 4bd6639..520319a 100644
--- a/src/gui/math3d/qvector4d.h
+++ b/src/gui/math3d/qvector4d.h
@@ -54,7 +54,6 @@ QT_MODULE(Gui)
 class QMatrix4x4;
 class QVector2D;
 class QVector3D;
-class QQuaternion;
 
 #ifndef QT_NO_VECTOR4D
 
@@ -133,8 +132,6 @@ private:
 
     friend class QVector2D;
     friend class QVector3D;
-    friend class QQuaternion;
-    friend class QMatrix4x4;
 #ifndef QT_NO_MATRIX4X4
     friend QVector4D operator*(const QVector4D& vector, const QMatrix4x4& matrix);
     friend QVector4D operator*(const QMatrix4x4& matrix, const QVector4D& vector);
diff --git a/src/gui/painting/makepsheader.pl b/src/gui/painting/makepsheader.pl
index 30a5eea..de13209 100755
--- a/src/gui/painting/makepsheader.pl
+++ b/src/gui/painting/makepsheader.pl
@@ -1,4 +1,44 @@
 #!/usr/bin/perl
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the QtGui module of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 open(INPUT, 'qpsprinter.ps')
   or die "Can't open qpsprinter.ps";
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index feef15a..5abac2f 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -42,6 +42,7 @@ HEADERS += \
         painting/qtransform.h \
         painting/qwindowsurface_p.h \
         painting/qwmatrix.h \
+        painting/qpaintbuffer_p.h
 
 
 SOURCES += \
@@ -79,6 +80,7 @@ SOURCES += \
         painting/qtextureglyphcache.cpp \
         painting/qtransform.cpp \
         painting/qwindowsurface.cpp \
+        painting/qpaintbuffer.cpp
 
         SOURCES +=                                      \
                 painting/qpaintengine_raster.cpp        \
diff --git a/src/gui/painting/qdrawhelper_mmx_p.h b/src/gui/painting/qdrawhelper_mmx_p.h
index e107c72..68d9ec0 100644
--- a/src/gui/painting/qdrawhelper_mmx_p.h
+++ b/src/gui/painting/qdrawhelper_mmx_p.h
@@ -65,7 +65,7 @@
 #define C_80 const m64 mmx_0x0080 = _mm_set1_pi16(0x80)
 #define C_00 const m64 mmx_0x0000 = _mm_setzero_si64()
 
-#if defined(Q_OS_WIN)
+#ifdef Q_CC_MSVC
 #  pragma warning(disable: 4799) // No EMMS at end of function
 #endif
 
diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp
index 5e8fce5..32a8432 100644
--- a/src/gui/painting/qdrawhelper_sse2.cpp
+++ b/src/gui/painting/qdrawhelper_sse2.cpp
@@ -183,7 +183,7 @@ void qt_bitmapblit16_sse2(QRasterBuffer *rasterBuffer, int x, int y,
     const int destStride = rasterBuffer->bytesPerLine() / sizeof(quint16);
 
     const __m128i c128 = _mm_set1_epi16(c);
-#if defined(Q_OS_WIN)
+#if defined(Q_CC_MSVC)
 #  pragma warning(disable: 4309) // truncation of constant value
 #endif
     const __m128i maskmask = _mm_set_epi16(0x0101, 0x0202, 0x0404, 0x0808,
diff --git a/src/gui/painting/qdrawhelper_sse_p.h b/src/gui/painting/qdrawhelper_sse_p.h
index dd75bd9..23b629e 100644
--- a/src/gui/painting/qdrawhelper_sse_p.h
+++ b/src/gui/painting/qdrawhelper_sse_p.h
@@ -132,7 +132,7 @@ inline void qt_bitmapblit16_sse_template(QRasterBuffer *rasterBuffer,
     const int destStride = rasterBuffer->bytesPerLine() / sizeof(quint16);
 
     const __m64 c64 = _mm_set1_pi16(c);
-#if defined(Q_OS_WIN)
+#ifdef Q_CC_MSVC
 #  pragma warning(disable: 4309) // truncation of constant value
 #endif
     const __m64 maskmask1 = _mm_set_pi16(0x1010, 0x2020, 0x4040, 0x8080);
diff --git a/src/gui/painting/qemulationpaintengine_p.h b/src/gui/painting/qemulationpaintengine_p.h
index 1c3445c..358066e 100644
--- a/src/gui/painting/qemulationpaintengine_p.h
+++ b/src/gui/painting/qemulationpaintengine_p.h
@@ -92,6 +92,8 @@ public:
 
     virtual void setState(QPainterState *s);
 
+    virtual uint flags() const {return QPaintEngineEx::IsEmulationEngine | QPaintEngineEx::DoNotEmulate;}
+
     inline QPainterState *state() { return (QPainterState *)QPaintEngine::state; }
     inline const QPainterState *state() const { return (const QPainterState *)QPaintEngine::state; }
 
diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.c
index 83f1cb9..d89144e 100644
--- a/src/gui/painting/qgrayraster.c
+++ b/src/gui/painting/qgrayraster.c
@@ -1,5 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp
index 216b8c6..8d04a84 100644
--- a/src/gui/painting/qoutlinemapper.cpp
+++ b/src/gui/painting/qoutlinemapper.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qoutlinemapper_p.h"
-
+#include <private/qpainterpath_p.h>
 #include "qmath.h"
 
 #include <stdlib.h>
diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp
new file mode 100644
index 0000000..04ddd7d
--- /dev/null
+++ b/src/gui/painting/qpaintbuffer.cpp
@@ -0,0 +1,1745 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qmath.h>
+#include <private/qpainterpath_p.h>
+#include <private/qpaintbuffer_p.h>
+//#include <private/qtextengine_p.h>
+#include <private/qfontengine_p.h>
+#include <private/qemulationpaintengine_p.h>
+
+#include <QDebug>
+
+//#define QPAINTBUFFER_DEBUG_DRAW
+
+extern int qt_defaultDpiX();
+extern int qt_defaultDpiY();
+extern void qt_format_text(const QFont &font,
+                           const QRectF &_r, int tf, const QTextOption *option, const QString& str, QRectF *brect,
+                           int tabstops, int* tabarray, int tabarraylen,
+                           QPainter *painter);
+
+QTextItemIntCopy::QTextItemIntCopy(const QTextItem &item)
+    : m_item(static_cast<const QTextItemInt &>(item))
+{
+    QChar *chars = new QChar[m_item.num_chars];
+    unsigned short *logClusters = new unsigned short[m_item.num_chars];
+    memcpy(chars, m_item.chars, m_item.num_chars * sizeof(QChar));
+    memcpy(logClusters, m_item.logClusters, m_item.num_chars * sizeof(unsigned short));
+    m_item.chars = chars;
+    m_item.logClusters = logClusters;
+
+    const int size = QGlyphLayout::spaceNeededForGlyphLayout(m_item.glyphs.numGlyphs);
+    char *glyphLayoutData = new char[size];
+    QGlyphLayout glyphs(glyphLayoutData, m_item.glyphs.numGlyphs);
+    memcpy(glyphs.offsets, m_item.glyphs.offsets, m_item.glyphs.numGlyphs * sizeof(QFixedPoint));
+    memcpy(glyphs.glyphs, m_item.glyphs.glyphs, m_item.glyphs.numGlyphs * sizeof(HB_Glyph));
+    memcpy(glyphs.advances_x, m_item.glyphs.advances_x, m_item.glyphs.numGlyphs * sizeof(QFixed));
+    memcpy(glyphs.advances_y, m_item.glyphs.advances_y, m_item.glyphs.numGlyphs * sizeof(QFixed));
+    memcpy(glyphs.justifications, m_item.glyphs.justifications, m_item.glyphs.numGlyphs * sizeof(QGlyphJustification));
+    memcpy(glyphs.attributes, m_item.glyphs.attributes, m_item.glyphs.numGlyphs * sizeof(HB_GlyphAttributes));
+    m_item.glyphs = glyphs;
+
+    m_font = *m_item.f;
+    m_item.f = &m_font;
+
+    m_item.fontEngine->ref.ref(); // Increment reference count.
+}
+
+QTextItemIntCopy::~QTextItemIntCopy()
+{
+    delete m_item.chars;
+    delete m_item.logClusters;
+    delete m_item.glyphs.data();
+    if (!m_item.fontEngine->ref.deref())
+        delete m_item.fontEngine;
+}
+
+/************************************************************************
+ *
+ * QPaintBufferSignalProxy
+ *
+ ************************************************************************/
+
+Q_GLOBAL_STATIC(QPaintBufferSignalProxy, theSignalProxy)
+
+QPaintBufferSignalProxy *QPaintBufferSignalProxy::instance()
+{
+    return theSignalProxy();
+}
+
+/************************************************************************
+ *
+ * QPaintBufferPrivate
+ *
+ ************************************************************************/
+
+QPaintBufferPrivate::QPaintBufferPrivate()
+    : ref(1), engine(0), penWidthAdjustment(0)
+    , calculateBoundingRect(true)
+    , cache(0)
+{
+}
+
+QPaintBufferPrivate::~QPaintBufferPrivate()
+{
+    QPaintBufferSignalProxy::instance()->emitAboutToDestroy(this);
+
+    for (int i = 0; i < commands.size(); ++i) {
+        const QPaintBufferCommand &cmd = commands.at(i);
+        if (cmd.id == QPaintBufferPrivate::Cmd_DrawTextItem)
+            delete reinterpret_cast<QTextItemIntCopy *>(qVariantValue<void *>(variants.at(cmd.offset)));
+    }
+}
+
+
+inline void QPaintBufferPrivate::updateBoundingRect(const QRectF &br)
+{
+    // transform to device coords and adjust for pen width
+    Q_ASSERT(engine && engine->painter());
+    QPainter *painter = engine->painter();
+    const QTransform transform = painter->transform();
+    QRectF devRect = transform.mapRect(br);
+    if (penWidthAdjustment > 0) {
+        devRect = devRect.adjusted(-penWidthAdjustment, -penWidthAdjustment,
+                                   penWidthAdjustment, penWidthAdjustment);
+    }
+
+    if (boundingRect.isEmpty()) {
+        boundingRect = devRect;
+    } else {
+        qreal min_x = qMin(devRect.left(), boundingRect.left());
+        qreal min_y = qMin(devRect.top(), boundingRect.top());
+        qreal max_x = qMax(devRect.right(), boundingRect.right());
+        qreal max_y = qMax(devRect.bottom(), boundingRect.bottom());
+        boundingRect = QRectF(min_x, min_y, max_x - min_x, max_y - min_y);
+    }
+    if (painter->hasClipping())
+        boundingRect &= transform.mapRect(painter->clipRegion().boundingRect());
+}
+
+
+/************************************************************************
+ *
+ * QPaintBuffer
+ *
+ ************************************************************************/
+
+
+
+QPaintBuffer::QPaintBuffer()
+    : d_ptr(new QPaintBufferPrivate)
+{
+}
+
+QPaintBuffer::~QPaintBuffer()
+{
+    if (!d_ptr->ref.deref())
+        delete d_ptr;
+}
+
+QPaintBuffer::QPaintBuffer(const QPaintBuffer &other)
+    : QPaintDevice(), d_ptr(other.d_ptr)
+{
+    d_ptr->ref.ref();
+}
+
+QPaintEngine *QPaintBuffer::paintEngine() const
+{
+    QPaintBufferPrivate *d = const_cast<QPaintBuffer *>(this)->d_ptr;
+    if (!d->engine)
+        d->engine = new QPaintBufferEngine(d);
+    return d->engine;
+}
+
+
+int QPaintBuffer::metric(PaintDeviceMetric metric) const
+{
+    int val = 0;
+    switch (metric) {
+    case PdmWidth:
+        val = qCeil(d_ptr->boundingRect.width());
+        break;
+    case PdmHeight:
+        val = qCeil(d_ptr->boundingRect.height());
+        break;
+    case PdmDpiX:
+    case PdmPhysicalDpiX:
+        val = qt_defaultDpiX();
+        break;
+    case PdmDpiY:
+    case PdmPhysicalDpiY:
+        val = qt_defaultDpiY();
+        break;
+    default:
+        val = QPaintDevice::metric(metric);
+    }
+
+    return val;
+}
+
+int QPaintBuffer::devType() const
+{
+    return QInternal::PaintBuffer;
+}
+
+QPaintBuffer &QPaintBuffer::operator=(const QPaintBuffer &other)
+{
+    if (other.d_ptr != d_ptr) {
+        QPaintBufferPrivate *data = other.d_ptr;
+        data->ref.ref();
+        if (d_ptr->ref.deref())
+            delete d_ptr;
+        d_ptr = data;
+    }
+    return *this;
+}
+
+bool QPaintBuffer::isEmpty() const
+{
+    return d_ptr->commands.isEmpty();
+}
+
+
+
+void QPaintBuffer::draw(QPainter *painter) const
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBuffer::draw() --------------------------------";
+
+//     printf("Float buffer:");
+//     for (int i=0; i<d->floats.size(); i++) {
+//         if ((i % 10) == 0) {
+//             printf("\n%4d-%4d: ", i, i+9);
+//         }
+//         printf("%4.2f  ", d->floats[i]);
+//     }
+//     printf("\n");
+
+//     printf("Int Buffer:");
+//     for (int i=0; i<d->ints.size(); i++) {
+//         if ((i % 10) == 0) {
+//             printf("\n%4d-%4d: ", i, i+10);
+//         }
+//         printf("%5d", d->ints[i]);
+//     }
+//     printf("\n");
+#endif
+
+    if (painter && !painter->isActive())
+        return;
+
+    QPaintEngineEx *xengine = painter->paintEngine()->isExtended()
+                              ? (QPaintEngineEx *) painter->paintEngine() : 0;
+    if (xengine) {
+        QPaintEngineExReplayer player;
+        player.draw(*this, painter);
+    } else {
+        QPainterReplayer player;
+        player.draw(*this, painter);
+    }
+
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBuffer::draw() -------------------------------- DONE!";
+#endif
+}
+
+
+QRectF QPaintBuffer::boundingRect() const
+{
+    return d_ptr->boundingRect;
+}
+
+void QPaintBuffer::setBoundingRect(const QRectF &rect)
+{
+    d_ptr->boundingRect = rect;
+    d_ptr->calculateBoundingRect = false;
+}
+
+
+class QPaintBufferEnginePrivate : public QPaintEngineExPrivate
+{
+    Q_DECLARE_PUBLIC(QPaintBufferEngine)
+public:
+    void systemStateChanged() {
+        Q_Q(QPaintBufferEngine);
+        q->buffer->addCommand(QPaintBufferPrivate::Cmd_SystemStateChanged, QVariant(systemClip));
+    }
+};
+
+
+/************************************************************************
+ *
+ * QPaintBufferEngine
+ *
+ ************************************************************************/
+
+QPaintBufferEngine::QPaintBufferEngine(QPaintBufferPrivate *b)
+    : QPaintEngineEx(*(new QPaintBufferEnginePrivate))
+    , buffer(b)
+    , m_begin_detected(false)
+    , m_save_detected(false)
+    , m_stream_raw_text_items(false)
+{
+}
+
+bool QPaintBufferEngine::begin(QPaintDevice *)
+{
+    Q_D(QPaintBufferEngine);
+    painter()->save();
+    d->systemStateChanged();
+    return true;
+}
+
+bool QPaintBufferEngine::end()
+{
+    painter()->restore();
+    m_created_state = 0;
+    return true;
+}
+
+QPainterState *QPaintBufferEngine::createState(QPainterState *orig) const
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: createState, orig=" << orig << ", current=" << state();
+#endif
+
+    Q_ASSERT(!m_begin_detected);
+    Q_ASSERT(!m_save_detected);
+
+    if (orig == 0) {
+        m_begin_detected = true;
+        return new QPainterState();
+    } else {
+        m_save_detected = true;
+        return new QPainterState(orig);
+    }
+}
+
+void QPaintBufferEngine::clip(const QVectorPath &path, Qt::ClipOperation op)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: clip vpath:" << path.elementCount() << "op:" << op;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_ClipVectorPath, path);
+    cmd->extra = op;
+}
+
+void QPaintBufferEngine::clip(const QRect &rect, Qt::ClipOperation op)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: clip rect:" << rect << "op:" << op;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_ClipRect, (int *) &rect, 4, 1);
+    cmd->extra = op;
+}
+
+void QPaintBufferEngine::clip(const QRegion &region, Qt::ClipOperation op)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: clip region br:" << region.boundingRect() << "op:" << op;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_ClipRegion, QVariant(region));
+    cmd->extra = op;
+}
+
+void QPaintBufferEngine::clip(const QPainterPath &path, Qt::ClipOperation op)
+{
+    // ### TODO
+//     QPaintBufferCommand *cmd =
+//         buffer->addCommand(QPaintBufferPrivate::Cmd_ClipPath, QVariant(path));
+//     cmd->extra = op;
+    QPaintEngineEx::clip(path, op);
+}
+
+void QPaintBufferEngine::clipEnabledChanged()
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: clip enable change" << state()->clipEnabled;
+#endif
+
+    buffer->addCommand(QPaintBufferPrivate::Cmd_SetClipEnabled, state()->clipEnabled);
+}
+
+void QPaintBufferEngine::penChanged()
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine:" << state()->pen;
+#endif
+    const QPen &pen = state()->pen;
+
+    if (!buffer->commands.isEmpty()
+        && buffer->commands.last().id == QPaintBufferPrivate::Cmd_SetPen) {
+        buffer->variants[buffer->commands.last().offset] = pen;
+        return;
+    }
+    if (buffer->calculateBoundingRect) {
+        if (pen.style() == Qt::NoPen) {
+            buffer->penWidthAdjustment = 0;
+        } else {
+            qreal penWidth = (pen.widthF() == 0) ? 1 : pen.widthF();
+            QPointF transformedWidth(penWidth, penWidth);
+            if (!pen.isCosmetic())
+                transformedWidth = painter()->transform().map(transformedWidth);
+            buffer->penWidthAdjustment = transformedWidth.x() / 2.0;
+        }
+    }
+    buffer->addCommand(QPaintBufferPrivate::Cmd_SetPen, pen);
+}
+
+void QPaintBufferEngine::brushChanged()
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine:" << state()->brush;
+#endif
+    const QBrush &brush = state()->brush;
+
+    if (!buffer->commands.isEmpty()
+        && buffer->commands.last().id == QPaintBufferPrivate::Cmd_SetBrush) {
+        buffer->variants[buffer->commands.last().offset] = brush;
+        return;
+    }
+
+    buffer->addCommand(QPaintBufferPrivate::Cmd_SetBrush, brush);
+}
+
+void QPaintBufferEngine::brushOriginChanged()
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: brush origin changed" << state()->brushOrigin;
+#endif
+    buffer->addCommand(QPaintBufferPrivate::Cmd_SetBrushOrigin, state()->brushOrigin);
+}
+
+void QPaintBufferEngine::opacityChanged()
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: opacity changed" << state()->opacity;
+#endif
+    buffer->addCommand(QPaintBufferPrivate::Cmd_SetOpacity, state()->opacity);
+}
+
+void QPaintBufferEngine::compositionModeChanged()
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: composition mode" << state()->composition_mode;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_SetCompositionMode);
+    cmd->extra = state()->composition_mode;
+}
+
+void QPaintBufferEngine::renderHintsChanged()
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: render hints changed" << state()->renderHints;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_SetRenderHints);
+    cmd->extra = state()->renderHints;
+}
+
+void QPaintBufferEngine::transformChanged()
+{
+    // ### accumulate, like in QBrush case...
+    if (!buffer->commands.isEmpty()
+        && buffer->commands.last().id == QPaintBufferPrivate::Cmd_SetTransform) {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << "QPaintBufferEngine: compressing " << state()->matrix;
+#endif
+        buffer->variants[buffer->commands.last().offset] = state()->matrix;
+        return;
+    }
+
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << "QPaintBufferEngine: " << state()->matrix;
+#endif
+    buffer->addCommand(QPaintBufferPrivate::Cmd_SetTransform, state()->matrix);
+}
+
+void QPaintBufferEngine::backgroundModeChanged()
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintEngineBuffer: background mode changed" << state()->bgMode;
+#endif
+    QPaintBufferCommand *cmd = buffer->addCommand(QPaintBufferPrivate::Cmd_SetBackgroundMode);
+    cmd->extra = state()->bgMode;
+}
+
+void QPaintBufferEngine::draw(const QVectorPath &path)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: draw vpath:" << path.elementCount();
+#endif
+    buffer->addCommand(QPaintBufferPrivate::Cmd_DrawVectorPath, path);
+//     if (buffer->calculateBoundingRect) {
+//         QRealRect r = path.controlPointRect();
+//         buffer->updateBoundingRect(QRectF(r.x1, r.y1, r.x2 - r.x1, r.y2 - r.y1));
+//     }
+}
+
+void QPaintBufferEngine::fill(const QVectorPath &path, const QBrush &brush)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: fill vpath:" << path.elementCount() << brush;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_FillVectorPath, path);
+    cmd->extra = buffer->addData(QVariant(brush));
+//     if (buffer->calculateBoundingRect) {
+//         QRealRect r = path.controlPointRect();
+//         buffer->updateBoundingRect(QRectF(r.x1, r.y1, r.x2 - r.x1, r.y2 - r.y1));
+//     }
+}
+
+void QPaintBufferEngine::stroke(const QVectorPath &path, const QPen &pen)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: stroke vpath:" << path.elementCount() << pen;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_StrokeVectorPath, path);
+    cmd->extra = buffer->addData(QVariant(pen));
+//     if (buffer->calculateBoundingRect) {
+//         QRealRect r = path.controlPointRect();
+//         buffer->updateBoundingRect(QRectF(r.x1, r.y1, r.x2 - r.x1, r.y2 - r.y1));
+//     }
+}
+
+void QPaintBufferEngine::fillRect(const QRectF &rect, const QBrush &brush)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: fillRect brush:" << rect << brush;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_FillRectBrush, (qreal *) &rect, 4, 1);
+    cmd->extra = buffer->addData(brush);
+    if (buffer->calculateBoundingRect)
+        buffer->updateBoundingRect(rect);
+}
+
+void QPaintBufferEngine::fillRect(const QRectF &rect, const QColor &color)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: fillRect color:" << rect << color;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_FillRectColor, (qreal *) &rect, 4, 1);
+    cmd->extra = buffer->addData(color);
+    if (buffer->calculateBoundingRect)
+        buffer->updateBoundingRect(rect);
+}
+
+void QPaintBufferEngine::drawRects(const QRect *rects, int rectCount)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawRectsI:" << rectCount;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawRectI, (int *) rects, 4 * rectCount, rectCount);
+    cmd->extra = rectCount;
+
+    if (buffer->calculateBoundingRect) {
+        if (rectCount == 1) {
+            buffer->updateBoundingRect(rects[0]);
+        } else {
+            int min_x = rects[0].left();
+            int min_y = rects[0].top();
+            int max_x = rects[0].left() + rects[0].width();
+            int max_y = rects[0].top() + rects[0].height();
+            for (int i=1; i< rectCount; ++i) {
+                if (rects[i].left() < min_x)
+                    min_x = rects[i].left();
+                if (rects[i].top() < min_y)
+                    min_y = rects[i].top();
+                if (rects[i].right() > max_x)
+                    max_x = rects[i].left() + rects[i].width();
+                if (rects[i].bottom() > max_y)
+                    max_y = rects[i].top() + rects[i].height();
+
+            }
+            buffer->updateBoundingRect(QRectF(min_x, min_y, max_x - min_x, max_y - min_y));
+        }
+    }
+}
+
+void QPaintBufferEngine::drawRects(const QRectF *rects, int rectCount)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawRectsF:" << rectCount;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawRectF, (qreal *) rects, 4 * rectCount, rectCount);
+    cmd->extra = rectCount;
+
+    if (buffer->calculateBoundingRect) {
+        if (rectCount == 1) {
+            buffer->updateBoundingRect(rects[0]);
+        } else {
+            qreal min_x = rects[0].left();
+            qreal min_y = rects[0].top();
+            qreal max_x = rects[0].right();
+            qreal max_y = rects[0].bottom();
+            for (int i=1; i< rectCount; ++i) {
+                if (rects[i].left() < min_x)
+                    min_x = rects[i].left();
+                if (rects[i].top() < min_y)
+                    min_y = rects[i].top();
+                if (rects[i].right() > max_x)
+                    max_x = rects[i].right();
+                if (rects[i].bottom() > max_y)
+                    max_y = rects[i].bottom();
+
+            }
+            buffer->updateBoundingRect(QRectF(min_x, min_y, max_x - min_x, max_y - min_y));
+        }
+    }
+}
+
+void QPaintBufferEngine::drawLines(const QLine *lines, int lineCount)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawLinesI:" << lineCount;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawLineI, (int *) lines, 4 * lineCount, lineCount);
+    cmd->extra = lineCount;
+
+    if (buffer->calculateBoundingRect) {
+        int min_x = lines[0].p1().x();
+        int min_y = lines[0].p1().y();
+        int max_x = lines[0].p2().x();
+        int max_y = lines[0].p2().y();
+        if (min_x > max_x)
+            qSwap(min_x, max_x);
+        if (min_y > max_y)
+            qSwap(min_y, max_y);
+        for (int i=1; i < lineCount; ++i) {
+            int p1_x = lines[i].p1().x();
+            int p1_y = lines[i].p1().y();
+            int p2_x = lines[i].p2().x();
+            int p2_y = lines[i].p2().y();
+            if (p1_x > p2_x) {
+                min_x = qMin(p2_x, min_x);
+                max_x = qMax(p1_x, max_x);
+            } else {
+                min_x = qMin(p1_x, min_x);
+                max_x = qMax(p2_x, max_x);
+            }
+            if (p1_y > p2_y) {
+                min_y = qMin(p2_y, min_y);
+                max_y = qMax(p1_y, max_y);
+            } else {
+                min_y = qMin(p1_y, min_y);
+                max_y = qMax(p2_y, max_y);
+            }
+        }
+        buffer->updateBoundingRect(QRectF(min_x, min_y, max_x - min_x, max_y - min_y));
+    }
+}
+
+void QPaintBufferEngine::drawLines(const QLineF *lines, int lineCount)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawLinesF:" << lineCount;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawLineF, (qreal *) lines, 4 * lineCount, lineCount);
+    cmd->extra = lineCount;
+
+    if (buffer->calculateBoundingRect) {
+        qreal min_x = lines[0].p1().x();
+        qreal min_y = lines[0].p1().y();
+        qreal max_x = lines[0].p2().x();
+        qreal max_y = lines[0].p2().y();
+        if (min_x > max_x)
+            qSwap(min_x, max_x);
+        if (min_y > max_y)
+            qSwap(min_y, max_y);
+        for (int i=1; i < lineCount; ++i) {
+            qreal p1_x = lines[i].p1().x();
+            qreal p1_y = lines[i].p1().y();
+            qreal p2_x = lines[i].p2().x();
+            qreal p2_y = lines[i].p2().y();
+            if (p1_x > p2_x) {
+                min_x = qMin(p2_x, min_x);
+                max_x = qMax(p1_x, max_x);
+            } else {
+                min_x = qMin(p1_x, min_x);
+                max_x = qMax(p2_x, max_x);
+            }
+            if (p1_y > p2_y) {
+                min_y = qMin(p2_y, min_y);
+                max_y = qMax(p1_y, max_y);
+            } else {
+                min_y = qMin(p1_y, min_y);
+                max_y = qMax(p2_y, max_y);
+            }
+        }
+        buffer->updateBoundingRect(QRectF(min_x, min_y, max_x - min_x, max_y - min_y));
+    }
+}
+
+void QPaintBufferEngine::drawEllipse(const QRectF &r)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawEllipseF:" << r;
+#endif
+    buffer->addCommand(QPaintBufferPrivate::Cmd_DrawEllipseF, (qreal *) &r, 4, 1);
+    if (buffer->calculateBoundingRect)
+        buffer->updateBoundingRect(r);
+}
+
+void QPaintBufferEngine::drawEllipse(const QRect &r)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawEllipseI:" << r;
+#endif
+    buffer->addCommand(QPaintBufferPrivate::Cmd_DrawEllipseI, (int *) &r, 4, 1);
+    if (buffer->calculateBoundingRect)
+        buffer->updateBoundingRect(r);
+}
+
+void QPaintBufferEngine::drawPath(const QPainterPath &path)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawPath: element count:" << path.elementCount();
+#endif
+    // ### Path -> QVariant
+    // buffer->addCommand(QPaintBufferPrivate::Cmd_DrawPath, QVariant(path));
+    QPaintEngineEx::drawPath(path);
+
+    if (buffer->calculateBoundingRect)
+        buffer->updateBoundingRect(path.boundingRect());
+}
+
+void QPaintBufferEngine::drawPoints(const QPoint *points, int pointCount)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawPointsI: " << pointCount;
+#endif
+    buffer->addCommand(QPaintBufferPrivate::Cmd_DrawPointsI, (int *) points, 2 * pointCount, pointCount);
+
+    if (buffer->calculateBoundingRect) {
+        int min_x = points[0].x();
+        int min_y = points[0].y();
+        int max_x = points[0].x()+1;
+        int max_y = points[0].y()+1;
+        for (int i=1; i<pointCount; ++i) {
+            int x = points[i].x();
+            int y = points[i].y();
+            min_x = qMin(min_x, x);
+            min_y = qMin(min_y, y);
+            max_x = qMax(max_x, x+1);
+            max_y = qMax(max_y, y+1);
+        }
+        buffer->updateBoundingRect(QRectF(min_x, min_y, max_x - min_x, max_y - min_y));
+    }
+}
+
+void QPaintBufferEngine::drawPoints(const QPointF *points, int pointCount)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawPointsF: " << pointCount;
+#endif
+    buffer->addCommand(QPaintBufferPrivate::Cmd_DrawPointsF, (qreal *) points, 2 * pointCount, pointCount);
+
+    if (buffer->calculateBoundingRect) {
+        qreal min_x = points[0].x();
+        qreal min_y = points[0].y();
+        qreal max_x = points[0].x()+1;
+        qreal max_y = points[0].y()+1;
+        for (int i=1; i<pointCount; ++i) {
+            qreal x = points[i].x();
+            qreal y = points[i].y();
+            min_x = qMin(min_x, x);
+            min_y = qMin(min_y, y);
+            max_x = qMax(max_x, x+1);
+            max_y = qMax(max_y, y+1);
+        }
+        buffer->updateBoundingRect(QRectF(min_x, min_y, max_x - min_x, max_y - min_y));
+    }
+}
+
+void QPaintBufferEngine::drawPolygon(const QPoint *pts, int count, PolygonDrawMode mode)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawPolygonI: size:" << count << ", mode:" << mode;
+#endif
+    if (mode == QPaintEngine::OddEvenMode || mode == QPaintEngine::WindingMode) {
+        QPaintBufferCommand *cmd = buffer->addCommand(QPaintBufferPrivate::Cmd_DrawPolygonI,
+                                                      (int *) pts, 2 * count, count);
+        cmd->extra = mode;
+    } else if (mode == QPaintEngine::PolylineMode) {
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawPolylineI, (int *) pts, 2 * count, count);
+    } else {
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawConvexPolygonI, (int *) pts, 2 * count, count);
+    }
+
+    if (buffer->calculateBoundingRect) {
+        int min_x = pts[0].x();
+        int min_y = pts[0].y();
+        int max_x = pts[0].x();
+        int max_y = pts[0].y();
+        for (int i=1; i<count; ++i) {
+            int x = pts[i].x();
+            int y = pts[i].y();
+            min_x = qMin(min_x, x);
+            min_y = qMin(min_y, y);
+            max_x = qMax(max_x, x);
+            max_y = qMax(max_y, y);
+        }
+        buffer->updateBoundingRect(QRectF(min_x, min_y, max_x - min_x, max_y - min_y));
+    }
+}
+
+void QPaintBufferEngine::drawPolygon(const QPointF *pts, int count, PolygonDrawMode mode)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawPolygonF: size:" << count << ", mode:" << mode;
+#endif
+    if (mode == QPaintEngine::OddEvenMode || mode == QPaintEngine::WindingMode) {
+        QPaintBufferCommand *cmd = buffer->addCommand(QPaintBufferPrivate::Cmd_DrawPolygonF,
+                                                      (qreal *) pts, 2 * count, count);
+        cmd->extra = mode;
+    } else if (mode == QPaintEngine::PolylineMode) {
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawPolylineF, (qreal *) pts, 2 * count, count);
+    } else {
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawConvexPolygonF, (qreal *) pts, 2 * count, count);
+    }
+
+    if (buffer->calculateBoundingRect) {
+        qreal min_x = pts[0].x();
+        qreal min_y = pts[0].y();
+        qreal max_x = pts[0].x();
+        qreal max_y = pts[0].y();
+        for (int i=1; i<count; ++i) {
+            qreal x = pts[i].x();
+            qreal y = pts[i].y();
+            min_x = qMin(min_x, x);
+            min_y = qMin(min_y, y);
+            max_x = qMax(max_x, x);
+            max_y = qMax(max_y, y);
+        }
+        buffer->updateBoundingRect(QRectF(min_x, min_y, max_x - min_x, max_y - min_y));
+    }
+}
+
+void QPaintBufferEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawPixmap: src/dest rects " << r << sr;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawPixmapRect, QVariant(pm));
+    cmd->extra = buffer->addData((qreal *) &r, 4);
+    buffer->addData((qreal *) &sr, 4);
+    if (buffer->calculateBoundingRect)
+        buffer->updateBoundingRect(r);
+}
+
+void QPaintBufferEngine::drawPixmap(const QPointF &pos, const QPixmap &pm)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawPixmap: pos:" << pos;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawPixmapPos, QVariant(pm));
+    cmd->extra = buffer->addData((qreal *) &pos, 2);
+    if (buffer->calculateBoundingRect)
+        buffer->updateBoundingRect(QRectF(pos, pm.size()));
+}
+
+void QPaintBufferEngine::drawImage(const QRectF &r, const QImage &image, const QRectF &sr,
+                                   Qt::ImageConversionFlags /*flags */)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawImage: src/dest rects " << r << sr;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawPixmapRect, QVariant(image));
+    cmd->extra = buffer->addData((qreal *) &r, 4);
+    buffer->addData((qreal *) &sr, 4);
+    // ### flags...
+    if (buffer->calculateBoundingRect)
+        buffer->updateBoundingRect(r);
+}
+
+void QPaintBufferEngine::drawImage(const QPointF &pos, const QImage &image)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawImage: pos:" << pos;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawImagePos, QVariant(image));
+    cmd->extra = buffer->addData((qreal *) &pos, 2);
+    if (buffer->calculateBoundingRect)
+        buffer->updateBoundingRect(QRectF(pos, image.size()));
+}
+
+void QPaintBufferEngine::drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &s)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawTiledPixmap: src rect/offset:" << r << s;
+#endif
+    QPaintBufferCommand *cmd =
+        buffer->addCommand(QPaintBufferPrivate::Cmd_DrawTiledPixmap, QVariant(pm));
+    cmd->extra = buffer->addData((qreal *) &r, 4);
+    buffer->addData((qreal *) &s, 2);
+    if (buffer->calculateBoundingRect)
+        buffer->updateBoundingRect(r);
+}
+
+void QPaintBufferEngine::drawTextItem(const QPointF &pos, const QTextItem &ti)
+{
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+    qDebug() << "QPaintBufferEngine: drawTextItem: pos:" << pos << ti.text();
+#endif
+    if (m_stream_raw_text_items) {
+        QPaintBufferCommand *cmd = buffer->addCommand(QPaintBufferPrivate::Cmd_DrawTextItem, qVariantFromValue<void *>(new QTextItemIntCopy(ti)));
+
+        QFont font(ti.font());
+        font.setUnderline(false);
+        font.setStrikeOut(false);
+        font.setOverline(false);
+
+        const QTextItemInt &si = static_cast<const QTextItemInt &>(ti);
+        qreal justificationWidth = 0;
+        if (si.justified)
+            justificationWidth = si.width.toReal();
+        int renderFlags = ti.renderFlags();
+        qreal scaleFactor = font.d->dpi/qreal(qt_defaultDpiY());
+
+        buffer->addData(QVariant(font));
+        cmd->extra = buffer->addData((qreal *) &pos, 2);
+        buffer->addData((qreal *) &justificationWidth, 1);
+        buffer->addData((qreal *) &scaleFactor, 1);
+        cmd->offset2 = buffer->addData((int *) &renderFlags, 1);
+    } else {
+        QList<QVariant> variants;
+        variants << QVariant(ti.font()) << QVariant(ti.text());
+        QPaintBufferCommand *cmd = buffer->addCommand(QPaintBufferPrivate::Cmd_DrawText, QVariant(variants));
+        cmd->extra = buffer->addData((qreal *) &pos, 2);
+    }
+
+    if (buffer->calculateBoundingRect)
+        buffer->updateBoundingRect(QRectF(pos, QSize(ti.width(), ti.ascent() + ti.descent() + 1)));
+}
+
+
+void QPaintBufferEngine::setState(QPainterState *s)
+{
+    if (m_begin_detected) {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+            qDebug() << "QPaintBufferEngine: setState: begin, ignoring.";
+#endif
+        m_begin_detected = false;
+    } else if (m_save_detected) {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << "QPaintBufferEngine: setState: save.";
+#endif
+        m_save_detected = false;
+        buffer->addCommand(QPaintBufferPrivate::Cmd_Save);
+    } else {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << "QPaintBufferEngine: setState: restore.";
+#endif
+        buffer->addCommand(QPaintBufferPrivate::Cmd_Restore);
+    }
+
+    QPaintEngineEx::setState(s);
+}
+
+
+/***********************************************************************
+ *
+ * class QPaintBufferPlayback_Painter
+ *
+ */
+
+// QFakeDevice is used to create fonts with a custom DPI
+//
+class QFakeDevice : public QPaintDevice
+{
+public:
+    QFakeDevice() { dpi_x = qt_defaultDpiX(); dpi_y = qt_defaultDpiY(); }
+    void setDpiX(int dpi) { dpi_x = dpi; }
+    void setDpiY(int dpi) { dpi_y = dpi; }
+    QPaintEngine *paintEngine() const { return 0; }
+    int metric(PaintDeviceMetric m) const
+    {
+        switch(m) {
+            case PdmPhysicalDpiX:
+            case PdmDpiX:
+                return dpi_x;
+            case PdmPhysicalDpiY:
+            case PdmDpiY:
+                return dpi_y;
+            default:
+                return QPaintDevice::metric(m);
+        }
+    }
+
+private:
+    int dpi_x;
+    int dpi_y;
+};
+
+
+void QPainterReplayer::setupTransform(QPainter *_painter)
+{
+    painter = _painter;
+    m_world_matrix = painter->transform();
+    m_world_matrix.scale(qreal(painter->device()->logicalDpiX()) / qreal(qt_defaultDpiX()),
+                         qreal(painter->device()->logicalDpiY()) / qreal(qt_defaultDpiY()));
+    painter->setTransform(m_world_matrix);
+}
+
+void QPainterReplayer::draw(const QPaintBuffer &buffer, QPainter *_painter)
+{
+    d = buffer.d_ptr;
+    setupTransform(_painter);
+
+    for (int cmdIndex=0; cmdIndex<d->commands.size(); ++cmdIndex) {
+        const QPaintBufferCommand &cmd = d->commands.at(cmdIndex);
+        process(cmd);
+    }
+}
+
+void QPainterReplayer::process(const QPaintBufferCommand &cmd)
+{
+    switch (cmd.id) {
+    case QPaintBufferPrivate::Cmd_Save: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_Save";
+#endif
+        painter->save();
+        break; }
+
+    case QPaintBufferPrivate::Cmd_Restore: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_Restore";
+#endif
+        painter->restore();
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetPen: {
+        QPen pen = qVariantValue<QPen>(d->variants.at(cmd.offset));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_SetPen: " << pen;
+#endif
+        painter->setPen(pen);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetBrush: {
+        QBrush brush = qVariantValue<QBrush>(d->variants.at(cmd.offset));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_SetBrush: " << brush;
+#endif
+        painter->setBrush(brush);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetBrushOrigin: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_SetBrushOrigin: " << d->variants.at(cmd.offset).toPointF();
+#endif
+        painter->setBrushOrigin(d->variants.at(cmd.offset).toPointF());
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetTransform: {
+        QTransform xform = qVariantValue<QTransform>(d->variants.at(cmd.offset));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_SetTransform, offset: " << cmd.offset << xform;
+#endif
+        painter->setTransform(xform * m_world_matrix);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetCompositionMode: {
+        QPainter::CompositionMode mode = (QPainter::CompositionMode) cmd.extra;
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_SetCompositionMode, mode: " << mode;
+#endif
+        painter->setCompositionMode(mode);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetRenderHints: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_SetRenderHints, hints: " << cmd.extra;
+#endif
+        QPainter::RenderHints ph = painter->renderHints();
+        QPainter::RenderHints nh = (QPainter::RenderHints) cmd.extra;
+        QPainter::RenderHints xored = ph ^ nh;
+        if (xored & QPainter::Antialiasing)
+            painter->setRenderHint(QPainter::Antialiasing, nh & QPainter::Antialiasing);
+        if (xored & QPainter::HighQualityAntialiasing)
+            painter->setRenderHint(QPainter::HighQualityAntialiasing, nh & QPainter::HighQualityAntialiasing);
+        if (xored & QPainter::TextAntialiasing)
+            painter->setRenderHint(QPainter::TextAntialiasing, nh & QPainter::TextAntialiasing);
+        if (xored & QPainter::SmoothPixmapTransform)
+            painter->setRenderHint(QPainter::SmoothPixmapTransform, nh & QPainter::SmoothPixmapTransform);
+        if (xored & QPainter::NonCosmeticDefaultPen)
+            painter->setRenderHint(QPainter::NonCosmeticDefaultPen, nh & QPainter::NonCosmeticDefaultPen);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetOpacity: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_SetOpacity: " << d->variants.at(cmd.offset).toDouble();
+#endif
+        painter->setOpacity(d->variants.at(cmd.offset).toDouble());
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetBackgroundMode: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_SetBackgroundMode: " << cmd.extra;
+#endif
+        painter->setBackgroundMode((Qt::BGMode)cmd.extra);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawVectorPath: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawVectorPath: size: " << cmd.size
+//                 << ", hints:" << d->ints[cmd.offset2+cmd.size]
+                 << "pts/elms:" << cmd.offset << cmd.offset2;
+#endif
+        QVectorPathCmd path(d, cmd);
+        painter->drawPath(path().convertToPainterPath());
+        break; }
+
+    case QPaintBufferPrivate::Cmd_StrokeVectorPath: {
+        QPen pen = qVariantValue<QPen>(d->variants.at(cmd.extra));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_StrokeVectorPath: size: " << cmd.size
+//                 << ", hints:" << d->ints[cmd.offset2+cmd.size]
+                 << "pts/elms:" << cmd.offset << cmd.offset2;
+#endif
+        QVectorPathCmd path(d, cmd);
+        painter->strokePath(path().convertToPainterPath(), pen);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_FillVectorPath: {
+        QBrush brush = qVariantValue<QBrush>(d->variants.at(cmd.extra));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_FillVectorPath: size: " << cmd.size
+//                 << ", hints:" << d->ints[cmd.offset2+cmd.size]
+                 << "pts/elms:" << cmd.offset << cmd.offset2 << brush;
+#endif
+        QVectorPathCmd path(d, cmd);
+        painter->fillPath(path().convertToPainterPath(), brush);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPolygonF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawPolygonF, offset: " << cmd.offset << " size: " << cmd.size
+                 << " mode: " << cmd.extra
+                 << d->floats.at(cmd.offset)
+                 << d->floats.at(cmd.offset+1);
+#endif
+        Qt::FillRule fill = (QPaintEngine::PolygonDrawMode) cmd.extra == QPaintEngine::OddEvenMode
+                            ? Qt::OddEvenFill : Qt::WindingFill;
+        painter->drawPolygon((QPointF *) (d->floats.constData() + cmd.offset), cmd.size, fill);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPolygonI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawPolygonI, offset: " << cmd.offset << " size: " << cmd.size
+                 << " mode: " << cmd.extra
+                 << d->ints.at(cmd.offset)
+                 << d->ints.at(cmd.offset+1);
+#endif
+        Qt::FillRule fill = (QPaintEngine::PolygonDrawMode) cmd.extra == QPaintEngine::OddEvenMode
+                            ? Qt::OddEvenFill : Qt::WindingFill;
+        painter->drawPolygon((QPoint *) (d->ints.constData() + cmd.offset), cmd.size, fill);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPolylineF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawPolylineF, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        painter->drawPolyline((QPointF *) (d->floats.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPolylineI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawPolylineI, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        painter->drawPolyline((QPoint *) (d->ints.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawConvexPolygonF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawConvexPolygonF, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        painter->drawConvexPolygon((QPointF *) (d->floats.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawConvexPolygonI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawConvexPolygonI, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        painter->drawConvexPolygon((QPoint *) (d->ints.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawEllipseF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawEllipseF, offset: " << cmd.offset;
+#endif
+        painter->drawEllipse(*(QRectF *)(d->floats.constData() + cmd.offset));
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawEllipseI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawEllipseI, offset: " << cmd.offset;
+#endif
+        painter->drawEllipse(*(QRect *)(d->ints.constData() + cmd.offset));
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawLineF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawLineF, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        painter->drawLines((QLineF *)(d->floats.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawLineI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawLineI, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        painter->drawLines((QLine *)(d->ints.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPointsF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawPointsF, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        painter->drawPoints((QPointF *)(d->floats.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPointsI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawPointsI, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        painter->drawPoints((QPoint *)(d->ints.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPixmapRect: {
+        QPixmap pm(d->variants.at(cmd.offset).value<QPixmap>());
+        QRectF r(d->floats.at(cmd.extra), d->floats.at(cmd.extra+1),
+                 d->floats.at(cmd.extra+2), d->floats.at(cmd.extra+3));
+
+        QRectF sr(d->floats.at(cmd.extra+4), d->floats.at(cmd.extra+5),
+                  d->floats.at(cmd.extra+6), d->floats.at(cmd.extra+7));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawPixmapRect:" << r << sr;
+#endif
+        painter->drawPixmap(r, pm, sr);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPixmapPos: {
+        QPixmap pm(d->variants.at(cmd.offset).value<QPixmap>());
+        QPointF pos(d->floats.at(cmd.extra), d->floats.at(cmd.extra+1));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawPixmapPos:" << pos;
+#endif
+        painter->drawPixmap(pos, pm);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawTiledPixmap: {
+        QPixmap pm(d->variants.at(cmd.offset).value<QPixmap>());
+        QRectF r(d->floats.at(cmd.extra), d->floats.at(cmd.extra+1),
+                 d->floats.at(cmd.extra+2), d->floats.at(cmd.extra+3));
+
+        QPointF offset(d->floats.at(cmd.extra+4), d->floats.at(cmd.extra+5));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawTiledPixmap:" << r << offset;
+#endif
+        painter->drawTiledPixmap(r, pm, offset);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawImageRect: {
+        QImage image(d->variants.at(cmd.offset).value<QImage>());
+        QRectF r(d->floats.at(cmd.extra), d->floats.at(cmd.extra+1),
+                 d->floats.at(cmd.extra+2), d->floats.at(cmd.extra+3));
+        QRectF sr(d->floats.at(cmd.extra+4), d->floats.at(cmd.extra+5),
+                  d->floats.at(cmd.extra+6), d->floats.at(cmd.extra+7));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawImageRect:" << r << sr;
+#endif
+        painter->drawImage(r, image, sr);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawImagePos: {
+        QImage image(d->variants.at(cmd.offset).value<QImage>());
+        QPointF pos(d->floats.at(cmd.extra), d->floats.at(cmd.extra+1));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawImagePos:" << pos;
+#endif
+        painter->drawImage(pos, image);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawRectF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawRectF, offset: " << cmd.offset;
+#endif
+        painter->drawRects((QRectF *)(d->floats.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawRectI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawRectI, offset: " << cmd.offset;
+#endif
+        painter->drawRects((QRect *)(d->ints.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_FillRectBrush: {
+        QBrush brush = qVariantValue<QBrush>(d->variants.at(cmd.extra));
+        QRectF *rect = (QRectF *)(d->floats.constData() + cmd.offset);
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_FillRectBrush, offset: " << cmd.offset << " rect: " << *rect << " brush: " << brush;
+#endif
+        painter->fillRect(*rect, brush);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_FillRectColor: {
+        QColor color = qVariantValue<QColor>(d->variants.at(cmd.extra));
+        QRectF *rect = (QRectF *)(d->floats.constData() + cmd.offset);
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_FillRectBrush, offset: " << cmd.offset << " rect: " << *rect << " color: " << color;
+#endif
+        painter->fillRect(*rect, color);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetClipEnabled: {
+        bool clipEnabled = d->variants.at(cmd.offset).toBool();
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_SetClipEnabled:" << clipEnabled;
+#endif
+        painter->setClipping(clipEnabled);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_ClipVectorPath: {
+        QVectorPathCmd path(d, cmd);
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_ClipVectorPath:" << path().elementCount();
+#endif
+        painter->setClipPath(path().convertToPainterPath(), Qt::ClipOperation(cmd.extra));
+        break; }
+
+
+    case QPaintBufferPrivate::Cmd_ClipRect: {
+        QRect rect(QPoint(d->ints.at(cmd.offset), d->ints.at(cmd.offset + 1)),
+                   QPoint(d->ints.at(cmd.offset + 2), d->ints.at(cmd.offset + 3)));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_ClipRect:" << rect << cmd.extra;
+#endif
+        painter->setClipRect(rect, Qt::ClipOperation(cmd.extra));
+        break; }
+
+    case QPaintBufferPrivate::Cmd_ClipRegion: {
+        QRegion region(d->variants.at(cmd.offset).value<QRegion>());
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_ClipRegion:" << region.boundingRect() << cmd.extra;
+#endif
+        painter->setClipRegion(region, Qt::ClipOperation(cmd.extra));
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawText: {
+        QPointF pos(d->floats.at(cmd.extra), d->floats.at(cmd.extra+1));
+        QList<QVariant> variants(d->variants.at(cmd.offset).value<QList<QVariant> >());
+
+        QFont font(variants.at(0).value<QFont>());
+        QString text(variants.at(1).value<QString>());
+
+        painter->setFont(font);
+        painter->drawText(pos, text);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawTextItem: {
+        QPointF pos(d->floats.at(cmd.extra), d->floats.at(cmd.extra+1));
+        QTextItemIntCopy *tiCopy = reinterpret_cast<QTextItemIntCopy *>(qVariantValue<void *>(d->variants.at(cmd.offset)));
+        QTextItemInt &ti = (*tiCopy)();
+        QString text(ti.text());
+
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_DrawTextItem:" << pos << " " << text << " " << scaleFactor;
+#endif
+
+        QFont font(ti.font());
+        font.setUnderline(false);
+        font.setStrikeOut(false);
+        font.setOverline(false);
+
+        const QTextItemInt &si = static_cast<const QTextItemInt &>(ti);
+        qreal justificationWidth = 0;
+        if (si.justified)
+            justificationWidth = si.width.toReal();
+        qreal scaleFactor = font.d->dpi/qreal(qt_defaultDpiY());
+
+        if (scaleFactor != 1.0) {
+            QFont fnt(font);
+            QFakeDevice fake;
+            fake.setDpiX(qRound(scaleFactor*qt_defaultDpiX()));
+            fake.setDpiY(qRound(scaleFactor*qt_defaultDpiY()));
+            font = QFont(fnt, &fake);
+        }
+
+        int flags = Qt::TextSingleLine | Qt::TextDontClip | Qt::TextForceLeftToRight;
+        QSizeF size(1, 1);
+        if (justificationWidth > 0) {
+            size.setWidth(justificationWidth);
+            flags |= Qt::TextJustificationForced;
+            flags |= Qt::AlignJustify;
+        }
+
+        QFontMetrics fm(font);
+        QPointF pt(pos.x(), pos.y() - fm.ascent());
+        qt_format_text(font, QRectF(pt, size), flags, /*opt*/0,
+                       text, /*brect=*/0, /*tabstops=*/0, /*...*/0, /*tabarraylen=*/0, painter);
+        break; }
+    case QPaintBufferPrivate::Cmd_SystemStateChanged: {
+        QRegion systemClip(d->variants.at(cmd.offset).value<QRegion>());
+
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> Cmd_SystemStateChanged:" << systemClip;
+#endif
+
+        painter->paintEngine()->setSystemClip(systemClip);
+        painter->paintEngine()->d_ptr->systemStateChanged();
+        break; }
+    }
+}
+
+void QPaintEngineExReplayer::process(const QPaintBufferCommand &cmd)
+{
+    Q_ASSERT(painter->paintEngine()->isExtended());
+    QPaintEngineEx *xengine = static_cast<QPaintEngineEx *>(painter->paintEngine());
+
+    switch (cmd.id) {
+    case QPaintBufferPrivate::Cmd_SetBrushOrigin: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_SetBrushOrigin: " << d->variants.at(cmd.offset).toPointF();
+#endif
+        xengine->state()->brushOrigin = d->variants.at(cmd.offset).toPointF();
+        xengine->brushOriginChanged();
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetCompositionMode: {
+        QPainter::CompositionMode mode = (QPainter::CompositionMode) cmd.extra;
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_SetCompositionMode, mode: " << mode;
+#endif
+        xengine->state()->composition_mode = mode;
+        xengine->compositionModeChanged();
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetOpacity: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_SetOpacity: " << d->variants.at(cmd.offset).toDouble();
+#endif
+        xengine->state()->opacity = d->variants.at(cmd.offset).toDouble();
+        xengine->opacityChanged();
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawVectorPath: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawVectorPath: size: " << cmd.size
+//                 << ", hints:" << d->ints[cmd.offset2+cmd.size]
+                 << "pts/elms:" << cmd.offset << cmd.offset2;
+#endif
+        QVectorPathCmd path(d, cmd);
+        xengine->draw(path());
+        break; }
+
+    case QPaintBufferPrivate::Cmd_StrokeVectorPath: {
+        QPen pen = qVariantValue<QPen>(d->variants.at(cmd.extra));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_StrokeVectorPath: size: " << cmd.size
+//                 << ", hints:" << d->ints[cmd.offset2+cmd.size]
+                 << "pts/elms:" << cmd.offset << cmd.offset2;
+#endif
+        QVectorPathCmd path(d, cmd);
+        xengine->stroke(path(), pen);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_FillVectorPath: {
+        QBrush brush = qVariantValue<QBrush>(d->variants.at(cmd.extra));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_FillVectorPath: size: " << cmd.size
+//                 << ", hints:" << d->ints[cmd.offset2+cmd.size]
+                 << "pts/elms:" << cmd.offset << cmd.offset2 << brush;
+#endif
+        QVectorPathCmd path(d, cmd);
+        xengine->fill(path(), brush);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_FillRectBrush: {
+        QBrush brush = qVariantValue<QBrush>(d->variants.at(cmd.extra));
+        QRectF *rect = (QRectF *)(d->floats.constData() + cmd.offset);
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_FillRectBrush, offset: " << cmd.offset << " rect: " << *rect << " brush: " << brush;
+#endif
+        xengine->fillRect(*rect, brush);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_FillRectColor: {
+        QColor color = qVariantValue<QColor>(d->variants.at(cmd.extra));
+        QRectF *rect = (QRectF *)(d->floats.constData() + cmd.offset);
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_FillRectBrush, offset: " << cmd.offset << " rect: " << *rect << " color: " << color;
+#endif
+        xengine->fillRect(*rect, color);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPolygonF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawPolygonF, offset: " << cmd.offset << " size: " << cmd.size
+                 << " mode: " << cmd.extra
+                 << d->floats.at(cmd.offset)
+                 << d->floats.at(cmd.offset+1);
+#endif
+        xengine->drawPolygon((QPointF *) (d->floats.constData() + cmd.offset), cmd.size,
+                             (QPaintEngine::PolygonDrawMode) cmd.extra);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPolygonI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawPolygonI, offset: " << cmd.offset << " size: " << cmd.size
+                 << " mode: " << cmd.extra
+                 << d->ints.at(cmd.offset)
+                 << d->ints.at(cmd.offset+1);
+#endif
+        xengine->drawPolygon((QPoint *) (d->ints.constData() + cmd.offset), cmd.size,
+                             (QPaintEngine::PolygonDrawMode) cmd.extra);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawEllipseF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawEllipseF, offset: " << cmd.offset;
+#endif
+        xengine->drawEllipse(*(QRectF *)(d->floats.constData() + cmd.offset));
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawEllipseI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawEllipseI, offset: " << cmd.offset;
+#endif
+        xengine->drawEllipse(*(QRect *)(d->ints.constData() + cmd.offset));
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawLineF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawLineF, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        xengine->drawLines((QLineF *)(d->floats.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawLineI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawLineI, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        xengine->drawLines((QLine *)(d->ints.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPointsF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawPointsF, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        xengine->drawPoints((QPointF *)(d->floats.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPointsI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawPointsI, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        xengine->drawPoints((QPoint *)(d->ints.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPolylineF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawPolylineF, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        xengine->drawPolygon((QPointF *) (d->floats.constData() + cmd.offset), cmd.size, QPaintEngine::PolylineMode);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawPolylineI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawPolylineI, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        xengine->drawPolygon((QPoint *) (d->ints.constData() + cmd.offset), cmd.size, QPaintEngine::PolylineMode);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawRectF: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawRectF, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        xengine->drawRects((QRectF *) (d->floats.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_DrawRectI: {
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_DrawRectI, offset: " << cmd.offset << " size: " << cmd.size;
+#endif
+        xengine->drawRects((QRect *) (d->ints.constData() + cmd.offset), cmd.size);
+        break; }
+
+    case QPaintBufferPrivate::Cmd_SetClipEnabled: {
+        bool clipEnabled = d->variants.at(cmd.offset).toBool();
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_SetClipEnabled:" << clipEnabled;
+#endif
+        xengine->state()->clipEnabled = clipEnabled;
+        xengine->clipEnabledChanged();
+        break; }
+
+    case QPaintBufferPrivate::Cmd_ClipVectorPath: {
+        QVectorPathCmd path(d, cmd);
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_ClipVectorPath:" << path().elementCount();
+#endif
+        xengine->clip(path(), Qt::ClipOperation(cmd.extra));
+        break; }
+
+
+    case QPaintBufferPrivate::Cmd_ClipRect: {
+        QRect rect(QPoint(d->ints.at(cmd.offset), d->ints.at(cmd.offset + 1)),
+                   QPoint(d->ints.at(cmd.offset + 2), d->ints.at(cmd.offset + 3)));
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_ClipRect:" << rect << cmd.extra;
+#endif
+        xengine->clip(rect, Qt::ClipOperation(cmd.extra));
+        break; }
+
+    case QPaintBufferPrivate::Cmd_ClipRegion: {
+        QRegion region(d->variants.at(cmd.offset).value<QRegion>());
+#ifdef QPAINTBUFFER_DEBUG_DRAW
+        qDebug() << " -> ExCmd_ClipRegion:" << region.boundingRect() << cmd.extra;
+#endif
+        xengine->clip(region, Qt::ClipOperation(cmd.extra));
+        break; }
+
+    default:
+        QPainterReplayer::process(cmd);
+        break;
+    }
+}
+
+QPaintBufferResource::QPaintBufferResource(FreeFunc f, QObject *parent) : QObject(parent), free(f)
+{
+    connect(QPaintBufferSignalProxy::instance(), SIGNAL(aboutToDestroy(const QPaintBufferPrivate *)), this, SLOT(remove(const QPaintBufferPrivate *)));
+}
+
+QPaintBufferResource::~QPaintBufferResource()
+{
+    for (Cache::iterator it = m_cache.begin(); it != m_cache.end(); ++it)
+        free(it.value());
+}
+
+void QPaintBufferResource::insert(const QPaintBufferPrivate *key, void *value)
+{
+    Cache::iterator it = m_cache.find(key);
+    if (it != m_cache.end()) {
+        free(it.value());
+        it.value() = value;
+    } else {
+        m_cache.insert(key, value);
+    }
+}
+
+void *QPaintBufferResource::value(const QPaintBufferPrivate *key)
+{
+    Cache::iterator it = m_cache.find(key);
+    if (it != m_cache.end())
+        return it.value();
+    return 0;
+}
+
+void QPaintBufferResource::remove(const QPaintBufferPrivate *key)
+{
+    Cache::iterator it = m_cache.find(key);
+    if (it != m_cache.end()) {
+        free(it.value());
+        m_cache.erase(it);
+    }
+}
+
+QDataStream &operator<<(QDataStream &stream, const QPaintBufferCommand &command)
+{
+    quint32 id = command.id;
+    quint32 size = command.size;
+    stream << id << size;
+    stream << command.offset << command.offset2 << command.extra;
+    return stream;
+}
+
+QDataStream &operator>>(QDataStream &stream, QPaintBufferCommand &command)
+{
+    quint32 id;
+    quint32 size;
+    stream >> id >> size;
+    stream >> command.offset >> command.offset2 >> command.extra;
+    command.id = id;
+    command.size = size;
+    return stream;
+}
+
+QDataStream &operator<<(QDataStream &stream, const QPaintBuffer &buffer)
+{
+    stream << buffer.d_ptr->ints;
+    stream << buffer.d_ptr->floats;
+    stream << buffer.d_ptr->variants;
+    stream << buffer.d_ptr->commands;
+    stream << buffer.d_ptr->boundingRect;
+
+    return stream;
+}
+
+QDataStream &operator>>(QDataStream &stream, QPaintBuffer &buffer)
+{
+    stream >> buffer.d_ptr->ints;
+    stream >> buffer.d_ptr->floats;
+    stream >> buffer.d_ptr->variants;
+    stream >> buffer.d_ptr->commands;
+    stream >> buffer.d_ptr->boundingRect;
+
+    return stream;
+}
+
diff --git a/src/gui/painting/qpaintbuffer_p.h b/src/gui/painting/qpaintbuffer_p.h
new file mode 100644
index 0000000..b360279
--- /dev/null
+++ b/src/gui/painting/qpaintbuffer_p.h
@@ -0,0 +1,439 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPAINTBUFFER_P_H
+#define QPAINTBUFFER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qpaintdevice.h>
+
+#include <private/qpaintengineex_p.h>
+#include <private/qtextengine_p.h>
+#include <QDebug>
+
+class QPaintBufferPrivate;
+class QPaintBufferPlayback;
+
+class Q_GUI_EXPORT QPaintBuffer : public QPaintDevice
+{
+public:
+    QPaintBuffer();
+    QPaintBuffer(const QPaintBuffer &other);
+    ~QPaintBuffer();
+
+    bool isEmpty() const;
+
+    void draw(QPainter *painter) const;
+    void setBoundingRect(const QRectF &rect);
+    QRectF boundingRect() const;
+
+    virtual QPaintEngine *paintEngine() const;
+    virtual int metric(PaintDeviceMetric m) const;
+    virtual int devType() const;
+
+    QPaintBuffer &operator=(const QPaintBuffer &other);
+
+private:
+    friend class QPainterReplayer;
+    friend class QOpenGLReplayer;
+
+    friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &stream, const QPaintBuffer &buffer);
+    friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QPaintBuffer &buffer);
+
+    QPaintBufferPrivate *d_ptr;
+};
+
+Q_GUI_EXPORT QDataStream &operator<<(QDataStream &stream, const QPaintBuffer &buffer);
+Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QPaintBuffer &buffer);
+
+class QPaintBufferEngine;
+
+class QTextItemIntCopy
+{
+public:
+    QTextItemIntCopy(const QTextItem &item);
+    ~QTextItemIntCopy();
+    QTextItemInt &operator () () {return m_item;}
+private:
+    QTextItemInt m_item;
+    QFont m_font;
+};
+
+struct QPaintBufferCommand
+{
+    uint id : 8;
+    uint size : 24;
+
+    int offset;
+    int offset2;
+    int extra;
+};
+
+QDataStream &operator<<(QDataStream &stream, const QPaintBufferCommand &command);
+QDataStream &operator>>(QDataStream &stream, QPaintBufferCommand &command);
+
+Q_DECLARE_TYPEINFO(QPaintBufferCommand, Q_MOVABLE_TYPE);
+
+class QPaintBufferPrivate
+{
+public:
+    enum Command {
+        Cmd_Save,
+        Cmd_Restore,
+
+        Cmd_SetBrush,
+        Cmd_SetBrushOrigin,
+        Cmd_SetClipEnabled,
+        Cmd_SetCompositionMode,
+        Cmd_SetOpacity,
+        Cmd_SetPen,
+        Cmd_SetRenderHints,
+        Cmd_SetTransform,
+        Cmd_SetBackgroundMode,
+
+        Cmd_ClipPath,
+        Cmd_ClipRect,
+        Cmd_ClipRegion,
+        Cmd_ClipVectorPath,
+
+        Cmd_DrawVectorPath,
+        Cmd_FillVectorPath,
+        Cmd_StrokeVectorPath,
+
+        Cmd_DrawConvexPolygonF,
+        Cmd_DrawConvexPolygonI,
+        Cmd_DrawEllipseF,
+        Cmd_DrawEllipseI,
+        Cmd_DrawLineF,
+        Cmd_DrawLineI,
+        Cmd_DrawPath,
+        Cmd_DrawPointsF,
+        Cmd_DrawPointsI,
+        Cmd_DrawPolygonF,
+        Cmd_DrawPolygonI,
+        Cmd_DrawPolylineF,
+        Cmd_DrawPolylineI,
+        Cmd_DrawRectF,
+        Cmd_DrawRectI,
+
+        Cmd_FillRectBrush,
+        Cmd_FillRectColor,
+
+        Cmd_DrawText,
+        Cmd_DrawTextItem,
+
+        Cmd_DrawImagePos,
+        Cmd_DrawImageRect,
+        Cmd_DrawPixmapPos,
+        Cmd_DrawPixmapRect,
+        Cmd_DrawTiledPixmap,
+
+        Cmd_SystemStateChanged,
+
+        Cmd_LastCommand
+    };
+
+    QPaintBufferPrivate();
+    ~QPaintBufferPrivate();
+
+    int addData(const int *data, int count) {
+        if (count <= 0)
+            return 0;
+        int pos = ints.size();
+        ints.resize(pos + count);
+        memcpy(ints.data() + pos, data, count * sizeof(int));
+        return pos;
+    }
+
+    int addData(const qreal *data, int count) {
+        if (count <= 0)
+            return 0;
+        int pos = floats.size();
+        floats.resize(pos + count);
+        memcpy(floats.data() + pos, data, count * sizeof(qreal));
+        return pos;
+    }
+
+    int addData(const QVariant &var) {
+        variants << var;
+        return variants.size() - 1;
+    }
+
+    QPaintBufferCommand *addCommand(Command command) {
+        QPaintBufferCommand cmd;
+        cmd.id = command;
+        cmd.size = cmd.offset = cmd.offset2 = cmd.extra = 0;
+        commands << cmd;
+        return &commands.last();
+    }
+
+    QPaintBufferCommand *addCommand(Command command, const QVariant &var) {
+        QPaintBufferCommand cmd;
+        cmd.id = command;
+        cmd.offset = addData(var);
+        cmd.size = cmd.offset2 = cmd.extra = 0;
+        commands << cmd;
+        return &commands.last();
+    }
+
+    QPaintBufferCommand *addCommand(Command command, const QVectorPath &path) {
+        QPaintBufferCommand cmd;
+        cmd.id = command;
+        cmd.offset = addData(path.points(), path.elementCount() * 2);
+        cmd.offset2 = ints.size();
+        ints << path.hints();
+        // The absence of path elements is indicated by setting the highest bit in 'cmd.offset2'.
+        if (path.elements())
+            addData((const int *) path.elements(), path.elementCount());
+        else
+            cmd.offset2 |= 0x80000000;
+        cmd.size = path.elementCount();
+        cmd.extra = 0;
+        commands << cmd;
+        return &commands.last();
+    }
+
+    QPaintBufferCommand *addCommand(Command command , const qreal *pts, int arrayLength, int elementCount) {
+        QPaintBufferCommand cmd;
+        cmd.id = command;
+        cmd.offset = addData(pts, arrayLength);
+        cmd.size = elementCount;
+        cmd.offset2 = cmd.extra = 0;
+        commands << cmd;
+        return &commands.last();
+    }
+
+    QPaintBufferCommand *addCommand(Command command , const int *pts, int arrayLength, int elementCount) {
+        QPaintBufferCommand cmd;
+        cmd.id = command;
+        cmd.offset = addData(pts, arrayLength);
+        cmd.size = elementCount;
+        cmd.offset2 = cmd.extra = 0;
+        commands << cmd;
+        return &commands.last();
+    }
+
+    inline void updateBoundingRect(const QRectF &rect);
+
+    QAtomicInt ref;
+
+    QVector<int> ints;
+    QVector<qreal> floats;
+    QVector<QVariant> variants;
+
+    QVector<QPaintBufferCommand> commands;
+
+    QPaintBufferEngine *engine;
+    QRectF boundingRect;
+    qreal penWidthAdjustment;
+    uint calculateBoundingRect : 1;
+
+    void *cache;
+};
+
+
+struct QVectorPathCmd
+{
+    // The absence of path elements is indicated by setting the highest bit in 'cmd.offset2'.
+    QVectorPathCmd(QPaintBufferPrivate *d, const QPaintBufferCommand &cmd)
+        : vectorPath(d->floats.constData() + cmd.offset,
+                     cmd.size,
+                     cmd.offset2 & 0x80000000
+                     ? 0
+                     : (const QPainterPath::ElementType *) (d->ints.constData() + cmd.offset2 + 1),
+                     *(d->ints.constData() + (cmd.offset2 & 0x7fffffff))) {}
+
+    inline const QVectorPath &operator()() const { return vectorPath; }
+
+    QVectorPath vectorPath;
+};
+
+
+class Q_GUI_EXPORT QPainterReplayer
+{
+public:
+    QPainterReplayer() { }
+
+    virtual ~QPainterReplayer() { }
+
+    void setupTransform(QPainter *painter);
+    void process(const QPaintBufferCommand &cmd);
+    void draw(const QPaintBuffer &buffer, QPainter *painter);
+
+protected:
+    QPaintBufferPrivate *d;
+    QTransform m_world_matrix;
+
+    QPainter *painter;
+};
+
+class Q_GUI_EXPORT QPaintEngineExReplayer : public QPainterReplayer
+{
+public:
+    QPaintEngineExReplayer() { }
+
+    void process(const QPaintBufferCommand &cmd);
+};
+
+class QPaintBufferEnginePrivate;
+
+class QPaintBufferEngine : public QPaintEngineEx
+{
+    Q_DECLARE_PRIVATE(QPaintBufferEngine)
+public:
+    QPaintBufferEngine(QPaintBufferPrivate *buffer);
+
+    virtual bool begin(QPaintDevice *device);
+    virtual bool end();
+
+    virtual Type type() const { return QPaintEngine::PaintBuffer; }
+
+    virtual QPainterState *createState(QPainterState *orig) const;
+
+    virtual void draw(const QVectorPath &path);
+    virtual void fill(const QVectorPath &path, const QBrush &brush);
+    virtual void stroke(const QVectorPath &path, const QPen &pen);
+
+    virtual void clip(const QVectorPath &path, Qt::ClipOperation op);
+    virtual void clip(const QRect &rect, Qt::ClipOperation op);
+    virtual void clip(const QRegion &region, Qt::ClipOperation op);
+    virtual void clip(const QPainterPath &path, Qt::ClipOperation op);
+
+    virtual void clipEnabledChanged();
+    virtual void penChanged();
+    virtual void brushChanged();
+    virtual void brushOriginChanged();
+    virtual void opacityChanged();
+    virtual void compositionModeChanged();
+    virtual void renderHintsChanged();
+    virtual void transformChanged();
+    virtual void backgroundModeChanged();
+
+    virtual void fillRect(const QRectF &rect, const QBrush &brush);
+    virtual void fillRect(const QRectF &rect, const QColor &color);
+
+    virtual void drawRects(const QRect *rects, int rectCount);
+    virtual void drawRects(const QRectF *rects, int rectCount);
+
+    virtual void drawLines(const QLine *lines, int lineCount);
+    virtual void drawLines(const QLineF *lines, int lineCount);
+
+    virtual void drawEllipse(const QRectF &r);
+    virtual void drawEllipse(const QRect &r);
+
+    virtual void drawPath(const QPainterPath &path);
+
+    virtual void drawPoints(const QPointF *points, int pointCount);
+    virtual void drawPoints(const QPoint *points, int pointCount);
+
+    virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
+    virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode);
+
+    virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr);
+    virtual void drawPixmap(const QPointF &pos, const QPixmap &pm);
+
+    virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr,
+                           Qt::ImageConversionFlags flags = Qt::AutoColor);
+    virtual void drawImage(const QPointF &pos, const QImage &image);
+
+    virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s);
+
+    virtual void drawTextItem(const QPointF &pos, const QTextItem &ti);
+
+    virtual void setState(QPainterState *s);
+    virtual uint flags() const {return QPaintEngineEx::DoNotEmulate;}
+
+    QPaintBufferPrivate *buffer;
+
+    mutable int m_begin_detected : 1;
+    mutable int m_save_detected : 1;
+    mutable int m_stream_raw_text_items : 1;
+    mutable int m_unused : 29;
+
+    mutable QPainterState *m_created_state;
+};
+
+class Q_GUI_EXPORT QPaintBufferSignalProxy : public QObject
+{
+    Q_OBJECT
+public:
+    QPaintBufferSignalProxy() : QObject() {}
+    void emitAboutToDestroy(const QPaintBufferPrivate *buffer) {
+        emit aboutToDestroy(buffer);
+    }
+    static QPaintBufferSignalProxy *instance();
+Q_SIGNALS:
+    void aboutToDestroy(const QPaintBufferPrivate *buffer);
+};
+
+// One resource per paint buffer and vice versa.
+class Q_GUI_EXPORT QPaintBufferResource : public QObject
+{
+    Q_OBJECT
+public:
+    typedef void (*FreeFunc)(void *);
+
+    QPaintBufferResource(FreeFunc f, QObject *parent = 0);
+    ~QPaintBufferResource();
+    // Set resource 'value' for 'key'.
+    void insert(const QPaintBufferPrivate *key, void *value);
+    // Return resource for 'key'.
+    void *value(const QPaintBufferPrivate *key);
+public slots:
+    // Remove entry 'key' from cache and delete resource.
+    void remove(const QPaintBufferPrivate *key);
+private:
+    typedef QHash<const QPaintBufferPrivate *, void *> Cache;
+    Cache m_cache;
+    FreeFunc free;
+};
+
+#endif // QPAINTBUFFER_P_H
diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h
index 5cd17fe..921db4f 100644
--- a/src/gui/painting/qpaintengine.h
+++ b/src/gui/painting/qpaintengine.h
@@ -212,6 +212,7 @@ public:
         Pdf,
         OpenVG,
         OpenGL2,
+        PaintBuffer,
 
         User = 50,    // first user type id
         MaxUser = 100 // last user type id
@@ -248,6 +249,7 @@ private:
     bool autoDestruct() const { return selfDestruct; }
     Q_DISABLE_COPY(QPaintEngine)
 
+    friend class QPainterReplayer;
     friend class QFontEngineBox;
     friend class QFontEngineMac;
     friend class QFontEngineWin;
diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp
index 934b385..249bcfa 100644
--- a/src/gui/painting/qpaintengine_mac.cpp
+++ b/src/gui/painting/qpaintengine_mac.cpp
@@ -116,11 +116,15 @@ QMacCGContext::QMacCGContext(QPainter *p)
 
         if (devType == QInternal::Widget) {
             QRegion clip = p->paintEngine()->systemClip();
+            QTransform native = p->deviceTransform();
+            QTransform logical = p->combinedTransform();
             if (p->hasClipping()) {
+                QRegion r = p->clipRegion();
+                r.translate(native.dx() - logical.dx(), native.dy() - logical.dy());
                 if (clip.isEmpty())
-                    clip = p->clipRegion();
+                    clip = r;
                 else
-                    clip &= p->clipRegion();
+                    clip &= r;
             }
             qt_mac_clip_cg(context, clip, 0);
 
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 86b2d0f..81924ff 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -1391,7 +1391,7 @@ void QRasterPaintEngine::clip(const QRegion &region, Qt::ClipOperation op)
         if (curClip->hasRectClip)
             newClip->setClipRegion(r & curClip->clipRect);
         else if (curClip->hasRegionClip)
-            newClip->setClipRegion(r & clip->clipRegion);
+            newClip->setClipRegion(r & curClip->clipRegion);
 
         qrasterpaintengine_dirty_clip(d, s);
     }
@@ -3079,11 +3079,11 @@ bool QRasterPaintEnginePrivate::isUnclipped_normalized(const QRect &r) const
     }
 
 
-    // currently all painting functions clips to deviceRect internally
-    if (cl->clipRect == deviceRect)
-        return true;
-
     if (cl->hasRectClip) {
+        // currently all painting functions clips to deviceRect internally
+        if (cl->clipRect == deviceRect)
+            return true;
+
         // inline contains() for performance (we know the rects are normalized)
         const QRect &r1 = cl->clipRect;
         return (r.left() >= r1.left() && r.right() <= r1.right()
@@ -3109,7 +3109,7 @@ bool QRasterPaintEnginePrivate::isUnclipped(const QRect &rect,
 
 
     // currently all painting functions that call this function clip to deviceRect internally
-    if (cl->clipRect == deviceRect)
+    if (cl->hasRectClip && cl->clipRect == deviceRect)
         return true;
 
     if (s->flags.antialiased)
@@ -3123,7 +3123,7 @@ bool QRasterPaintEnginePrivate::isUnclipped(const QRect &rect,
         r.setHeight(r.height() + 2 * penWidth);
     }
 
-    if (!cl->clipRect.isEmpty()) {
+    if (cl->hasRectClip) {
         // inline contains() for performance (we know the rects are normalized)
         const QRect &r1 = cl->clipRect;
         return (r.left() >= r1.left() && r.right() <= r1.right()
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index c2703bc..4b0f8ae 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -92,40 +92,6 @@ QRectF QVectorPath::controlPointRect() const
     return QRectF(QPointF(m_cp_rect.x1, m_cp_rect.y1), QPointF(m_cp_rect.x2, m_cp_rect.y2));
 }
 
-QPainterPath QVectorPath::convertToPainterPath() const
-{
-    QPainterPath path;
-
-    if (m_count == 0)
-        return path;
-
-    const QPointF *points = (const QPointF *) m_points;
-
-    if (m_elements) {
-        for (int i=0; i<m_count; ++i) {
-            switch (m_elements[i]) {
-            case QPainterPath::MoveToElement:
-                path.moveTo(points[i]);
-                break;
-            case QPainterPath::LineToElement:
-                path.lineTo(points[i]);
-                break;
-            case QPainterPath::CurveToElement:
-                path.cubicTo(points[i], points[i+1], points[i+2]);
-                break;
-            default:
-                break;
-            }
-        }
-    } else {
-        path.moveTo(points[0]);
-        for (int i=1; i<m_count; ++i)
-            path.lineTo(points[i]);
-    }
-
-    return path;
-}
-
 const QVectorPath &qtVectorPathForPath(const QPainterPath &path)
 {
     Q_ASSERT(path.d_func());
diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h
index a252b5e..1fc1bd1 100644
--- a/src/gui/painting/qpaintengineex_p.h
+++ b/src/gui/painting/qpaintengineex_p.h
@@ -209,6 +209,14 @@ public:
 
     virtual QPixmapFilter *createPixmapFilter(int /*type*/) const { return 0; }
 
+    // These flags are needed in the implementation of paint buffers.
+    enum Flags
+    {
+        DoNotEmulate = 0x01,        // If set, QPainter will not wrap this engine in an emulation engine.
+        IsEmulationEngine = 0x02    // If set, this object is a QEmulationEngine.
+    };
+    virtual uint flags() const {return 0;}
+
 protected:
     QPaintEngineEx(QPaintEngineExPrivate &data);
 };
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index d82e7ee..a6bea76 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -162,6 +162,9 @@ static bool qt_painter_thread_test(int devType, const char *what, bool extraCond
 void QPainterPrivate::checkEmulation()
 {
     Q_ASSERT(extended);
+    if (extended->flags() & QPaintEngineEx::DoNotEmulate)
+        return;
+
     bool doEmulation = false;
     if (state->bgMode == Qt::OpaqueMode)
         doEmulation = true;
@@ -1835,11 +1838,6 @@ bool QPainter::end()
         return true;
     }
 
-    if (d->states.size() > 1) {
-        qWarning("QPainter::end: Painter ended with %d saved states",
-                 d->states.size());
-    }
-
     bool ended = true;
 
     if (d->engine->isActive()) {
@@ -1853,6 +1851,11 @@ bool QPainter::end()
         }
     }
 
+    if (d->states.size() > 1) {
+        qWarning("QPainter::end: Painter ended with %d saved states",
+                 d->states.size());
+    }
+
     if (d->engine->autoDestruct()) {
         delete d->engine;
     }
@@ -7542,9 +7545,10 @@ void qt_format_text(const QFont &fnt, const QRectF &_r,
     if (!painter)
         tf |= Qt::TextDontPrint;
 
-    uint maxUnderlines = 0;
+    int maxUnderlines = 0;
     int numUnderlines = 0;
-    QVarLengthArray<int, 32> underlinePositions(1);
+    int underlinePositionStack[32];
+    int *underlinePositions = underlinePositionStack;
 
     QFontMetricsF fm(fnt);
     QString text = str;
@@ -7553,46 +7557,54 @@ start_lengthVariant:
     bool hasMoreLengthVariants = false;
     // compatible behaviour to the old implementation. Replace
     // tabs by spaces
+    QChar *chr = text.data() + offset;
+    QChar *end = text.data() + text.length();
     bool has_tab = false;
-    int old_offset = offset;
-    for (; offset < text.length(); offset++) {
-        QChar chr = text.at(offset);
-        if (chr == QLatin1Char('\r') || (singleline && chr == QLatin1Char('\n'))) {
-            text[offset] = QLatin1Char(' ');
-        } else if (chr == QLatin1Char('\n')) {
-            chr = QChar::LineSeparator;
-        } else if (chr == QLatin1Char('&')) {
+    while (chr != end) {
+        if (*chr == QLatin1Char('\r') || (singleline && *chr == QLatin1Char('\n'))) {
+            *chr = QLatin1Char(' ');
+        } else if (*chr == QLatin1Char('\n')) {
+            *chr = QChar::LineSeparator;
+        } else if (*chr == QLatin1Char('&')) {
             ++maxUnderlines;
-        } else if (chr == QLatin1Char('\t')) {
-            if (!expandtabs) {
-                text[offset] = QLatin1Char(' ');
-            } else if (!tabarraylen && !tabstops) {
-                tabstops = qRound(fm.width(QLatin1Char('x'))*8);
-            }
+        } else if (*chr == QLatin1Char('\t')) {
             has_tab = true;
-        } else if (chr == QChar(ushort(0x9c))) {
+        } else if (*chr == QChar(ushort(0x9c))) {
             // string with multiple length variants
+            end = chr;
             hasMoreLengthVariants = true;
             break;
         }
+        ++chr;
+    }
+    if (has_tab) {
+        if (!expandtabs) {
+            chr = text.data() + offset;
+            while (chr != end) {
+                if (*chr == QLatin1Char('\t'))
+                    *chr = QLatin1Char(' ');
+                ++chr;
+            }
+        } else if (!tabarraylen && !tabstops) {
+            tabstops = qRound(fm.width(QLatin1Char('x'))*8);
+        }
     }
 
-    int length = offset - old_offset;
-    if ((hidemnmemonic || showmnemonic) && maxUnderlines > 0) {
-        underlinePositions.resize(maxUnderlines + 1);
-
-        QChar *cout = text.data() + old_offset;
+    QChar *cout = end;
+    if (hidemnmemonic || showmnemonic) {
+        if (maxUnderlines > 32)
+            underlinePositions = new int[maxUnderlines];
+        cout = text.data() + offset;
         QChar *cin = cout;
-        int l = length;
+        int l = end - cout;
         while (l) {
             if (*cin == QLatin1Char('&')) {
                 ++cin;
-                --length;
                 --l;
                 if (!l)
                     break;
                 if (*cin != QLatin1Char('&') && !hidemnmemonic)
-                    underlinePositions[numUnderlines++] =  cout - text.data() - old_offset;
+                    underlinePositions[numUnderlines++] = cout - text.unicode();
             }
             *cout = *cin;
             ++cout;
@@ -7609,7 +7621,7 @@ start_lengthVariant:
     qreal height = 0;
     qreal width = 0;
 
-    QString finalText = text.mid(old_offset, length);
+    QString finalText = text.mid(offset, cout - (text.data() + offset));
     QStackTextEngine engine(finalText, fnt);
     if (option) {
         engine.option = *option;
@@ -7628,7 +7640,7 @@ start_lengthVariant:
         engine.forceJustification = true;
     QTextLayout textLayout(&engine);
     textLayout.setCacheEnabled(true);
-    textLayout.engine()->underlinePositions = underlinePositions.data();
+    textLayout.engine()->underlinePositions = underlinePositions;
 
     if (finalText.isEmpty()) {
         height = fm.height();
@@ -7697,7 +7709,7 @@ start_lengthVariant:
     QRectF bounds = QRectF(r.x() + xoff, r.y() + yoff, width, height);
 
     if (hasMoreLengthVariants && !(tf & Qt::TextLongestVariant) && !r.contains(bounds)) {
-        offset++;
+        offset = end - text.data() + 1;
         goto start_lengthVariant;
     }
     if (brect)
@@ -7726,6 +7738,9 @@ start_lengthVariant:
             painter->restore();
         }
     }
+
+    if (underlinePositions != underlinePositionStack)
+        delete [] underlinePositions;
 }
 
 /*!
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h
index 9d472e8..a0ee749 100644
--- a/src/gui/painting/qpainterpath.h
+++ b/src/gui/painting/qpainterpath.h
@@ -220,6 +220,7 @@ private:
     friend class QPainterPathStrokerPrivate;
     friend class QMatrix;
     friend class QTransform;
+    friend class QVectorPath;
     friend Q_GUI_EXPORT const QVectorPath &qtVectorPathForPath(const QPainterPath &);
 
 #ifndef QT_NO_DATASTREAM
@@ -237,6 +238,7 @@ public:
     friend class QPainterPathStrokerPrivate;
     friend class QMatrix;
     friend class QTransform;
+    friend class QVectorPath;
     friend struct QPainterPathPrivateDeleter;
 #ifndef QT_NO_DATASTREAM
     friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QPainterPath &);
diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h
index bb455cf..94be339 100644
--- a/src/gui/painting/qpainterpath_p.h
+++ b/src/gui/painting/qpainterpath_p.h
@@ -176,6 +176,42 @@ public:
 };
 
 
+inline const QPainterPath QVectorPath::convertToPainterPath() const
+{
+        QPainterPath path;
+        path.ensureData();
+        QPainterPathData *data = path.d_func();
+        data->elements.reserve(m_count);
+        int index = 0;
+        data->elements[0].x = m_points[index++];
+        data->elements[0].y = m_points[index++];
+
+        if (m_elements) {
+            data->elements[0].type = m_elements[0];
+            for (int i=1; i<m_count; ++i) {
+                QPainterPath::Element element;
+                element.x = m_points[index++];
+                element.y = m_points[index++];
+                element.type = m_elements[i];
+                data->elements << element;
+            }
+        } else {
+            data->elements[0].type = QPainterPath::MoveToElement;
+            for (int i=1; i<m_count; ++i) {
+                QPainterPath::Element element;
+                element.x = m_points[index++];
+                element.y = m_points[index++];
+                element.type = QPainterPath::LineToElement;
+                data->elements << element;
+            }
+        }
+
+        if (m_hints & OddEvenFill)
+            data->fillRule = Qt::OddEvenFill;
+        else
+            data->fillRule = Qt::WindingFill;
+        return path;
+}
 
 void Q_GUI_EXPORT qt_find_ellipse_coords(const QRectF &r, qreal angle, qreal length,
                                          QPointF* startPoint, QPointF *endPoint);
diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp
index 882e6bc..882f994 100644
--- a/src/gui/painting/qprinter.cpp
+++ b/src/gui/painting/qprinter.cpp
@@ -1286,6 +1286,23 @@ int QPrinter::numCopies() const
 
 
 /*!
+    Returns the number of copies that will be printed. The default
+    value is 1.
+
+    This function always returns the actual value specified in the print
+    dialog or using setNumCopies().
+
+    \sa setNumCopies(), numCopies();
+*/
+int QPrinter::actualNumCopies() const
+{
+    Q_D(const QPrinter);
+    return qt_printerRealNumCopies(d->paintEngine);
+}
+
+
+
+/*!
   Sets the number of copies to be printed to \a numCopies.
 
   The printer driver reads this setting and prints the specified
diff --git a/src/gui/painting/qprinter.h b/src/gui/painting/qprinter.h
index 46419f4..16f2182 100644
--- a/src/gui/painting/qprinter.h
+++ b/src/gui/painting/qprinter.h
@@ -197,6 +197,8 @@ public:
     void setNumCopies(int);
     int numCopies() const;
 
+    int actualNumCopies() const;
+
     void setPaperSource(PaperSource);
     PaperSource paperSource() const;
 
diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h
index 1e909d4..199d0d6 100644
--- a/src/gui/painting/qvectorpath_p.h
+++ b/src/gui/painting/qvectorpath_p.h
@@ -127,11 +127,10 @@ public:
     inline bool isEmpty() const { return m_points == 0; }
 
     inline int elementCount() const { return m_count; }
+    inline const QPainterPath convertToPainterPath() const;
 
     static inline uint polygonFlags(QPaintEngine::PolygonDrawMode mode);
 
-    QPainterPath convertToPainterPath() const;
-
 private:
     Q_DISABLE_COPY(QVectorPath)
 
diff --git a/src/s60main/qts60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp
index f4e7def..45a1a3d 100644
--- a/src/s60main/qts60mainapplication.cpp
+++ b/src/gui/s60framework/qs60mainapplication.cpp
@@ -41,44 +41,54 @@
 
 // INCLUDE FILES
 #include <exception>
-#include "qts60maindocument_p.h"
-#include "qts60mainapplication_p.h"
+#include "qs60maindocument_p.h"
+#include "qs60mainapplication_p.h"
 #include <bautils.h>
 #include <coemain.h>
 
+QT_BEGIN_NAMESPACE
+
+/**
+ * factory function to create the QtS60Main application class
+ */
+CApaApplication* NewApplication()
+{
+    return new QS60MainApplication;
+}
+
 // ============================ MEMBER FUNCTIONS ===============================
 
 
 _LIT(KQtWrapperResourceFile, "\\resource\\apps\\s60main.rsc");
 
 // -----------------------------------------------------------------------------
-// CQtS60MainApplication::CreateDocumentL()
+// QS60MainApplication::CreateDocumentL()
 // Creates CApaDocument object
 // -----------------------------------------------------------------------------
 //
-CApaDocument* CQtS60MainApplication::CreateDocumentL()
+CApaDocument* QS60MainApplication::CreateDocumentL()
 {
     // Create an QtS60Main document, and return a pointer to it
-    return (static_cast<CApaDocument*>(CQtS60MainDocument::NewL(*this)));
+    return (static_cast<CApaDocument*>(QS60MainDocument::NewL(*this)));
 }
 
 // -----------------------------------------------------------------------------
-// CQtS60MainApplication::AppDllUid()
+// QS60MainApplication::AppDllUid()
 // Returns application UID
 // -----------------------------------------------------------------------------
 //
-TUid CQtS60MainApplication::AppDllUid() const
+TUid QS60MainApplication::AppDllUid() const
 {
     // Return the UID for the QtS60Main application
     return ProcessUid();
 }
 
 // -----------------------------------------------------------------------------
-// CQtS60MainApplication::ResourceFileName()
+// QS60MainApplication::ResourceFileName()
 // Returns application resource filename
 // -----------------------------------------------------------------------------
 //
-TFileName CQtS60MainApplication::ResourceFileName() const
+TFileName QS60MainApplication::ResourceFileName() const
 {
     TFindFile finder(iCoeEnv->FsSession());
     TInt err = finder.FindByDir(KQtWrapperResourceFile, KNullDesC);
@@ -87,5 +97,6 @@ TFileName CQtS60MainApplication::ResourceFileName() const
     return KNullDesC();
 }
 
+QT_END_NAMESPACE
 
 // End of File
diff --git a/src/s60main/qts60mainapplication_p.h b/src/gui/s60framework/qs60mainapplication_p.h
index f9d2ebb..572bbd3 100644
--- a/src/s60main/qts60mainapplication_p.h
+++ b/src/gui/s60framework/qs60mainapplication_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef __QtS60MainAPPLICATION_H__
-#define __QtS60MainAPPLICATION_H__
+#ifndef QS60MAINAPPLICATION_P_H
+#define QS60MAINAPPLICATION_P_H
 
 //
 //  W A R N I N G
@@ -56,49 +56,57 @@
 // INCLUDES
 #include <aknapp.h>
 
+#include <qglobal.h>
+
 // CLASS DECLARATION
 
+QT_BEGIN_NAMESPACE
+
+CApaApplication* NewApplication();
+
 static TUid ProcessUid()
-    {
+{
     RProcess me;
     TSecureId securId = me.SecureId();
     me.Close();
     return securId.operator TUid();
-    }
+}
 
 /**
-* CQtS60MainApplication application class.
+* QS60MainApplication application class.
 * Provides factory to create concrete document object.
-* An instance of CQtS60MainApplication is the application part of the
+* An instance of QS60MainApplication is the application part of the
 * AVKON application framework for the QtS60Main example application.
 */
-class CQtS60MainApplication : public CAknApplication
-    {
-    public: // Functions from base classes
-
-        /**
-        * From CApaApplication, AppDllUid.
-        * @return Application's UID (KUidQtS60MainApp).
-        */
-        TUid AppDllUid() const;
-
-        /**
-        * From CApaApplication, ResourceFileName
-        * @return Application's resource filename (KUidQtS60MainApp).
-        */
-        TFileName ResourceFileName() const;
-
-    protected: // Functions from base classes
-
-        /**
-        * From CApaApplication, CreateDocumentL.
-        * Creates CQtS60MainDocument document object. The returned
-        * pointer in not owned by the CQtS60MainApplication object.
-        * @return A pointer to the created document object.
-        */
-        CApaDocument* CreateDocumentL();
-    };
-
-#endif // __QtS60MainAPPLICATION_H__
+class QS60MainApplication : public CAknApplication
+{
+public: // Functions from base classes
+
+    /**
+     * From CApaApplication, AppDllUid.
+     * @return Application's UID (KUidQtS60MainApp).
+     */
+    TUid AppDllUid() const;
+
+    /**
+     * From CApaApplication, ResourceFileName
+     * @return Application's resource filename (KUidQtS60MainApp).
+     */
+    TFileName ResourceFileName() const;
+
+protected: // Functions from base classes
+
+    /**
+     * From CApaApplication, CreateDocumentL.
+     * Creates QS60MainDocument document object. The returned
+     * pointer in not owned by the QS60MainApplication object.
+     * @return A pointer to the created document object.
+     */
+    CApaDocument* CreateDocumentL();
+};
+
+QT_END_NAMESPACE
+
+#endif // QS60MAINAPPLICATION_P_H
 
 // End of File
diff --git a/src/s60main/qts60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp
index eb3b62a..7b5ea1d 100644
--- a/src/s60main/qts60mainappui.cpp
+++ b/src/gui/s60framework/qs60mainappui.cpp
@@ -48,20 +48,22 @@
 #include <s60main.rsg>
 #include <avkon.rsg>
 
-#include "qts60mainappui_p.h"
+#include "qs60mainappui_p.h"
 #include <QtGui/qapplication.h>
 #include <QtGui/qmenu.h>
 #include <QtGui/private/qt_s60_p.h>
 
+QT_BEGIN_NAMESPACE
+
 // ============================ MEMBER FUNCTIONS ===============================
 
 
 // -----------------------------------------------------------------------------
-// CQtS60MainAppUi::ConstructL()
+// QS60MainAppUi::ConstructL()
 // Symbian 2nd phase constructor can leave.
 // -----------------------------------------------------------------------------
 //
-void CQtS60MainAppUi::ConstructL()
+void QS60MainAppUi::ConstructL()
 {
     // Cone's heap and handle checks on app destruction are not suitable for Qt apps, as many
     // objects can still exist in static data at that point. Instead we will print relevant information
@@ -76,51 +78,44 @@ void CQtS60MainAppUi::ConstructL()
 
     CEikButtonGroupContainer* nativeContainer = Cba();
     nativeContainer->SetCommandSetL(R_AVKON_SOFTKEYS_EMPTY_WITH_IDS);
-
-    // Create async callback to call Qt main,
-    // this is required to give S60 app FW to finish starting correctly
-    TCallBack callBack(OpenCMainStaticCallBack, this);
-    iAsyncCallBack = new(ELeave) CAsyncCallBack(callBack, CActive::EPriorityIdle);
-    iAsyncCallBack->Call();
 }
 
 // -----------------------------------------------------------------------------
-// CQtS60MainAppUi::CQtS60MainAppUi()
+// QS60MainAppUi::QS60MainAppUi()
 // C++ default constructor can NOT contain any code, that might leave.
 // -----------------------------------------------------------------------------
 //
-CQtS60MainAppUi::CQtS60MainAppUi()
+QS60MainAppUi::QS60MainAppUi()
 {
     // No implementation required
 }
 
 // -----------------------------------------------------------------------------
-// CQtS60MainAppUi::~CQtS60MainAppUi()
+// QS60MainAppUi::~QS60MainAppUi()
 // Destructor.
 // -----------------------------------------------------------------------------
 //
-CQtS60MainAppUi::~CQtS60MainAppUi()
+QS60MainAppUi::~QS60MainAppUi()
 {
-    delete iAsyncCallBack;
 }
 
 // -----------------------------------------------------------------------------
-// CQtS60MainAppUi::HandleCommandL()
+// QS60MainAppUi::HandleCommandL()
 // Takes care of command handling.
 // -----------------------------------------------------------------------------
 //
-void CQtS60MainAppUi::HandleCommandL(TInt aCommand)
+void QS60MainAppUi::HandleCommandL(TInt aCommand)
 {
     if (qApp)
         qApp->symbianHandleCommand(aCommand);
 }
 
 // -----------------------------------------------------------------------------
-// CQtS60MainAppUi::HandleResourceChangeL()
+// QS60MainAppUi::HandleResourceChangeL()
 // Takes care of event handling.
 // -----------------------------------------------------------------------------
 //
-void CQtS60MainAppUi::HandleResourceChangeL(TInt aType)
+void QS60MainAppUi::HandleResourceChangeL(TInt aType)
 {
     CAknAppUi::HandleResourceChangeL(aType);
 
@@ -128,7 +123,7 @@ void CQtS60MainAppUi::HandleResourceChangeL(TInt aType)
         qApp->symbianResourceChange(aType);
 }
 
-void CQtS60MainAppUi::HandleWsEventL(const TWsEvent& aEvent, CCoeControl *control)
+void QS60MainAppUi::HandleWsEventL(const TWsEvent& aEvent, CCoeControl *control)
 {
     int result = 0;
     if (qApp)
@@ -147,44 +142,17 @@ void CQtS60MainAppUi::HandleWsEventL(const TWsEvent& aEvent, CCoeControl *contro
 //  AppView
 // -----------------------------------------------------------------------------
 //
-void CQtS60MainAppUi::HandleStatusPaneSizeChange()
+void QS60MainAppUi::HandleStatusPaneSizeChange()
 {
     HandleResourceChangeL(KInternalStatusPaneChange);
     HandleStackedControlsResourceChange(KInternalStatusPaneChange);
 }
 
-// -----------------------------------------------------------------------------
-//  Called asynchronously from ConstructL() - passes call to nan static method
-// -----------------------------------------------------------------------------
-//
-TInt CQtS60MainAppUi::OpenCMainStaticCallBack(TAny* aObject)
-{
-    CQtS60MainAppUi* myObj = static_cast<CQtS60MainAppUi*>(aObject);
-    myObj->OpenCMainCallBack();
-    return 0;
-}
-
-#include "qtS60main_mcrt0.cpp"
-
-// -----------------------------------------------------------------------------
-//  Invokes Qt main, the Qt main will block and when we return from there
-//  application should be closed. -> Call Exit();
-// -----------------------------------------------------------------------------
-//
-void CQtS60MainAppUi::OpenCMainCallBack()
+void QS60MainAppUi::DynInitMenuBarL(TInt, CEikMenuBar *)
 {
-    TInt ret;
-    TRAPD(err, ret = QtMainWrapper());
-    Q_UNUSED(ret);
-    Q_UNUSED(err);
-    Exit();
 }
 
-void CQtS60MainAppUi::DynInitMenuBarL(TInt, CEikMenuBar *)
-{
-}
-
-void CQtS60MainAppUi::DynInitMenuPaneL(TInt aResourceId, CEikMenuPane *aMenuPane)
+void QS60MainAppUi::DynInitMenuPaneL(TInt aResourceId, CEikMenuPane *aMenuPane)
 {
     if (aResourceId == R_QT_WRAPPERAPP_MENU) {
         if (aMenuPane->NumberOfItemsInPane() <= 1)
@@ -195,7 +163,7 @@ void CQtS60MainAppUi::DynInitMenuPaneL(TInt aResourceId, CEikMenuPane *aMenuPane
     }
 }
 
-void CQtS60MainAppUi::RestoreMenuL(CCoeControl* aMenuWindow, TInt aMenuId, TMenuType aMenuType)
+void QS60MainAppUi::RestoreMenuL(CCoeControl* aMenuWindow, TInt aMenuId, TMenuType aMenuType)
 {
     if ((aMenuId == R_QT_WRAPPERAPP_MENUBAR) || (aMenuId == R_AVKON_MENUPANE_FEP_DEFAULT)) {
         TResourceReader reader;
@@ -210,4 +178,6 @@ void CQtS60MainAppUi::RestoreMenuL(CCoeControl* aMenuWindow, TInt aMenuId, TMenu
         DynInitMenuBarL(aMenuId, (CEikMenuBar*)aMenuWindow);
 }
 
+QT_END_NAMESPACE
+
 // End of File
diff --git a/src/gui/s60framework/qs60mainappui_p.h b/src/gui/s60framework/qs60mainappui_p.h
new file mode 100644
index 0000000..ef2de27
--- /dev/null
+++ b/src/gui/s60framework/qs60mainappui_p.h
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Symbian application wrapper of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QS60MAINAPPUI_P_H
+#define QS60MAINAPPUI_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+// INCLUDES
+#include <aknappui.h>
+
+#include <qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+// FORWARD DECLARATIONS
+
+// CLASS DECLARATION
+/**
+* QS60MainAppUi application UI class.
+* Interacts with the user through the UI and request message processing
+* from the handler class
+*/
+class QS60MainAppUi : public CAknAppUi
+{
+public: // Constructors and destructor
+
+    /**
+     * ConstructL.
+     * 2nd phase constructor.
+     */
+    void ConstructL();
+
+    /**
+     * QS60MainAppUi.
+     * C++ default constructor. This needs to be public due to
+     * the way the framework constructs the AppUi
+     */
+    QS60MainAppUi();
+
+    /**
+     * ~QS60MainAppUi.
+     * Virtual Destructor.
+     */
+    virtual ~QS60MainAppUi();
+
+protected:
+    void RestoreMenuL(CCoeControl* aMenuWindow,TInt aMenuId,TMenuType aMenuType);
+    void DynInitMenuBarL(TInt aResourceId, CEikMenuBar *aMenuBar);
+    void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane *aMenuPane);
+
+private:  // Functions from base classes
+
+    /**
+     * From CEikAppUi, HandleCommandL.
+     * Takes care of command handling.
+     * @param aCommand Command to be handled.
+     */
+    void HandleCommandL( TInt aCommand );
+
+    /**
+     * From CAknAppUi, HandleResourceChangeL
+     * Handles resource change events such as layout switches in global level.
+     * @param aType event type.
+     */
+    void HandleResourceChangeL(TInt aType);
+
+    /**
+     *  HandleStatusPaneSizeChange.
+     *  Called by the framework when the application status pane
+     *  size is changed.
+     */
+    void HandleStatusPaneSizeChange();
+
+protected:
+    void HandleWsEventL(const TWsEvent& aEvent, CCoeControl* aDestination);
+};
+
+QT_END_NAMESPACE
+
+#endif // QS60MAINAPPUI_P_H
+
+// End of File
diff --git a/src/s60main/qts60maindocument.cpp b/src/gui/s60framework/qs60maindocument.cpp
index 0f134bf..5a34a14 100644
--- a/src/s60main/qts60maindocument.cpp
+++ b/src/gui/s60framework/qs60maindocument.cpp
@@ -41,77 +41,81 @@
 
 // INCLUDE FILES
 #include <exception>
-#include "qts60mainappui_p.h"
-#include "qts60maindocument_p.h"
+#include "qs60mainappui_p.h"
+#include "qs60maindocument_p.h"
+
+QT_BEGIN_NAMESPACE
 
 // ============================ MEMBER FUNCTIONS ===============================
 
 // -----------------------------------------------------------------------------
-// CQtS60MainDocument::NewL()
+// QS60MainDocument::NewL()
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
-CQtS60MainDocument* CQtS60MainDocument::NewL(CEikApplication& aApp)
+QS60MainDocument* QS60MainDocument::NewL(CEikApplication& aApp)
 {
-    CQtS60MainDocument* self = NewLC(aApp);
+    QS60MainDocument* self = NewLC(aApp);
     CleanupStack::Pop(self);
     return self;
 }
 
 // -----------------------------------------------------------------------------
-// CQtS60MainDocument::NewLC()
+// QS60MainDocument::NewLC()
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
-CQtS60MainDocument* CQtS60MainDocument::NewLC(CEikApplication& aApp)
+QS60MainDocument* QS60MainDocument::NewLC(CEikApplication& aApp)
 {
-    CQtS60MainDocument* self = new(ELeave) CQtS60MainDocument(aApp);
+    QS60MainDocument* self = new(ELeave) QS60MainDocument(aApp);
     CleanupStack::PushL(self);
     self->ConstructL();
     return self;
 }
 
 // -----------------------------------------------------------------------------
-// CQtS60MainDocument::ConstructL()
+// QS60MainDocument::ConstructL()
 // Symbian 2nd phase constructor can leave.
 // -----------------------------------------------------------------------------
 //
-void CQtS60MainDocument::ConstructL()
+void QS60MainDocument::ConstructL()
 {
     // No implementation required
 }
 
 // -----------------------------------------------------------------------------
-// CQtS60MainDocument::CQtS60MainDocument()
+// QS60MainDocument::QS60MainDocument()
 // C++ default constructor can NOT contain any code, that might leave.
 // -----------------------------------------------------------------------------
 //
-CQtS60MainDocument::CQtS60MainDocument(CEikApplication& aApp)
+QS60MainDocument::QS60MainDocument(CEikApplication& aApp)
         : CAknDocument(aApp)
 {
     // No implementation required
 }
 
 // ---------------------------------------------------------------------------
-// CQtS60MainDocument::~CQtS60MainDocument()
+// QS60MainDocument::~QS60MainDocument()
 // Destructor.
 // ---------------------------------------------------------------------------
 //
-CQtS60MainDocument::~CQtS60MainDocument()
+QS60MainDocument::~QS60MainDocument()
 {
     // No implementation required
 }
 
 // ---------------------------------------------------------------------------
-// CQtS60MainDocument::CreateAppUiL()
+// QS60MainDocument::CreateAppUiL()
 // Constructs CreateAppUi.
 // ---------------------------------------------------------------------------
 //
-CEikAppUi* CQtS60MainDocument::CreateAppUiL()
+CEikAppUi* QS60MainDocument::CreateAppUiL()
 {
     // Create the application user interface, and return a pointer to it;
     // the framework takes ownership of this object
-    return (static_cast <CEikAppUi*>(new(ELeave)CQtS60MainAppUi));
+    return (static_cast <CEikAppUi*>(new(ELeave)QS60MainAppUi));
 }
 
+QT_END_NAMESPACE
+
 // End of File
diff --git a/src/gui/s60framework/qs60maindocument_p.h b/src/gui/s60framework/qs60maindocument_p.h
new file mode 100644
index 0000000..dfb439f
--- /dev/null
+++ b/src/gui/s60framework/qs60maindocument_p.h
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Symbian application wrapper of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QS60MAINDOCUMENT_P_H
+#define QS60MAINDOCUMENT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+// INCLUDES
+#include <akndoc.h>
+
+#include <qglobal.h>
+
+class CEikApplication;
+
+QT_BEGIN_NAMESPACE
+
+// FORWARD DECLARATIONS
+class QS60MainAppUi;
+
+// CLASS DECLARATION
+
+/**
+* QS60MainDocument application class.
+* An instance of class QS60MainDocument is the Document part of the
+* AVKON application framework for the QtS60Main application.
+*/
+class QS60MainDocument : public CAknDocument
+{
+public: // Constructors and destructor
+
+    /**
+     * NewL.
+     * Two-phased constructor.
+     * Construct a QS60MainDocument for the AVKON application aApp
+     * using two phase construction, and return a pointer
+     * to the created object.
+     * @param aApp Application creating this document.
+     * @return A pointer to the created instance of QS60MainDocument.
+     */
+    static QS60MainDocument* NewL( CEikApplication& aApp );
+
+    /**
+     * NewLC.
+     * Two-phased constructor.
+     * Construct a QS60MainDocument for the AVKON application aApp
+     * using two phase construction, and return a pointer
+     * to the created object.
+     * @param aApp Application creating this document.
+     * @return A pointer to the created instance of QS60MainDocument.
+     */
+    static QS60MainDocument* NewLC( CEikApplication& aApp );
+
+    /**
+     * ~QS60MainDocument
+     * Virtual Destructor.
+     */
+    virtual ~QS60MainDocument();
+
+public: // Functions from base classes
+
+    /**
+     * CreateAppUiL
+     * From CEikDocument, CreateAppUiL.
+     * Create a QS60MainAppUi object and return a pointer to it.
+     * The object returned is owned by the Uikon framework.
+     * @return Pointer to created instance of AppUi.
+     */
+    CEikAppUi* CreateAppUiL();
+
+private: // Constructors
+
+    /**
+     * ConstructL
+     * 2nd phase constructor.
+     */
+    void ConstructL();
+
+    /**
+     * QS60MainDocument.
+     * C++ default constructor.
+     * @param aApp Application creating this document.
+     */
+    QS60MainDocument( CEikApplication& aApp );
+
+};
+
+QT_END_NAMESPACE
+
+#endif // QS60MAINDOCUMENT_P_H
+
+// End of File
diff --git a/src/gui/s60framework/s60framework.pri b/src/gui/s60framework/s60framework.pri
new file mode 100644
index 0000000..f9a6d95
--- /dev/null
+++ b/src/gui/s60framework/s60framework.pri
@@ -0,0 +1,7 @@
+SOURCES += s60framework/qs60mainapplication.cpp \
+           s60framework/qs60mainappui.cpp \
+           s60framework/qs60maindocument.cpp
+
+HEADERS += s60framework/qs60mainapplication_p.h \
+           s60framework/qs60mainappui_p.h \
+           s60framework/qs60maindocument_p.h
diff --git a/src/gui/styles/gtksymbols.cpp b/src/gui/styles/gtksymbols.cpp
index 0d34c77..b61675b 100644
--- a/src/gui/styles/gtksymbols.cpp
+++ b/src/gui/styles/gtksymbols.cpp
@@ -194,6 +194,7 @@ Ptr_gdk_x11_drawable_get_xdisplay QGtk::gdk_x11_drawable_get_xdisplay = 0;
 
 Ptr_gconf_client_get_default QGtk::gconf_client_get_default = 0;
 Ptr_gconf_client_get_string QGtk::gconf_client_get_string = 0;
+Ptr_gconf_client_get_bool QGtk::gconf_client_get_bool = 0;
 
 static QString classPath(GtkWidget *widget)
 {
@@ -336,6 +337,7 @@ static bool resolveGConf()
     if (!QGtk::gconf_client_get_default) {
         QGtk::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default");
         QGtk::gconf_client_get_string =  (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string");
+        QGtk::gconf_client_get_bool =  (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool");
     }
     return (QGtk::gconf_client_get_default !=0);
 }
@@ -361,6 +363,23 @@ QString QGtk::getGConfString(const QString &value, const QString &fallback)
     return retVal;
 }
 
+bool QGtk::getGConfBool(const QString &key, bool fallback)
+{
+    bool retVal = fallback;
+    if (resolveGConf()) {
+        g_type_init();
+        GConfClient* client = QGtk::gconf_client_get_default();
+        GError *err = 0;
+        bool result = QGtk::gconf_client_get_bool(client, qPrintable(key), &err);
+        g_object_unref(client);
+        if (!err)
+            retVal = result;
+        else
+            g_error_free (err);
+    }
+    return retVal;
+}
+
 static QString getThemeName()
 {
     QString themeName;
diff --git a/src/gui/styles/gtksymbols_p.h b/src/gui/styles/gtksymbols_p.h
index 596a312..fb9d129 100644
--- a/src/gui/styles/gtksymbols_p.h
+++ b/src/gui/styles/gtksymbols_p.h
@@ -77,6 +77,7 @@ class GConfClient;
 
 typedef GConfClient* (*Ptr_gconf_client_get_default)();
 typedef char* (*Ptr_gconf_client_get_string)(GConfClient*, const char*, GError **);
+typedef bool (*Ptr_gconf_client_get_bool)(GConfClient*, const char*, GError **);
 
 typedef void (*Ptr_gtk_init)(int *, char ***);
 typedef GtkWidget* (*Ptr_gtk_window_new) (GtkWindowType);
@@ -217,6 +218,7 @@ public:
     static QStringList openFilenames(QWidget *parent, const QString &caption, const QString &dir, const QString &filter,
                                     QString *selectedFilter, QFileDialog::Options options);
     static QString getGConfString(const QString &key, const QString &fallback = QString());
+    static bool getGConfBool(const QString &key, bool fallback = 0);
 
     static Ptr_gtk_container_forall gtk_container_forall;
     static Ptr_gtk_init gtk_init;
@@ -330,6 +332,7 @@ public:
 
     static Ptr_gconf_client_get_default gconf_client_get_default;
     static Ptr_gconf_client_get_string gconf_client_get_string;
+    static Ptr_gconf_client_get_bool gconf_client_get_bool;
 };
 
 // Helper to ensure that we have polished all our gtk widgets
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index c9bdb7f..7fefb19 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -1882,7 +1882,6 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
         break;
     case CE_TabBarTabLabel:
         if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(opt)) {
-            // ### consider merging this with SE_TabBarTabText
             QStyleOptionTabV3 tabV2(*tab);
             QRect tr = tabV2.rect;
             bool verticalTabs = tabV2.shape == QTabBar::RoundedEast
@@ -5219,7 +5218,7 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti
     Q_UNUSED(sp);
 #else
     QPixmap pixmap;
-    const bool rtl = (option && option->direction == Qt::RightToLeft) || !option && QApplication::isRightToLeft();
+    const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QApplication::isRightToLeft());
 
     if (QApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) {
         switch (sp) {
@@ -5509,7 +5508,7 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons
                                                const QWidget *widget) const
 {
     QIcon icon;
-    const bool rtl = (option && option->direction == Qt::RightToLeft) || !option && QApplication::isRightToLeft();
+    const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QApplication::isRightToLeft());
     if (QApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) {
         switch (standardIcon) {
         case SP_DirHomeIcon:
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index 87fa322..0ccf219 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -656,6 +656,11 @@ int QGtkStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidg
         return !scrollbars_within_bevel;
     }
 
+    case SH_DialogButtonBox_ButtonsHaveIcons: {
+        static bool buttonsHaveIcons = QGtk::getGConfBool(QLS("/desktop/gnome/interface/buttons_have_icons"));
+        return buttonsHaveIcons;
+    }
+
     default:
         return QCleanlooksStyle::styleHint(hint, option, widget, returnData);
     }
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index ef1818d..e7ef51a 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -1951,6 +1951,7 @@ void QMacStyle::polish(QWidget* w)
         w->setWindowOpacity(QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5 ? 0.985 : 0.94);
         if (!w->testAttribute(Qt::WA_SetPalette)) {
             QPixmap px(64, 64);
+            px.fill(Qt::white);
             HIThemeMenuDrawInfo mtinfo;
             mtinfo.version = qt_mac_hitheme_version;
             mtinfo.menuType = kThemeMenuTypePopUp;
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index d61d291..a5d524c 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -1897,11 +1897,9 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     Returns an integer representing the specified style \a hint for
     the given \a widget described by the provided style \a option.
 
-    Note that currently, the \a returnData and \a widget parameters
-    are not used; they are provided for future enhancement. In
-    addition, the \a option parameter is used only in case of the
-    SH_ComboBox_Popup, SH_ComboBox_LayoutDirection, and
-    SH_GroupBox_TextLabelColor style hints.
+    \a returnData is used when the querying widget needs more detailed data than
+    the integer that styleHint() returns. See the QStyleHintReturn class
+    description for details.
 */
 
 /*!
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index cead2ac..3d8dec6 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -3948,7 +3948,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
             QFont oldFont = p->font();
             if (subRule.hasFont)
                 p->setFont(subRule.font);
-            if (subRule.hasBox()) {
+            if (subRule.hasBox() || !subRule.hasNativeBorder()) {
                 tabCopy.rect = ce == CE_TabBarTabShape ? subRule.borderRect(r)
                                                        : subRule.contentsRect(r);
                 QWindowsStyle::drawControl(ce, &tabCopy, p, w);
@@ -5702,6 +5702,15 @@ QRect QStyleSheetStyle::subElementRect(SubElement se, const QStyleOption *opt, c
         }
         break;
     }
+    case SE_TabBarTabText:
+    case SE_TabBarTabLeftButton:
+    case SE_TabBarTabRightButton: {
+        QRenderRule subRule = renderRule(w, opt, PseudoElement_TabBarTab);
+        if (subRule.hasBox() || !subRule.hasNativeBorder()) {
+            return ParentStyle::subElementRect(se, opt, w);
+        }
+        break;
+    }
 #endif // QT_NO_TABBAR
 
     case SE_DockWidgetCloseButton:
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 6978b45..f252444 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -2126,6 +2126,7 @@ void Parser::init(const QString &css, bool isFile)
 
     hasEscapeSequences = false;
     symbols.resize(0);
+    symbols.reserve(8);
     Scanner::scan(Scanner::preprocess(styleSheet, &hasEscapeSequences), &symbols);
     index = 0;
     errorIndex = -1;
diff --git a/src/gui/text/qcssscanner.cpp b/src/gui/text/qcssscanner.cpp
index 74ab7d9..5bbf638 100644
--- a/src/gui/text/qcssscanner.cpp
+++ b/src/gui/text/qcssscanner.cpp
@@ -46,7 +46,7 @@ public:
     QCssScanner_Generated(const QString &inp);
 
     inline QChar next() {
-        return (pos < input.length()) ? input.at(pos++).toLower() : QChar();
+        return (pos < input.length()) ? input.at(pos++) : QChar();
     }
     int handleCommentStart();
     int lex();
@@ -73,7 +73,7 @@ int QCssScanner_Generated::lex()
     int lastAcceptingPos = -1;
     int token = -1;
     QChar ch;
-    
+
     // initial state
         ch = next();
         if (ch.unicode() >= 9 && ch.unicode() <= 10)
@@ -146,7 +146,7 @@ int QCssScanner_Generated::lex()
         }
         if (ch.unicode() == 95)
             goto state_24;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_24;
         if (ch.unicode() == 123)
             goto state_25;
@@ -196,7 +196,7 @@ int QCssScanner_Generated::lex()
             goto state_32;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_30;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_30;
         if (ch.unicode() >= 123)
             goto state_30;
@@ -211,7 +211,7 @@ int QCssScanner_Generated::lex()
             goto state_34;
         if (ch.unicode() == 95)
             goto state_33;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_33;
         goto out;
     state_5:
@@ -232,7 +232,7 @@ int QCssScanner_Generated::lex()
             goto state_37;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_35;
         if (ch.unicode() >= 123)
             goto state_35;
@@ -255,7 +255,7 @@ int QCssScanner_Generated::lex()
             goto state_22;
         if (ch.unicode() == 95)
             goto state_24;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_24;
         goto out;
     state_12:
@@ -290,7 +290,7 @@ int QCssScanner_Generated::lex()
             goto state_45;
         if (ch.unicode() == 95)
             goto state_46;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_46;
         goto out;
     state_17:
@@ -310,7 +310,7 @@ int QCssScanner_Generated::lex()
             goto state_49;
         if (ch.unicode() == 95)
             goto state_50;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_50;
         goto out;
     state_22:
@@ -340,7 +340,7 @@ int QCssScanner_Generated::lex()
             goto state_54;
         if (ch.unicode() == 95)
             goto state_53;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_53;
         goto out;
     state_25:
@@ -400,7 +400,7 @@ int QCssScanner_Generated::lex()
             goto state_32;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_30;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_30;
         if (ch.unicode() >= 123)
             goto state_30;
@@ -440,7 +440,7 @@ int QCssScanner_Generated::lex()
             goto state_62;
         if (ch.unicode() == 95)
             goto state_61;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_61;
         goto out;
     state_34:
@@ -474,7 +474,7 @@ int QCssScanner_Generated::lex()
             goto state_37;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_35;
         if (ch.unicode() >= 123)
             goto state_35;
@@ -523,7 +523,7 @@ int QCssScanner_Generated::lex()
             goto state_45;
         if (ch.unicode() == 95)
             goto state_46;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_46;
         goto out;
     state_41:
@@ -536,7 +536,7 @@ int QCssScanner_Generated::lex()
             goto state_45;
         if (ch.unicode() == 95)
             goto state_46;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_46;
         goto out;
     state_43:
@@ -560,7 +560,7 @@ int QCssScanner_Generated::lex()
             goto state_45;
         if (ch.unicode() == 95)
             goto state_46;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_46;
         goto out;
     state_45:
@@ -588,7 +588,7 @@ int QCssScanner_Generated::lex()
             goto state_72;
         if (ch.unicode() == 95)
             goto state_71;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_71;
         goto out;
     state_47:
@@ -602,7 +602,7 @@ int QCssScanner_Generated::lex()
             goto state_49;
         if (ch.unicode() == 95)
             goto state_50;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_50;
         goto out;
     state_49:
@@ -630,7 +630,7 @@ int QCssScanner_Generated::lex()
             goto state_76;
         if (ch.unicode() == 95)
             goto state_75;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_75;
         goto out;
     state_51:
@@ -647,7 +647,7 @@ int QCssScanner_Generated::lex()
             goto state_54;
         if (ch.unicode() == 95)
             goto state_53;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_53;
         goto out;
     state_52:
@@ -668,7 +668,7 @@ int QCssScanner_Generated::lex()
             goto state_54;
         if (ch.unicode() == 95)
             goto state_53;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_53;
         goto out;
     state_54:
@@ -702,7 +702,7 @@ int QCssScanner_Generated::lex()
             goto state_32;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_30;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_30;
         if (ch.unicode() >= 123)
             goto state_30;
@@ -725,7 +725,7 @@ int QCssScanner_Generated::lex()
             goto state_32;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_30;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_30;
         if (ch.unicode() >= 123)
             goto state_30;
@@ -748,7 +748,7 @@ int QCssScanner_Generated::lex()
             goto state_32;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_30;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_30;
         if (ch.unicode() >= 123)
             goto state_30;
@@ -773,7 +773,7 @@ int QCssScanner_Generated::lex()
             goto state_32;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_30;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_30;
         if (ch.unicode() >= 123)
             goto state_30;
@@ -790,7 +790,7 @@ int QCssScanner_Generated::lex()
             goto state_62;
         if (ch.unicode() == 95)
             goto state_61;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_61;
         goto out;
     state_62:
@@ -818,7 +818,7 @@ int QCssScanner_Generated::lex()
             goto state_62;
         if (ch.unicode() == 95)
             goto state_61;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_61;
         goto out;
     state_64:
@@ -839,7 +839,7 @@ int QCssScanner_Generated::lex()
             goto state_37;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_35;
         if (ch.unicode() >= 123)
             goto state_35;
@@ -862,7 +862,7 @@ int QCssScanner_Generated::lex()
             goto state_37;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_35;
         if (ch.unicode() >= 123)
             goto state_35;
@@ -885,7 +885,7 @@ int QCssScanner_Generated::lex()
             goto state_37;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_35;
         if (ch.unicode() >= 123)
             goto state_35;
@@ -910,7 +910,7 @@ int QCssScanner_Generated::lex()
             goto state_37;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_35;
         if (ch.unicode() >= 123)
             goto state_35;
@@ -929,7 +929,7 @@ int QCssScanner_Generated::lex()
             goto state_45;
         if (ch.unicode() == 95)
             goto state_46;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_46;
         goto out;
     state_70:
@@ -944,7 +944,7 @@ int QCssScanner_Generated::lex()
             goto state_72;
         if (ch.unicode() == 95)
             goto state_71;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_71;
         goto out;
     state_71:
@@ -959,7 +959,7 @@ int QCssScanner_Generated::lex()
             goto state_72;
         if (ch.unicode() == 95)
             goto state_71;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_71;
         goto out;
     state_72:
@@ -994,7 +994,7 @@ int QCssScanner_Generated::lex()
             goto state_76;
         if (ch.unicode() == 95)
             goto state_75;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_75;
         goto out;
     state_75:
@@ -1009,7 +1009,7 @@ int QCssScanner_Generated::lex()
             goto state_76;
         if (ch.unicode() == 95)
             goto state_75;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_75;
         goto out;
     state_76:
@@ -1039,7 +1039,7 @@ int QCssScanner_Generated::lex()
             goto state_54;
         if (ch.unicode() == 95)
             goto state_53;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_53;
         goto out;
     state_78:
@@ -1060,7 +1060,7 @@ int QCssScanner_Generated::lex()
             goto state_32;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_30;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_30;
         if (ch.unicode() >= 123)
             goto state_30;
@@ -1077,7 +1077,7 @@ int QCssScanner_Generated::lex()
             goto state_62;
         if (ch.unicode() == 95)
             goto state_61;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_61;
         goto out;
     state_80:
@@ -1098,7 +1098,7 @@ int QCssScanner_Generated::lex()
             goto state_37;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
             goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_35;
         if (ch.unicode() >= 123)
             goto state_35;
@@ -1115,7 +1115,7 @@ int QCssScanner_Generated::lex()
             goto state_72;
         if (ch.unicode() == 95)
             goto state_71;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_71;
         goto out;
     state_83:
@@ -1130,12 +1130,12 @@ int QCssScanner_Generated::lex()
             goto state_76;
         if (ch.unicode() == 95)
             goto state_75;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
             goto state_75;
         goto out;
     found:
     lastAcceptingPos = pos;
-    
+
     out:
     if (lastAcceptingPos != -1) {
         lexemLength = lastAcceptingPos - lexemStart;
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index 323a171..9fe660a 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -307,6 +307,8 @@ private:
     friend class QPainterPath;
     friend class QTextItemInt;
     friend class QPicturePaintEngine;
+    friend class QPainterReplayer;
+    friend class QPaintBufferEngine;
 
 #ifndef QT_NO_DATASTREAM
     friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QFont &);
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 0e2dc31..78847ef 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -595,7 +595,7 @@ static QList<QFontDatabase::WritingSystem> determineWritingSystemsFromTrueTypeBi
 class QFontDatabaseS60Store
 {
 public:
-    virtual ~QFontDatabaseS60Store() {};
+    virtual ~QFontDatabaseS60Store() {}
 };
 #endif
 
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 2b84c6c..ba9145e 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2245,6 +2245,28 @@ void QTextEngine::indexAdditionalFormats()
     }
 }
 
+/* These two helper functions are used to determine whether we need to insert a ZWJ character
+   between the text that gets truncated and the ellipsis. This is important to get
+   correctly shaped results for arabic text.
+*/
+static bool nextCharJoins(const QString &string, int pos)
+{
+    while (pos < string.length() && string.at(pos).category() == QChar::Mark_NonSpacing)
+        ++pos;
+    if (pos == string.length())
+        return false;
+    return string.at(pos).joining() != QChar::OtherJoining;
+}
+
+static bool prevCharJoins(const QString &string, int pos)
+{
+    while (pos > 0 && string.at(pos - 1).category() == QChar::Mark_NonSpacing)
+        --pos;
+    if (pos == 0)
+        return false;
+    return (string.at(pos - 1).joining() == QChar::Dual || string.at(pos - 1).joining() == QChar::Center);
+}
+
 QString QTextEngine::elidedText(Qt::TextElideMode mode, const QFixed &width, int flags) const
 {
 //    qDebug() << "elidedText; available width" << width.toReal() << "text width:" << this->width(0, layoutData->string.length()).toReal();
@@ -2345,6 +2367,9 @@ QString QTextEngine::elidedText(Qt::TextElideMode mode, const QFixed &width, int
         } while (nextBreak < layoutData->string.length()
                  && currentWidth < availableWidth);
 
+        if (nextCharJoins(layoutData->string, pos))
+            ellipsisText.prepend(QChar(0x200d) /* ZWJ */);
+
         return layoutData->string.left(pos) + ellipsisText;
     } else if (mode == Qt::ElideLeft) {
         QFixed currentWidth;
@@ -2362,6 +2387,9 @@ QString QTextEngine::elidedText(Qt::TextElideMode mode, const QFixed &width, int
         } while (nextBreak > 0
                  && currentWidth < availableWidth);
 
+        if (prevCharJoins(layoutData->string, pos))
+            ellipsisText.append(QChar(0x200d) /* ZWJ */);
+
         return ellipsisText + layoutData->string.mid(pos);
     } else if (mode == Qt::ElideMiddle) {
         QFixed leftWidth;
@@ -2391,6 +2419,11 @@ QString QTextEngine::elidedText(Qt::TextElideMode mode, const QFixed &width, int
                  && nextRightBreak > 0
                  && leftWidth + rightWidth < availableWidth);
 
+        if (nextCharJoins(layoutData->string, leftPos))
+            ellipsisText.prepend(QChar(0x200d) /* ZWJ */);
+        if (prevCharJoins(layoutData->string, rightPos))
+            ellipsisText.append(QChar(0x200d) /* ZWJ */);
+
         return layoutData->string.left(leftPos) + ellipsisText + layoutData->string.mid(rightPos);
     }
 
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index 6196f0f..87dab42 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -823,12 +823,11 @@ void QCompleterPrivate::_q_complete(QModelIndex index, bool highlighted)
     Q_Q(QCompleter);
     QString completion;
 
-    if (!(index.flags() & Qt::ItemIsEnabled))
-        return;
-
     if (!index.isValid() || (!proxy->showAll && (index.row() >= proxy->engine->matchCount()))) {
         completion = prefix;
     } else {
+        if (!(index.flags() & Qt::ItemIsEnabled))
+            return;
         QModelIndex si = proxy->mapToSource(index);
         si = si.sibling(si.row(), column); // for clicked()
         completion = q->pathFromIndex(si);
diff --git a/src/gui/widgets/qabstractscrollarea.cpp b/src/gui/widgets/qabstractscrollarea.cpp
index 770e769..6de7c10 100644
--- a/src/gui/widgets/qabstractscrollarea.cpp
+++ b/src/gui/widgets/qabstractscrollarea.cpp
@@ -54,6 +54,7 @@
 
 #ifdef Q_WS_WIN
 #include "qstandardgestures.h"
+#include <private/qstandardgestures_p.h>
 #endif
 
 #include "qabstractscrollarea_p.h"
@@ -299,8 +300,11 @@ void QAbstractScrollAreaPrivate::init()
     layoutChildren();
 
 #ifdef Q_WS_WIN
-    panGesture = new QPanGesture(viewport);
+    panGesture = new QPanGesture(viewport, q);
+    panGesture->d_func()->implicitGesture = true;
+    QObject::connect(panGesture, SIGNAL(started()), q, SLOT(_q_gestureTriggered()));
     QObject::connect(panGesture, SIGNAL(triggered()), q, SLOT(_q_gestureTriggered()));
+    QObject::connect(panGesture, SIGNAL(finished()), q, SLOT(_q_gestureTriggered()));
 #endif // Q_WS_WIN
 }
 
diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm
index bda9352..5f95b70 100644
--- a/src/gui/widgets/qcocoamenu_mac.mm
+++ b/src/gui/widgets/qcocoamenu_mac.mm
@@ -37,9 +37,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 ****************************************************************************/
 
 #include "qmacdefines_mac.h"
diff --git a/src/gui/widgets/qdatetimeedit_p.h b/src/gui/widgets/qdatetimeedit_p.h
index 7e1c24d..689b508 100644
--- a/src/gui/widgets/qdatetimeedit_p.h
+++ b/src/gui/widgets/qdatetimeedit_p.h
@@ -89,7 +89,7 @@ public:
     QDateTime validateAndInterpret(QString &input, int &, QValidator::State &state,
                                    bool fixup = false) const;
     void clearSection(int index);
-    virtual QString displayText() const { return edit->displayText(); } // this is from QDateTimeParser
+    virtual QString displayText() const { return edit->text(); } // this is from QDateTimeParser
 
     int absoluteIndex(QDateTimeEdit::Section s, int index) const;
     int absoluteIndex(const SectionNode &s) const;
diff --git a/src/gui/widgets/qdockarealayout.cpp b/src/gui/widgets/qdockarealayout.cpp
index 3d1d3b1..3920ae9 100644
--- a/src/gui/widgets/qdockarealayout.cpp
+++ b/src/gui/widgets/qdockarealayout.cpp
@@ -2601,28 +2601,28 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
         center_rect.setBottom(rect.bottom() - docks[QInternal::BottomDock].rect.height() - sep);
 
     QSize left_hint = docks[QInternal::LeftDock].size();
-    if (!left_hint.isValid())
+    if (left_hint.isNull())
         left_hint = docks[QInternal::LeftDock].sizeHint();
     QSize left_min = docks[QInternal::LeftDock].minimumSize();
     QSize left_max = docks[QInternal::LeftDock].maximumSize();
     left_hint = left_hint.boundedTo(left_max).expandedTo(left_min);
 
     QSize right_hint = docks[QInternal::RightDock].size();
-    if (!right_hint.isValid())
+    if (right_hint.isNull())
         right_hint = docks[QInternal::RightDock].sizeHint();
     QSize right_min = docks[QInternal::RightDock].minimumSize();
     QSize right_max = docks[QInternal::RightDock].maximumSize();
     right_hint = right_hint.boundedTo(right_max).expandedTo(right_min);
 
     QSize top_hint = docks[QInternal::TopDock].size();
-    if (!top_hint.isValid())
+    if (top_hint.isNull())
         top_hint = docks[QInternal::TopDock].sizeHint();
     QSize top_min = docks[QInternal::TopDock].minimumSize();
     QSize top_max = docks[QInternal::TopDock].maximumSize();
     top_hint = top_hint.boundedTo(top_max).expandedTo(top_min);
 
     QSize bottom_hint = docks[QInternal::BottomDock].size();
-    if (!bottom_hint.isValid())
+    if (bottom_hint.isNull())
         bottom_hint = docks[QInternal::BottomDock].sizeHint();
     QSize bottom_min = docks[QInternal::BottomDock].minimumSize();
     QSize bottom_max = docks[QInternal::BottomDock].maximumSize();
diff --git a/src/gui/widgets/qmaccocoaviewcontainer_mac.mm b/src/gui/widgets/qmaccocoaviewcontainer_mac.mm
index 2ed2e5f..a45d992 100644
--- a/src/gui/widgets/qmaccocoaviewcontainer_mac.mm
+++ b/src/gui/widgets/qmaccocoaviewcontainer_mac.mm
@@ -37,9 +37,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 ****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
diff --git a/src/gui/widgets/qmacnativewidget_mac.mm b/src/gui/widgets/qmacnativewidget_mac.mm
index 28fa1ec..224a51f 100644
--- a/src/gui/widgets/qmacnativewidget_mac.mm
+++ b/src/gui/widgets/qmacnativewidget_mac.mm
@@ -37,9 +37,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 ****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm
index 2ccd3e7..797c7c5 100644
--- a/src/gui/widgets/qmainwindowlayout_mac.mm
+++ b/src/gui/widgets/qmainwindowlayout_mac.mm
@@ -37,9 +37,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 ****************************************************************************/
 
 #include <private/qmainwindowlayout_p.h>
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index 7ae799c..c5953af 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -3,6 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
+** This file is part of the S60 port of the Qt toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp
index c79e482..085341c 100644
--- a/src/gui/widgets/qplaintextedit.cpp
+++ b/src/gui/widgets/qplaintextedit.cpp
@@ -794,10 +794,6 @@ void QPlainTextEditPrivate::init(const QString &txt)
     viewport->setCursor(Qt::IBeamCursor);
 #endif
     originalOffsetY = 0;
-#ifdef Q_WS_WIN
-    panGesture = new QPanGesture(q);
-    QObject::connect(panGesture, SIGNAL(triggered()), q, SLOT(_q_gestureTriggered()));
-#endif
 }
 
 void QPlainTextEditPrivate::_q_repaintContents(const QRectF &contentsRect)
diff --git a/src/gui/widgets/qplaintextedit_p.h b/src/gui/widgets/qplaintextedit_p.h
index 7ff0c03..cda1d92 100644
--- a/src/gui/widgets/qplaintextedit_p.h
+++ b/src/gui/widgets/qplaintextedit_p.h
@@ -182,7 +182,6 @@ public:
 
 #ifdef Q_WS_WIN
     void _q_gestureTriggered();
-    QPanGesture *panGesture;
 #endif
 };
 
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index 64e383f..560b76c 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -1897,13 +1897,8 @@ void QTabBar::keyPressEvent(QKeyEvent *event)
         event->ignore();
         return;
     }
-    int dx = event->key() == (isRightToLeft() ? Qt::Key_Right : Qt::Key_Left) ? -1 : 1;
-    for (int index = d->currentIndex + dx; d->validIndex(index); index += dx) {
-        if (d->tabList.at(index).enabled) {
-            setCurrentIndex(index);
-            break;
-        }
-    }
+    int offset = event->key() == (isRightToLeft() ? Qt::Key_Right : Qt::Key_Left) ? -1 : 1;    
+    d->setCurrentNextEnabledIndex(offset);
 }
 
 /*!\reimp
@@ -1912,15 +1907,23 @@ void QTabBar::keyPressEvent(QKeyEvent *event)
 void QTabBar::wheelEvent(QWheelEvent *event)
 {
     Q_D(QTabBar);
-    int overIndex = d->indexAtPos(event->pos());
-    if (overIndex != -1) {
-        int offset = event->delta() > 0 ? -1 : 1;
-        setCurrentIndex(currentIndex() + offset);
-    }
+    int offset = event->delta() > 0 ? -1 : 1;
+    d->setCurrentNextEnabledIndex(offset);
     QWidget::wheelEvent(event);
 }
 #endif //QT_NO_WHEELEVENT
 
+void QTabBarPrivate::setCurrentNextEnabledIndex(int offset)
+{
+    Q_Q(QTabBar);
+    for (int index = currentIndex + offset; validIndex(index); index += offset) {
+        if (tabList.at(index).enabled) {
+            q->setCurrentIndex(index);
+            break;
+        }
+    }
+}
+
 /*!\reimp
  */
 void QTabBar::changeEvent(QEvent *event)
diff --git a/src/gui/widgets/qtabbar_p.h b/src/gui/widgets/qtabbar_p.h
index 150909e..2ddd8bb 100644
--- a/src/gui/widgets/qtabbar_p.h
+++ b/src/gui/widgets/qtabbar_p.h
@@ -159,6 +159,7 @@ public:
     int indexAtPos(const QPoint &p) const;
 
     inline bool validIndex(int index) const { return index >= 0 && index < tabList.count(); }
+    void setCurrentNextEnabledIndex(int offset);
 
     QSize minimumTabSizeHint(int index);
 
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index 547a4fb..cc79464 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -67,8 +67,6 @@
 #include <qtexttable.h>
 #include <qvariant.h>
 
-#include <qstandardgestures.h>
-
 #include <qinputcontext.h>
 #endif
 
diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp
index 71bbf83..6ae230f 100644
--- a/src/multimedia/audio/qaudioformat.cpp
+++ b/src/multimedia/audio/qaudioformat.cpp
@@ -57,10 +57,32 @@ public:
         sampleType = QAudioFormat::Unknown;
     }
 
+    QAudioFormatPrivate(const QAudioFormatPrivate &other):
+        QSharedData(other),
+        codec(other.codec),
+        byteOrder(other.byteOrder),
+        sampleType(other.sampleType),
+        frequency(other.frequency),
+        channels(other.channels),
+        sampleSize(other.sampleSize)
+    {
+    }
+
+    QAudioFormatPrivate& operator=(const QAudioFormatPrivate &other)
+    {
+        codec = other.codec;
+        byteOrder = other.byteOrder;
+        sampleType = other.sampleType;
+        frequency = other.frequency;
+        channels = other.channels;
+        sampleSize = other.sampleSize;
+
+        return *this;
+    }
+
     QString codec;
     QAudioFormat::Endian byteOrder;
     QAudioFormat::SampleType sampleType;
-
     int frequency;
     int channels;
     int sampleSize;
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 53fcb49..c729103 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -10,3 +10,5 @@ include(../qbase.pri)
 
 include(audio/audio.pri)
 include(video/video.pri)
+
+symbian: TARGET.UID3 = 0x2001E627
\ No newline at end of file
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index da9ec09..bd6fa57 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -425,32 +425,25 @@ void QHttpNetworkConnectionPrivate::dequeueAndSendRequest(QAbstractSocket *socke
     int i = indexOf(socket);
 
     if (!highPriorityQueue.isEmpty()) {
-        for (int j = highPriorityQueue.count() - 1; j >= 0; --j) {
-            HttpMessagePair &messagePair = highPriorityQueue[j];
-            if (!messagePair.second->d_func()->requestIsPrepared)
-                prepareRequest(messagePair);
-
-            channels[i].request = messagePair.first;
-            channels[i].reply = messagePair.second;
-            // remove before sendRequest! else we might pipeline the same request again
-            highPriorityQueue.removeAt(j);
-            channels[i].sendRequest();
-            return;
-        }
+        // remove from queue before sendRequest! else we might pipeline the same request again
+        HttpMessagePair messagePair = highPriorityQueue.takeLast();
+        if (!messagePair.second->d_func()->requestIsPrepared)
+            prepareRequest(messagePair);
+        channels[i].request = messagePair.first;
+        channels[i].reply = messagePair.second;
+        channels[i].sendRequest();
+        return;
     }
 
     if (!lowPriorityQueue.isEmpty()) {
-        for (int j = lowPriorityQueue.count() - 1; j >= 0; --j) {
-            HttpMessagePair &messagePair = lowPriorityQueue[j];
-            if (!messagePair.second->d_func()->requestIsPrepared)
-                prepareRequest(messagePair);
-            channels[i].request = messagePair.first;
-            channels[i].reply = messagePair.second;
-            // remove before sendRequest! else we might pipeline the same request again
-            lowPriorityQueue.removeAt(j);
-            channels[i].sendRequest();
-            return;
-        }
+        // remove from queue before sendRequest! else we might pipeline the same request again
+        HttpMessagePair messagePair = lowPriorityQueue.takeLast();
+        if (!messagePair.second->d_func()->requestIsPrepared)
+            prepareRequest(messagePair);
+        channels[i].request = messagePair.first;
+        channels[i].reply = messagePair.second;
+        channels[i].sendRequest();
+        return;
     }
 }
 
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp
index b624c24..be7896b 100644
--- a/src/network/access/qnetworkaccessbackend.cpp
+++ b/src/network/access/qnetworkaccessbackend.cpp
@@ -92,8 +92,11 @@ QNetworkAccessBackend *QNetworkAccessManagerPrivate::findBackend(QNetworkAccessM
                               QNetworkRequest::PreferNetwork).toInt());
     if (mode == QNetworkRequest::AlwaysCache
         && (op == QNetworkAccessManager::GetOperation
-        || op == QNetworkAccessManager::HeadOperation))
-        return new QNetworkAccessCacheBackend;
+        || op == QNetworkAccessManager::HeadOperation)) {
+        QNetworkAccessBackend *backend = new QNetworkAccessCacheBackend;
+        backend->manager = this;
+        return backend;
+    }
 
     if (!factoryDataShutdown) {
         QMutexLocker locker(&factoryData()->mutex);
@@ -111,7 +114,6 @@ QNetworkAccessBackend *QNetworkAccessManagerPrivate::findBackend(QNetworkAccessM
     return 0;
 }
 
-
 QNonContiguousByteDevice* QNetworkAccessBackend::createUploadByteDevice()
 {
     QNonContiguousByteDevice* device = 0;
@@ -143,6 +145,8 @@ void QNetworkAccessBackend::emitReplyUploadProgress(qint64 bytesSent, qint64 byt
 }
 
 QNetworkAccessBackend::QNetworkAccessBackend()
+    : manager(0)
+    , reply(0)
 {
 }
 
@@ -205,7 +209,9 @@ QList<QNetworkProxy> QNetworkAccessBackend::proxyList() const
 
 QAbstractNetworkCache *QNetworkAccessBackend::networkCache() const
 {
-    return reply->networkCache; // should be the same as manager->networkCache
+    if (!manager)
+        return 0;
+    return manager->networkCache;
 }
 
 void QNetworkAccessBackend::setCachingEnabled(bool enable)
diff --git a/src/network/access/qnetworkaccesscachebackend.cpp b/src/network/access/qnetworkaccesscachebackend.cpp
index df66c9d..2be10db 100644
--- a/src/network/access/qnetworkaccesscachebackend.cpp
+++ b/src/network/access/qnetworkaccesscachebackend.cpp
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
 
 QNetworkAccessCacheBackend::QNetworkAccessCacheBackend()
     : QNetworkAccessBackend()
+    , device(0)
 {
 }
 
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index d925e77..2b2504f 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -306,6 +306,7 @@ static QByteArray proxyAuthenticationKey(const QNetworkProxy &proxy, const QStri
 
     case QNetworkProxy::FtpCachingProxy:
         key.setScheme(QLatin1String("proxy-ftp"));
+        break;
 
     case QNetworkProxy::DefaultProxy:
     case QNetworkProxy::NoProxy:
@@ -711,9 +712,6 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
 
     // fourth step: setup the reply
     priv->setup(op, request, outgoingData);
-    if (request.attribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork).toInt() !=
-        QNetworkRequest::AlwaysNetwork)
-        priv->setNetworkCache(d->networkCache);
 #ifndef QT_NO_NETWORKPROXY
     QList<QNetworkProxy> proxyList = d->queryProxy(QNetworkProxyQuery(request.url()));
     priv->proxyList = proxyList;
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 3b0948b..a60a8dd 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 inline QNetworkReplyImplPrivate::QNetworkReplyImplPrivate()
     : backend(0), outgoingData(0), outgoingDataBuffer(0),
-      copyDevice(0), networkCache(0),
+      copyDevice(0),
       cacheEnabled(false), cacheSaveDevice(0),
       notificationHandlingPaused(false),
       bytesDownloaded(0), lastBytesDownloaded(-1), bytesUploaded(-1),
@@ -252,11 +252,6 @@ void QNetworkReplyImplPrivate::setup(QNetworkAccessManager::Operation op, const
     q->QIODevice::open(QIODevice::ReadOnly);
 }
 
-void QNetworkReplyImplPrivate::setNetworkCache(QAbstractNetworkCache *nc)
-{
-    networkCache = nc;
-}
-
 void QNetworkReplyImplPrivate::backendNotify(InternalNotifications notification)
 {
     Q_Q(QNetworkReplyImpl);
@@ -318,17 +313,28 @@ void QNetworkReplyImplPrivate::resumeNotificationHandling()
         QCoreApplication::postEvent(q, new QEvent(QEvent::NetworkReplyUpdated));
 }
 
+QAbstractNetworkCache *QNetworkReplyImplPrivate::networkCache() const
+{
+    if (!backend)
+        return 0;
+    return backend->networkCache();
+}
+
 void QNetworkReplyImplPrivate::createCache()
 {
     // check if we can save and if we're allowed to
-    if (!networkCache || !request.attribute(QNetworkRequest::CacheSaveControlAttribute, true).toBool())
+    if (!networkCache()
+        || !request.attribute(QNetworkRequest::CacheSaveControlAttribute, true).toBool()
+        || request.attribute(QNetworkRequest::CacheLoadControlAttribute,
+                             QNetworkRequest::PreferNetwork).toInt()
+            == QNetworkRequest::AlwaysNetwork)
         return;
     cacheEnabled = true;
 }
 
 bool QNetworkReplyImplPrivate::isCachingEnabled() const
 {
-    return (cacheEnabled && networkCache != 0);
+    return (cacheEnabled && networkCache() != 0);
 }
 
 void QNetworkReplyImplPrivate::setCachingEnabled(bool enable)
@@ -352,7 +358,7 @@ void QNetworkReplyImplPrivate::setCachingEnabled(bool enable)
         qDebug("QNetworkReplyImpl: setCachingEnabled(true) called after setCachingEnabled(false) -- "
                "backend %s probably needs to be fixed",
                backend->metaObject()->className());
-        networkCache->remove(url);
+        networkCache()->remove(url);
         cacheSaveDevice = 0;
         cacheEnabled = false;
     }
@@ -361,9 +367,9 @@ void QNetworkReplyImplPrivate::setCachingEnabled(bool enable)
 void QNetworkReplyImplPrivate::completeCacheSave()
 {
     if (cacheEnabled && errorCode != QNetworkReplyImpl::NoError) {
-        networkCache->remove(url);
+        networkCache()->remove(url);
     } else if (cacheEnabled && cacheSaveDevice) {
-        networkCache->insert(cacheSaveDevice);
+        networkCache()->insert(cacheSaveDevice);
     }
     cacheSaveDevice = 0;
     cacheEnabled = false;
@@ -410,15 +416,15 @@ void QNetworkReplyImplPrivate::appendDownstreamData(QByteDataBuffer &data)
             metaData.setAttributes(attributes);
         }
 
-        cacheSaveDevice = networkCache->prepare(metaData);
+        cacheSaveDevice = networkCache()->prepare(metaData);
 
         if (!cacheSaveDevice || (cacheSaveDevice && !cacheSaveDevice->isOpen())) {
             if (cacheSaveDevice && !cacheSaveDevice->isOpen())
                 qCritical("QNetworkReplyImpl: network cache returned a device that is not open -- "
                       "class %s probably needs to be fixed",
-                      networkCache->metaObject()->className());
+                      networkCache()->metaObject()->className());
 
-            networkCache->remove(url);
+            networkCache()->remove(url);
             cacheSaveDevice = 0;
             cacheEnabled = false;
         }
@@ -566,7 +572,7 @@ QNetworkReplyImpl::~QNetworkReplyImpl()
 {
     Q_D(QNetworkReplyImpl);
     if (d->isCachingEnabled())
-        d->networkCache->remove(url());
+        d->networkCache()->remove(url());
 }
 
 void QNetworkReplyImpl::abort()
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h
index 8cda7a4..04f8aa8 100644
--- a/src/network/access/qnetworkreplyimpl_p.h
+++ b/src/network/access/qnetworkreplyimpl_p.h
@@ -131,7 +131,6 @@ public:
 
     void setup(QNetworkAccessManager::Operation op, const QNetworkRequest &request,
                QIODevice *outgoingData);
-    void setNetworkCache(QAbstractNetworkCache *networkCache);
 
     void pauseNotificationHandling();
     void resumeNotificationHandling();
@@ -160,7 +159,7 @@ public:
     QIODevice *outgoingData;
     QRingBuffer *outgoingDataBuffer;
     QIODevice *copyDevice;
-    QAbstractNetworkCache *networkCache;
+    QAbstractNetworkCache *networkCache() const;
 
     bool cacheEnabled;
     QIODevice *cacheSaveDevice;
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index 000de07..ee741aa 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
-// of the QLibrary class.  This header file may change from
+// of the QHostInfo class.  This header file may change from
 // version to version without notice, or even be removed.
 //
 // We mean it.
@@ -180,7 +180,8 @@ class QHostInfoPrivate
 public:
     inline QHostInfoPrivate()
         : err(QHostInfo::NoError),
-          errorStr(QLatin1String(QT_TRANSLATE_NOOP("QHostInfo", "Unknown error")))
+          errorStr(QLatin1String(QT_TRANSLATE_NOOP("QHostInfo", "Unknown error"))),
+          lookupId(0)
     {
     }
 
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index b85a9d2..98740ba 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -453,6 +453,9 @@ QAbstractSocketPrivate::QAbstractSocketPrivate()
       peerPort(0),
       socketEngine(0),
       cachedSocketDescriptor(-1),
+#ifdef Q_OS_LINUX
+      addToBytesAvailable(0),
+#endif
       readBufferMaxSize(0),
       readBuffer(QABSTRACTSOCKET_BUFFERSIZE),
       writeBuffer(QABSTRACTSOCKET_BUFFERSIZE),
@@ -461,6 +464,7 @@ QAbstractSocketPrivate::QAbstractSocketPrivate()
       connectTimer(0),
       connectTimeElapsed(0),
       hostLookupId(-1),
+      socketType(QAbstractSocket::UnknownSocketType),
       state(QAbstractSocket::UnconnectedState),
       socketError(QAbstractSocket::UnknownSocketError)
 {
diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h
index 3e292f9..49605c5 100644
--- a/src/network/socket/qabstractsocket_p.h
+++ b/src/network/socket/qabstractsocket_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
-// of the QLibrary class.  This header file may change from
+// of the QAbstractSocket class.  This header file may change from
 // version to version without notice, or even be removed.
 //
 // We mean it.
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index bb0915a..9ef92e1 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -752,6 +752,7 @@ QHttpSocketEnginePrivate::QHttpSocketEnginePrivate()
     , readNotificationPending(false)
     , writeNotificationPending(false)
     , connectionNotificationPending(false)
+    , pendingResponseData(0)
 {
     socket = 0;
     state = QHttpSocketEngine::None;
diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h
index a774cbf..a7248f6 100644
--- a/src/network/socket/qlocalsocket_p.h
+++ b/src/network/socket/qlocalsocket_p.h
@@ -139,7 +139,7 @@ public:
     void _q_emitReadyRead();
     DWORD bytesAvailable();
     void startAsyncRead();
-    void completeAsyncRead();
+    bool completeAsyncRead();
     void checkReadyRead();
     HANDLE handle;
     OVERLAPPED overlapped;
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index f70a0aa..96dfa6e 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -199,9 +199,13 @@ qint64 QLocalSocket::readData(char *data, qint64 maxSize)
         }
     }
 
-    if (!d->readSequenceStarted)
-        d->startAsyncRead();
-    d->checkReadyRead();
+    if (d->pipeClosed) {
+        QTimer::singleShot(0, this, SLOT(_q_pipeClosed()));
+    } else {
+        if (!d->readSequenceStarted)
+            d->startAsyncRead();
+        d->checkReadyRead();
+    }
 
     return readSoFar;
 }
@@ -251,9 +255,22 @@ void QLocalSocketPrivate::startAsyncRead()
         readSequenceStarted = true;
         if (ReadFile(handle, ptr, bytesToRead, NULL, &overlapped)) {
             completeAsyncRead();
-        } else if (GetLastError() != ERROR_IO_PENDING) {
-            setErrorString(QLatin1String("QLocalSocketPrivate::startAsyncRead"));
-            return;
+        } else {
+            switch (GetLastError()) {
+                case ERROR_IO_PENDING:
+                    // This is not an error. We're getting notified, when data arrives.
+                    return;
+                case ERROR_PIPE_NOT_CONNECTED:
+                    {
+                        // It may happen, that the other side closes the connection directly
+                        // after writing data. Then we must set the appropriate socket state.
+                        pipeClosed = true;
+                        return;
+                    }
+                default:
+                    setErrorString(QLatin1String("QLocalSocketPrivate::startAsyncRead"));
+                    return;
+            }
         }
     } while (!readSequenceStarted);
 }
@@ -261,20 +278,23 @@ void QLocalSocketPrivate::startAsyncRead()
 /*!
     \internal
     Sets the correct size of the read buffer after a read operation.
+    Returns false, if an error occured or the connection dropped.
  */
-void QLocalSocketPrivate::completeAsyncRead()
+bool QLocalSocketPrivate::completeAsyncRead()
 {
     ResetEvent(overlapped.hEvent);
     readSequenceStarted = false;
 
     DWORD bytesRead;
     if (!GetOverlappedResult(handle, &overlapped, &bytesRead, TRUE)) {
-        setErrorString(QLatin1String("QLocalSocketPrivate::completeAsyncRead"));
-        return;
+        if (GetLastError() != ERROR_PIPE_NOT_CONNECTED)
+            setErrorString(QLatin1String("QLocalSocketPrivate::completeAsyncRead"));
+        return false;
     }
 
     actualReadBufferSize += bytesRead;
     readBuffer.truncate(actualReadBufferSize);
+    return true;
 }
 
 qint64 QLocalSocket::writeData(const char *data, qint64 maxSize)
@@ -425,7 +445,10 @@ void QLocalSocketPrivate::_q_canWrite()
 void QLocalSocketPrivate::_q_notified()
 {
     Q_Q(QLocalSocket);
-    completeAsyncRead();
+    if (!completeAsyncRead()) {
+        pipeClosed = true;
+        return;
+    }
     startAsyncRead();
     pendingReadyRead = false;
     emit q->readyRead();
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index ec9f103..3df3ab7 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -563,9 +563,12 @@ int QNativeSocketEnginePrivate::nativeAccept()
     if(acceptedDescriptor > 0) {
         // Ensure that the socket is closed on exec*()
         ::fcntl(acceptedDescriptor, F_SETFD, FD_CLOEXEC);
-    } else {
+    }
+#ifdef Q_OS_SYMBIAN
+    else {
         qWarning("QNativeSocketEnginePrivate::nativeAccept() - acceptedDescriptor <= 0");
     }
+#endif
 
     return acceptedDescriptor;
 }
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 6858d40..0e0c347 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -1745,7 +1745,13 @@ qint64 QSslSocket::writeData(const char *data, qint64 len)
     \internal
 */
 QSslSocketPrivate::QSslSocketPrivate()
-    : initialized(false), readyReadEmittedPointer(0), plainSocket(0)
+    : initialized(false)
+    , mode(QSslSocket::UnencryptedMode)
+    , autoStartHandshake(false)
+    , connectionEncrypted(false)
+    , ignoreAllSslErrors(false)
+    , readyReadEmittedPointer(0)
+    , plainSocket(0)
 {
     QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration);
 }
diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp b/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
index e025736..0b93320 100644
--- a/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
+++ b/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
@@ -86,9 +86,8 @@ bool QGLCustomShaderStage::setOnPainter(QPainter* p)
         return false;
     }
 
-    // Might as well go through the paint engine to get to the context
-    const QGLContext* ctx = static_cast<QGL2PaintEngineEx*>(p->paintEngine())->context();
-    d->m_manager = QGLEngineShaderManager::managerForContext(ctx);
+    QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx*>(p->paintEngine());
+    d->m_manager = QGL2PaintEngineExPrivate::shaderManagerForEngine(engine);
     Q_ASSERT(d->m_manager);
 
     d->m_manager->setCustomStage(this);
@@ -101,9 +100,8 @@ void QGLCustomShaderStage::removeFromPainter(QPainter* p)
     if (p->paintEngine()->type() != QPaintEngine::OpenGL2)
         return;
 
-    // Might as well go through the paint engine to get to the context
-    const QGLContext* ctx = static_cast<QGL2PaintEngineEx*>(p->paintEngine())->context();
-    d->m_manager = QGLEngineShaderManager::managerForContext(ctx);
+    QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx*>(p->paintEngine());
+    d->m_manager = QGL2PaintEngineExPrivate::shaderManagerForEngine(engine);
     Q_ASSERT(d->m_manager);
 
     // Just set the stage to null, don't call removeCustomStage().
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index 891c027..e7c11fd 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -49,47 +49,38 @@
 
 QT_BEGIN_NAMESPACE
 
-static void QGLEngineShaderManager_free(void *ptr)
+static void qt_shared_shaders_free(void *data)
 {
-    delete reinterpret_cast<QGLEngineShaderManager *>(ptr);
+    delete reinterpret_cast<QGLEngineSharedShaders *>(data);
 }
 
-Q_GLOBAL_STATIC_WITH_ARGS(QGLContextResource, qt_shader_managers, (QGLEngineShaderManager_free))
+Q_GLOBAL_STATIC_WITH_ARGS(QGLContextResource, qt_shared_shaders, (qt_shared_shaders_free))
 
-QGLEngineShaderManager *QGLEngineShaderManager::managerForContext(const QGLContext *context)
+QGLEngineSharedShaders *QGLEngineSharedShaders::shadersForContext(const QGLContext *context)
 {
-    QGLEngineShaderManager *p = reinterpret_cast<QGLEngineShaderManager *>(qt_shader_managers()->value(context));
+    QGLEngineSharedShaders *p = reinterpret_cast<QGLEngineSharedShaders *>(qt_shared_shaders()->value(context));
     if (!p) {
         QGLContext *oldContext = const_cast<QGLContext *>(QGLContext::currentContext());
         if (oldContext != context)
             const_cast<QGLContext *>(context)->makeCurrent();
-        p = new QGLEngineShaderManager(const_cast<QGLContext *>(context));
-        qt_shader_managers()->insert(context, p);
+        qt_shared_shaders()->insert(context, p = new QGLEngineSharedShaders(context));
         if (oldContext && oldContext != context)
             oldContext->makeCurrent();
     }
     return p;
 }
 
-const char* QGLEngineShaderManager::qglEngineShaderSourceCode[] = {
+const char* QGLEngineSharedShaders::qglEngineShaderSourceCode[] = {
     0,0,0,0,0,0,0,0,0,0,
     0,0,0,0,0,0,0,0,0,0,
     0,0,0,0,0,0,0,0,0,0,
     0,0,0,0,0
 };
 
-QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
-    : ctx(context),
-      shaderProgNeedsChanging(true),
-      srcPixelType(Qt::NoBrush),
-      useGlobalOpacity(false),
-      maskType(NoMask),
-      useTextureCoords(false),
-      compositionMode(QPainter::CompositionMode_SourceOver),
-      customSrcStage(0),
-      blitShaderProg(0),
-      simpleShaderProg(0),
-      currentShaderProg(0)
+QGLEngineSharedShaders::QGLEngineSharedShaders(const QGLContext* context)
+    : ctx(QGLContextPrivate::contextGroup(context))
+    , blitShaderProg(0)
+    , simpleShaderProg(0)
 {
     memset(compiledShaders, 0, sizeof(compiledShaders));
 
@@ -174,7 +165,7 @@ QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
     }
 
     // Compile up the simple shader:
-    simpleShaderProg = new QGLShaderProgram(ctx, this);
+    simpleShaderProg = new QGLShaderProgram(context, this);
     compileNamedShader(MainVertexShader,              QGLShader::PartialVertexShader);
     compileNamedShader(PositionOnlyVertexShader,      QGLShader::PartialVertexShader);
     compileNamedShader(MainFragmentShader,            QGLShader::PartialFragmentShader);
@@ -191,7 +182,7 @@ QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
     }
 
     // Compile the blit shader:
-    blitShaderProg = new QGLShaderProgram(ctx, this);
+    blitShaderProg = new QGLShaderProgram(context, this);
     compileNamedShader(MainWithTexCoordsVertexShader,     QGLShader::PartialVertexShader);
     compileNamedShader(UntransformedPositionVertexShader, QGLShader::PartialVertexShader);
     compileNamedShader(MainFragmentShader,                QGLShader::PartialFragmentShader);
@@ -209,6 +200,145 @@ QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
     }
 }
 
+void QGLEngineSharedShaders::shaderDestroyed(QObject *shader)
+{
+    // Remove any shader programs which has this as the srcPixel shader:
+    for (int i = 0; i < cachedPrograms.size(); ++i) {
+        if (cachedPrograms.at(i).srcPixelFragShader == shader) {
+            delete cachedPrograms.at(i).program;
+            cachedPrograms.removeAt(i--);
+        }
+    }
+
+    emit shaderProgNeedsChanging();
+}
+
+QGLShader *QGLEngineSharedShaders::compileNamedShader(ShaderName name, QGLShader::ShaderType type)
+{
+    Q_ASSERT(name != CustomImageSrcFragmentShader);
+    if (compiledShaders[name])
+        return compiledShaders[name];
+
+    QByteArray source = qglEngineShaderSourceCode[name];
+    QGLShader *newShader = new QGLShader(type, ctx->context(), this);
+    newShader->compile(source);
+
+#if defined(QT_DEBUG)
+    // Name the shader for easier debugging
+    QMetaEnum m = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("ShaderName"));
+    newShader->setObjectName(QLatin1String(m.valueToKey(name)));
+#endif
+
+    compiledShaders[name] = newShader;
+    return newShader;
+}
+
+QGLShader *QGLEngineSharedShaders::compileCustomShader(QGLCustomShaderStage *stage, QGLShader::ShaderType type)
+{
+    QByteArray source = stage->source();
+    source += qglslCustomSrcFragmentShader;
+
+    QGLShader *newShader = customShaderCache.object(source);
+    if (newShader)
+        return newShader;
+
+    newShader = new QGLShader(type, ctx->context(), this);
+    newShader->compile(source);
+    customShaderCache.insert(source, newShader);
+
+    connect(newShader, SIGNAL(destroyed(QObject *)),
+            this, SLOT(shaderDestroyed(QObject *)));
+
+#if defined(QT_DEBUG)
+    // Name the shader for easier debugging
+    QMetaEnum m = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("ShaderName"));
+    newShader->setObjectName(QLatin1String(m.valueToKey(CustomImageSrcFragmentShader)));
+#endif
+
+    return newShader;
+}
+
+// The address returned here will only be valid until next time this function is called.
+QGLEngineShaderProg *QGLEngineSharedShaders::findProgramInCache(const QGLEngineShaderProg &prog)
+{
+    for (int i = 0; i < cachedPrograms.size(); ++i) {
+        if (cachedPrograms[i] == prog)
+            return &cachedPrograms[i];
+    }
+
+    cachedPrograms.append(prog);
+    QGLEngineShaderProg &cached = cachedPrograms.last();
+
+    // If the shader program's not found in the cache, create it now.
+    cached.program = new QGLShaderProgram(ctx->context(), this);
+    cached.program->addShader(cached.mainVertexShader);
+    cached.program->addShader(cached.positionVertexShader);
+    cached.program->addShader(cached.mainFragShader);
+    cached.program->addShader(cached.srcPixelFragShader);
+    cached.program->addShader(cached.maskFragShader);
+    cached.program->addShader(cached.compositionFragShader);
+
+    // We have to bind the vertex attribute names before the program is linked:
+    cached.program->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
+    cached.program->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
+
+    cached.program->link();
+    if (!cached.program->isLinked()) {
+        QLatin1String none("none");
+        QLatin1String br("\n");
+        QString error;
+        error = QLatin1String("Shader program failed to link,")
+#if defined(QT_DEBUG)
+            + br
+            + QLatin1String("  Shaders Used:\n")
+            + QLatin1String("    mainVertexShader = ")
+            + (cached.mainVertexShader ?
+                cached.mainVertexShader->objectName() : none) + br
+            + QLatin1String("    positionVertexShader = ")
+            + (cached.positionVertexShader ?
+                cached.positionVertexShader->objectName() : none) + br
+            + QLatin1String("    mainFragShader = ")
+            + (cached.mainFragShader ?
+                cached.mainFragShader->objectName() : none) + br
+            + QLatin1String("    srcPixelFragShader = ")
+            + (cached.srcPixelFragShader ?
+                cached.srcPixelFragShader->objectName() : none) + br
+            + QLatin1String("    maskFragShader = ")
+            + (cached.maskFragShader ?
+                cached.maskFragShader->objectName() : none) + br
+            + QLatin1String("    compositionFragShader = ")
+            + (cached.compositionFragShader ?
+                cached.compositionFragShader->objectName() : none) + br
+#endif
+            + QLatin1String("  Error Log:\n")
+            + QLatin1String("    ") + cached.program->log();
+        qWarning() << error;
+        delete cached.program;
+        cachedPrograms.removeLast();
+        return 0;
+    } else {
+        // taking the address here is safe since
+        // cachePrograms isn't resized anywhere else
+        return &cached;
+    }
+}
+
+QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
+    : ctx(context),
+      shaderProgNeedsChanging(true),
+      srcPixelType(Qt::NoBrush),
+      useGlobalOpacity(false),
+      maskType(NoMask),
+      useTextureCoords(false),
+      compositionMode(QPainter::CompositionMode_SourceOver),
+      customSrcStage(0),
+      currentShaderProg(0),
+      customShader(0)
+{
+    sharedShaders = QGLEngineSharedShaders::shadersForContext(context);
+    connect(sharedShaders, SIGNAL(shaderProgNeedsChanging()), this, SLOT(shaderProgNeedsChangingSlot()));
+}
+
 QGLEngineShaderManager::~QGLEngineShaderManager()
 {
     //###
@@ -312,24 +442,8 @@ void QGLEngineShaderManager::setCompositionMode(QPainter::CompositionMode mode)
 
 void QGLEngineShaderManager::setCustomStage(QGLCustomShaderStage* stage)
 {
-    // If the custom shader has changed, then destroy the previous compilation.
-    if (customSrcStage && stage && customSrcStage != stage)
-        removeCustomStage(customSrcStage);
-
     customSrcStage = stage;
-    shaderProgNeedsChanging = true;
-}
-
-void QGLEngineShaderManager::shaderDestroyed(QObject *shader)
-{
-    // Remove any shader programs which has this as the srcPixel shader:
-    for (int i = 0; i < cachedPrograms.size(); ++i) {
-        if (cachedPrograms.at(i).srcPixelFragShader == shader) {
-            delete cachedPrograms.at(i).program;
-            cachedPrograms.removeAt(i--);
-        }
-    }
-
+    customShader = 0; // Will be compiled from 'customSrcStage' later.
     shaderProgNeedsChanging = true;
 }
 
@@ -337,13 +451,8 @@ void QGLEngineShaderManager::removeCustomStage(QGLCustomShaderStage* stage)
 {
     Q_UNUSED(stage); // Currently we only support one at a time...
 
-    QGLShader *compiledShader = compiledShaders[CustomImageSrcFragmentShader];
-
-    if (!compiledShader)
-        return;
-
-    compiledShaders[CustomImageSrcFragmentShader] = 0;
     customSrcStage = 0;
+    customShader = 0;
     shaderProgNeedsChanging = true;
 }
 
@@ -355,12 +464,12 @@ QGLShaderProgram* QGLEngineShaderManager::currentProgram()
 
 QGLShaderProgram* QGLEngineShaderManager::simpleProgram()
 {
-    return simpleShaderProg;
+    return sharedShaders->simpleProgram();
 }
 
 QGLShaderProgram* QGLEngineShaderManager::blitProgram()
 {
-    return blitShaderProg;
+    return sharedShaders->blitProgram();
 }
 
 
@@ -382,26 +491,25 @@ bool QGLEngineShaderManager::useCorrectShaderProg()
     requiredProgram.program = 0;
 
     // Choose vertex shader main function
-    QGLEngineShaderManager::ShaderName mainVertexShaderName = InvalidShaderName;
+    QGLEngineSharedShaders::ShaderName mainVertexShaderName = QGLEngineSharedShaders::InvalidShaderName;
     if (useTextureCoords)
-        mainVertexShaderName = MainWithTexCoordsVertexShader;
+        mainVertexShaderName = QGLEngineSharedShaders::MainWithTexCoordsVertexShader;
     else
-        mainVertexShaderName = MainVertexShader;
-    compileNamedShader(mainVertexShaderName, QGLShader::PartialVertexShader);
-    requiredProgram.mainVertexShader = compiledShaders[mainVertexShaderName];
+        mainVertexShaderName = QGLEngineSharedShaders::MainVertexShader;
+    requiredProgram.mainVertexShader = sharedShaders->compileNamedShader(mainVertexShaderName, QGLShader::PartialVertexShader);
 
     // Choose vertex shader shader position function (which typically also sets
     // varyings) and the source pixel (srcPixel) fragment shader function:
-    QGLEngineShaderManager::ShaderName positionVertexShaderName = InvalidShaderName;
-    QGLEngineShaderManager::ShaderName srcPixelFragShaderName = InvalidShaderName;
+    QGLEngineSharedShaders::ShaderName positionVertexShaderName = QGLEngineSharedShaders::InvalidShaderName;
+    QGLEngineSharedShaders::ShaderName srcPixelFragShaderName = QGLEngineSharedShaders::InvalidShaderName;
     bool isAffine = brushTransform.isAffine();
     if ( (srcPixelType >= Qt::Dense1Pattern) && (srcPixelType <= Qt::DiagCrossPattern) ) {
         if (isAffine)
-            positionVertexShaderName = AffinePositionWithPatternBrushVertexShader;
+            positionVertexShaderName = QGLEngineSharedShaders::AffinePositionWithPatternBrushVertexShader;
         else
-            positionVertexShaderName = PositionWithPatternBrushVertexShader;
+            positionVertexShaderName = QGLEngineSharedShaders::PositionWithPatternBrushVertexShader;
 
-        srcPixelFragShaderName = PatternBrushSrcFragmentShader;
+        srcPixelFragShaderName = QGLEngineSharedShaders::PatternBrushSrcFragmentShader;
     }
     else switch (srcPixelType) {
         default:
@@ -409,190 +517,143 @@ bool QGLEngineShaderManager::useCorrectShaderProg()
             qCritical("QGLEngineShaderManager::useCorrectShaderProg() - I'm scared, Qt::NoBrush style is set");
             break;
         case QGLEngineShaderManager::ImageSrc:
-            srcPixelFragShaderName = useCustomSrc ? CustomImageSrcFragmentShader : ImageSrcFragmentShader;
-            positionVertexShaderName = PositionOnlyVertexShader;
+            srcPixelFragShaderName = QGLEngineSharedShaders::ImageSrcFragmentShader;
+            positionVertexShaderName = QGLEngineSharedShaders::PositionOnlyVertexShader;
             break;
         case QGLEngineShaderManager::NonPremultipliedImageSrc:
-            srcPixelFragShaderName = NonPremultipliedImageSrcFragmentShader;
-            positionVertexShaderName = PositionOnlyVertexShader;
+            srcPixelFragShaderName = QGLEngineSharedShaders::NonPremultipliedImageSrcFragmentShader;
+            positionVertexShaderName = QGLEngineSharedShaders::PositionOnlyVertexShader;
             break;
         case QGLEngineShaderManager::PatternSrc:
-            srcPixelFragShaderName = ImageSrcWithPatternFragmentShader;
-            positionVertexShaderName = PositionOnlyVertexShader;
+            srcPixelFragShaderName = QGLEngineSharedShaders::ImageSrcWithPatternFragmentShader;
+            positionVertexShaderName = QGLEngineSharedShaders::PositionOnlyVertexShader;
             break;
         case QGLEngineShaderManager::TextureSrcWithPattern:
-            srcPixelFragShaderName = TextureBrushSrcWithPatternFragmentShader;
-            positionVertexShaderName = isAffine ? AffinePositionWithTextureBrushVertexShader
-                                                : PositionWithTextureBrushVertexShader;
+            srcPixelFragShaderName = QGLEngineSharedShaders::TextureBrushSrcWithPatternFragmentShader;
+            positionVertexShaderName = isAffine ? QGLEngineSharedShaders::AffinePositionWithTextureBrushVertexShader
+                                                : QGLEngineSharedShaders::PositionWithTextureBrushVertexShader;
             break;
         case Qt::SolidPattern:
-            srcPixelFragShaderName = SolidBrushSrcFragmentShader;
-            positionVertexShaderName = PositionOnlyVertexShader;
+            srcPixelFragShaderName = QGLEngineSharedShaders::SolidBrushSrcFragmentShader;
+            positionVertexShaderName = QGLEngineSharedShaders::PositionOnlyVertexShader;
             break;
         case Qt::LinearGradientPattern:
-            srcPixelFragShaderName = LinearGradientBrushSrcFragmentShader;
-            positionVertexShaderName = isAffine ? AffinePositionWithLinearGradientBrushVertexShader
-                                                : PositionWithLinearGradientBrushVertexShader;
+            srcPixelFragShaderName = QGLEngineSharedShaders::LinearGradientBrushSrcFragmentShader;
+            positionVertexShaderName = isAffine ? QGLEngineSharedShaders::AffinePositionWithLinearGradientBrushVertexShader
+                                                : QGLEngineSharedShaders::PositionWithLinearGradientBrushVertexShader;
             break;
         case Qt::ConicalGradientPattern:
-            srcPixelFragShaderName = ConicalGradientBrushSrcFragmentShader;
-            positionVertexShaderName = isAffine ? AffinePositionWithConicalGradientBrushVertexShader
-                                                : PositionWithConicalGradientBrushVertexShader;
+            srcPixelFragShaderName = QGLEngineSharedShaders::ConicalGradientBrushSrcFragmentShader;
+            positionVertexShaderName = isAffine ? QGLEngineSharedShaders::AffinePositionWithConicalGradientBrushVertexShader
+                                                : QGLEngineSharedShaders::PositionWithConicalGradientBrushVertexShader;
             break;
         case Qt::RadialGradientPattern:
-            srcPixelFragShaderName = RadialGradientBrushSrcFragmentShader;
-            positionVertexShaderName = isAffine ? AffinePositionWithRadialGradientBrushVertexShader
-                                                : PositionWithRadialGradientBrushVertexShader;
+            srcPixelFragShaderName = QGLEngineSharedShaders::RadialGradientBrushSrcFragmentShader;
+            positionVertexShaderName = isAffine ? QGLEngineSharedShaders::AffinePositionWithRadialGradientBrushVertexShader
+                                                : QGLEngineSharedShaders::PositionWithRadialGradientBrushVertexShader;
             break;
         case Qt::TexturePattern:
-            srcPixelFragShaderName = TextureBrushSrcFragmentShader;
-            positionVertexShaderName = isAffine ? AffinePositionWithTextureBrushVertexShader
-                                                : PositionWithTextureBrushVertexShader;
+            srcPixelFragShaderName = QGLEngineSharedShaders::TextureBrushSrcFragmentShader;
+            positionVertexShaderName = isAffine ? QGLEngineSharedShaders::AffinePositionWithTextureBrushVertexShader
+                                                : QGLEngineSharedShaders::PositionWithTextureBrushVertexShader;
             break;
     };
-    compileNamedShader(positionVertexShaderName, QGLShader::PartialVertexShader);
-    compileNamedShader(srcPixelFragShaderName, QGLShader::PartialFragmentShader);
-    requiredProgram.positionVertexShader = compiledShaders[positionVertexShaderName];
-    requiredProgram.srcPixelFragShader = compiledShaders[srcPixelFragShaderName];
+    requiredProgram.positionVertexShader = sharedShaders->compileNamedShader(positionVertexShaderName, QGLShader::PartialVertexShader);
+    if (useCustomSrc) {
+        if (!customShader)
+            customShader = sharedShaders->compileCustomShader(customSrcStage, QGLShader::PartialFragmentShader);
+        requiredProgram.srcPixelFragShader = customShader;
+    } else {
+        requiredProgram.srcPixelFragShader = sharedShaders->compileNamedShader(srcPixelFragShaderName, QGLShader::PartialFragmentShader);
+    }
 
     const bool hasCompose = compositionMode > QPainter::CompositionMode_Plus;
     const bool hasMask = maskType != QGLEngineShaderManager::NoMask;
 
     // Choose fragment shader main function:
-    QGLEngineShaderManager::ShaderName mainFragShaderName;
+    QGLEngineSharedShaders::ShaderName mainFragShaderName;
 
     if (hasCompose && hasMask && useGlobalOpacity)
-        mainFragShaderName = MainFragmentShader_CMO;
+        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_CMO;
     if (hasCompose && hasMask && !useGlobalOpacity)
-        mainFragShaderName = MainFragmentShader_CM;
+        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_CM;
     if (!hasCompose && hasMask && useGlobalOpacity)
-        mainFragShaderName = MainFragmentShader_MO;
+        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_MO;
     if (!hasCompose && hasMask && !useGlobalOpacity)
-        mainFragShaderName = MainFragmentShader_M;
+        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_M;
     if (hasCompose && !hasMask && useGlobalOpacity)
-        mainFragShaderName = MainFragmentShader_CO;
+        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_CO;
     if (hasCompose && !hasMask && !useGlobalOpacity)
-        mainFragShaderName = MainFragmentShader_C;
+        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_C;
     if (!hasCompose && !hasMask && useGlobalOpacity)
-        mainFragShaderName = MainFragmentShader_O;
+        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_O;
     if (!hasCompose && !hasMask && !useGlobalOpacity)
-        mainFragShaderName = MainFragmentShader;
+        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader;
 
-    compileNamedShader(mainFragShaderName, QGLShader::PartialFragmentShader);
-    requiredProgram.mainFragShader = compiledShaders[mainFragShaderName];
+    requiredProgram.mainFragShader = sharedShaders->compileNamedShader(mainFragShaderName, QGLShader::PartialFragmentShader);
 
     if (hasMask) {
-        QGLEngineShaderManager::ShaderName maskShaderName = QGLEngineShaderManager::InvalidShaderName;
+        QGLEngineSharedShaders::ShaderName maskShaderName = QGLEngineSharedShaders::InvalidShaderName;
         if (maskType == PixelMask)
-            maskShaderName = MaskFragmentShader;
+            maskShaderName = QGLEngineSharedShaders::MaskFragmentShader;
         else if (maskType == SubPixelMask)
-            maskShaderName = RgbMaskFragmentShader;
+            maskShaderName = QGLEngineSharedShaders::RgbMaskFragmentShader;
         else if (maskType == SubPixelWithGammaMask)
-            maskShaderName = RgbMaskWithGammaFragmentShader;
+            maskShaderName = QGLEngineSharedShaders::RgbMaskWithGammaFragmentShader;
         else
             qCritical("QGLEngineShaderManager::useCorrectShaderProg() - Unknown mask type");
 
-        compileNamedShader(maskShaderName, QGLShader::PartialFragmentShader);
-        requiredProgram.maskFragShader = compiledShaders[maskShaderName];
-    }
-    else
+        requiredProgram.maskFragShader = sharedShaders->compileNamedShader(maskShaderName, QGLShader::PartialFragmentShader);
+    } else {
         requiredProgram.maskFragShader = 0;
+    }
 
     if (hasCompose) {
-        QGLEngineShaderManager::ShaderName compositionShaderName = QGLEngineShaderManager::InvalidShaderName;
+        QGLEngineSharedShaders::ShaderName compositionShaderName = QGLEngineSharedShaders::InvalidShaderName;
         switch (compositionMode) {
             case QPainter::CompositionMode_Multiply:
-                compositionShaderName = MultiplyCompositionModeFragmentShader;
+                compositionShaderName = QGLEngineSharedShaders::MultiplyCompositionModeFragmentShader;
                 break;
             case QPainter::CompositionMode_Screen:
-                compositionShaderName = ScreenCompositionModeFragmentShader;
+                compositionShaderName = QGLEngineSharedShaders::ScreenCompositionModeFragmentShader;
                 break;
             case QPainter::CompositionMode_Overlay:
-                compositionShaderName = OverlayCompositionModeFragmentShader;
+                compositionShaderName = QGLEngineSharedShaders::OverlayCompositionModeFragmentShader;
                 break;
             case QPainter::CompositionMode_Darken:
-                compositionShaderName = DarkenCompositionModeFragmentShader;
+                compositionShaderName = QGLEngineSharedShaders::DarkenCompositionModeFragmentShader;
                 break;
             case QPainter::CompositionMode_Lighten:
-                compositionShaderName = LightenCompositionModeFragmentShader;
+                compositionShaderName = QGLEngineSharedShaders::LightenCompositionModeFragmentShader;
                 break;
             case QPainter::CompositionMode_ColorDodge:
-                compositionShaderName = ColorDodgeCompositionModeFragmentShader;
+                compositionShaderName = QGLEngineSharedShaders::ColorDodgeCompositionModeFragmentShader;
                 break;
             case QPainter::CompositionMode_ColorBurn:
-                compositionShaderName = ColorBurnCompositionModeFragmentShader;
+                compositionShaderName = QGLEngineSharedShaders::ColorBurnCompositionModeFragmentShader;
                 break;
             case QPainter::CompositionMode_HardLight:
-                compositionShaderName = HardLightCompositionModeFragmentShader;
+                compositionShaderName = QGLEngineSharedShaders::HardLightCompositionModeFragmentShader;
                 break;
             case QPainter::CompositionMode_SoftLight:
-                compositionShaderName = SoftLightCompositionModeFragmentShader;
+                compositionShaderName = QGLEngineSharedShaders::SoftLightCompositionModeFragmentShader;
                 break;
             case QPainter::CompositionMode_Difference:
-                compositionShaderName = DifferenceCompositionModeFragmentShader;
+                compositionShaderName = QGLEngineSharedShaders::DifferenceCompositionModeFragmentShader;
                 break;
             case QPainter::CompositionMode_Exclusion:
-                compositionShaderName = ExclusionCompositionModeFragmentShader;
+                compositionShaderName = QGLEngineSharedShaders::ExclusionCompositionModeFragmentShader;
                 break;
             default:
                 qWarning("QGLEngineShaderManager::useCorrectShaderProg() - Unsupported composition mode");
         }
-        compileNamedShader(compositionShaderName, QGLShader::PartialFragmentShader);
-        requiredProgram.compositionFragShader = compiledShaders[compositionShaderName];
-    }
-    else
+        requiredProgram.compositionFragShader = sharedShaders->compileNamedShader(compositionShaderName, QGLShader::PartialFragmentShader);
+    } else {
         requiredProgram.compositionFragShader = 0;
-
-    // At this point, requiredProgram is fully populated so try to find the program in the cache
-    bool foundProgramInCache = false;
-    for (int i = 0; i < cachedPrograms.size(); ++i) {
-        if (cachedPrograms[i] == requiredProgram) {
-            currentShaderProg = &cachedPrograms[i];
-            foundProgramInCache = true;
-            break;
-        }
     }
 
-    // If the shader program's not found in the cache, create it now.
-    if (!foundProgramInCache) {
-        requiredProgram.program = new QGLShaderProgram(ctx, this);
-        requiredProgram.program->addShader(requiredProgram.mainVertexShader);
-        requiredProgram.program->addShader(requiredProgram.positionVertexShader);
-        requiredProgram.program->addShader(requiredProgram.mainFragShader);
-        requiredProgram.program->addShader(requiredProgram.srcPixelFragShader);
-        requiredProgram.program->addShader(requiredProgram.maskFragShader);
-        requiredProgram.program->addShader(requiredProgram.compositionFragShader);
-
-        // We have to bind the vertex attribute names before the program is linked:
-        requiredProgram.program->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
-        if (useTextureCoords)
-            requiredProgram.program->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
-
-        requiredProgram.program->link();
-        if (!requiredProgram.program->isLinked()) {
-            QString error;
-            qWarning() <<  "Shader program failed to link,"
-#if defined(QT_DEBUG)
-                  << '\n'
-                  << "  Shaders Used:" << '\n'
-                  << "    mainVertexShader = "     << requiredProgram.mainVertexShader->objectName()  << '\n'
-                  << "    positionVertexShader = " << requiredProgram.positionVertexShader->objectName() << '\n'
-                  << "    mainFragShader = "       << requiredProgram.mainFragShader->objectName() << '\n'
-                  << "    srcPixelFragShader = "   << requiredProgram.srcPixelFragShader->objectName() << '\n'
-                  << "    maskFragShader = "       << requiredProgram.maskFragShader->objectName() << '\n'
-                  << "    compositionFragShader = "<< requiredProgram.compositionFragShader->objectName() << '\n'
-#endif
-                  << "  Error Log:" << '\n'
-                  << "    " << requiredProgram.program->log();
-            qWarning() << error;
-            delete requiredProgram.program;
-        } else {
-            cachedPrograms.append(requiredProgram);
-            // taking the address here is safe since
-            // cachePrograms isn't resized anywhere else
-            currentShaderProg = &cachedPrograms.last();
-        }
-    }
+    // At this point, requiredProgram is fully populated so try to find the program in the cache
+    currentShaderProg = sharedShaders->findProgramInCache(requiredProgram);
 
     if (currentShaderProg) {
         currentShaderProg->program->enable();
@@ -604,40 +665,4 @@ bool QGLEngineShaderManager::useCorrectShaderProg()
     return true;
 }
 
-void QGLEngineShaderManager::compileNamedShader(QGLEngineShaderManager::ShaderName name, QGLShader::ShaderType type)
-{
-    if (compiledShaders[name])
-        return;
-
-    QGLShader *newShader;
-
-    QByteArray source;
-    if (name == CustomImageSrcFragmentShader) {
-        source = customSrcStage->source();
-        source += qglslCustomSrcFragmentShader;
-
-        newShader = customShaderCache.object(source);
-        if (!newShader) {
-            newShader = new QGLShader(type, ctx, this);
-            newShader->compile(source);
-            customShaderCache.insert(source, newShader);
-
-            connect(newShader, SIGNAL(destroyed(QObject *)),
-                    this, SLOT(shaderDestroyed(QObject *)));
-        }
-    } else {
-        source = qglEngineShaderSourceCode[name];
-        newShader = new QGLShader(type, ctx, this);
-        newShader->compile(source);
-    }
-
-#if defined(QT_DEBUG)
-    // Name the shader for easier debugging
-    QMetaEnum m = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("ShaderName"));
-    newShader->setObjectName(QLatin1String(m.valueToKey(name)));
-#endif
-
-    compiledShaders[name] = newShader;
-}
-
 QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index 99cd82e..0cfdcf1 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -275,65 +275,10 @@ struct QGLEngineCachedShaderProg
 static const GLuint QT_VERTEX_COORDS_ATTR  = 0;
 static const GLuint QT_TEXTURE_COORDS_ATTR = 1;
 
-class Q_OPENGL_EXPORT QGLEngineShaderManager : public QObject
+class QGLEngineSharedShaders : public QObject
 {
     Q_OBJECT
 public:
-    QGLEngineShaderManager(QGLContext* context);
-    ~QGLEngineShaderManager();
-
-    enum MaskType {NoMask, PixelMask, SubPixelMask, SubPixelWithGammaMask};
-    enum PixelSrcType {
-        ImageSrc = Qt::TexturePattern+1,
-        NonPremultipliedImageSrc = Qt::TexturePattern+2,
-        PatternSrc = Qt::TexturePattern+3,
-        TextureSrcWithPattern = Qt::TexturePattern+4
-    };
-
-    enum Uniform {
-        ImageTexture,
-        PatternColor,
-        GlobalOpacity,
-        Depth,
-        PmvMatrix,
-        MaskTexture,
-        FragmentColor,
-        LinearData,
-        Angle,
-        HalfViewportSize,
-        Fmp,
-        Fmp2MRadius2,
-        Inverse2Fmp2MRadius2,
-        InvertedTextureSize,
-        BrushTransform,
-        BrushTexture,
-        NumUniforms
-    };
-
-    // There are optimisations we can do, depending on the brush transform:
-    //    1) May not have to apply perspective-correction
-    //    2) Can use lower precision for matrix
-    void optimiseForBrushTransform(const QTransform &transform);
-    void setSrcPixelType(Qt::BrushStyle);
-    void setSrcPixelType(PixelSrcType); // For non-brush sources, like pixmaps & images
-    void setTextureCoordsEnabled(bool); // For images & text glyphs
-    void setUseGlobalOpacity(bool);
-    void setMaskType(MaskType);
-    void setCompositionMode(QPainter::CompositionMode);
-    void setCustomStage(QGLCustomShaderStage* stage);
-    void removeCustomStage(QGLCustomShaderStage* stage);
-
-    uint getUniformLocation(Uniform id);
-
-    void setDirty(); // someone has manually changed the current shader program
-    bool useCorrectShaderProg(); // returns true if the shader program needed to be changed
-
-    QGLShaderProgram* currentProgram(); // Returns pointer to the shader the manager has chosen
-    QGLShaderProgram* simpleProgram(); // Used to draw into e.g. stencil buffers
-    QGLShaderProgram* blitProgram(); // Used to blit a texture into the framebuffer
-
-    static QGLEngineShaderManager *managerForContext(const QGLContext *context);
-
     enum ShaderName {
         MainVertexShader,
         MainWithTexCoordsVertexShader,
@@ -392,6 +337,92 @@ public:
         TotalShaderCount, InvalidShaderName
     };
 
+    QGLEngineSharedShaders(const QGLContext *context);
+
+    QGLShader *compileNamedShader(ShaderName name, QGLShader::ShaderType type);
+
+    QGLShaderProgram *simpleProgram() { return simpleShaderProg; }
+    QGLShaderProgram *blitProgram() { return blitShaderProg; }
+    // Compile the program if it's not already in the cache, return the item in the cache.
+    QGLEngineShaderProg *findProgramInCache(const QGLEngineShaderProg &prog);
+    // Compile the custom shader if it's not already in the cache, return the item in the cache.
+    QGLShader *compileCustomShader(QGLCustomShaderStage *stage, QGLShader::ShaderType type);
+
+    static QGLEngineSharedShaders *shadersForContext(const QGLContext *context);
+
+signals:
+    void shaderProgNeedsChanging();
+
+private slots:
+    void shaderDestroyed(QObject *shader);
+
+private:
+    QGLContextGroup *ctx;
+    QGLShaderProgram *blitShaderProg;
+    QGLShaderProgram *simpleShaderProg;
+    QList<QGLEngineShaderProg> cachedPrograms;
+    QCache<QByteArray, QGLShader> customShaderCache;
+    QGLShader* compiledShaders[TotalShaderCount];
+
+    static const char* qglEngineShaderSourceCode[TotalShaderCount];
+};
+
+class Q_OPENGL_EXPORT QGLEngineShaderManager : public QObject
+{
+    Q_OBJECT
+public:
+    QGLEngineShaderManager(QGLContext* context);
+    ~QGLEngineShaderManager();
+
+    enum MaskType {NoMask, PixelMask, SubPixelMask, SubPixelWithGammaMask};
+    enum PixelSrcType {
+        ImageSrc = Qt::TexturePattern+1,
+        NonPremultipliedImageSrc = Qt::TexturePattern+2,
+        PatternSrc = Qt::TexturePattern+3,
+        TextureSrcWithPattern = Qt::TexturePattern+4
+    };
+
+    enum Uniform {
+        ImageTexture,
+        PatternColor,
+        GlobalOpacity,
+        Depth,
+        PmvMatrix,
+        MaskTexture,
+        FragmentColor,
+        LinearData,
+        Angle,
+        HalfViewportSize,
+        Fmp,
+        Fmp2MRadius2,
+        Inverse2Fmp2MRadius2,
+        InvertedTextureSize,
+        BrushTransform,
+        BrushTexture,
+        NumUniforms
+    };
+
+    // There are optimisations we can do, depending on the brush transform:
+    //    1) May not have to apply perspective-correction
+    //    2) Can use lower precision for matrix
+    void optimiseForBrushTransform(const QTransform &transform);
+    void setSrcPixelType(Qt::BrushStyle);
+    void setSrcPixelType(PixelSrcType); // For non-brush sources, like pixmaps & images
+    void setTextureCoordsEnabled(bool); // For images & text glyphs
+    void setUseGlobalOpacity(bool);
+    void setMaskType(MaskType);
+    void setCompositionMode(QPainter::CompositionMode);
+    void setCustomStage(QGLCustomShaderStage* stage);
+    void removeCustomStage(QGLCustomShaderStage* stage);
+
+    uint getUniformLocation(Uniform id);
+
+    void setDirty(); // someone has manually changed the current shader program
+    bool useCorrectShaderProg(); // returns true if the shader program needed to be changed
+
+    QGLShaderProgram* currentProgram(); // Returns pointer to the shader the manager has chosen
+    QGLShaderProgram* simpleProgram(); // Used to draw into e.g. stencil buffers
+    QGLShaderProgram* blitProgram(); // Used to blit a texture into the framebuffer
 
 /*
     // These allow the ShaderName enum to be used as a cache key
@@ -408,7 +439,7 @@ public:
 #endif
 
 private slots:
-    void shaderDestroyed(QObject *shader);
+    void shaderProgNeedsChangingSlot() { shaderProgNeedsChanging = true; }
 
 private:
     QGLContext*     ctx;
@@ -423,19 +454,9 @@ private:
     QPainter::CompositionMode   compositionMode;
     QGLCustomShaderStage*       customSrcStage;
 
-    QGLShaderProgram*     blitShaderProg;
-    QGLShaderProgram*     simpleShaderProg;
     QGLEngineShaderProg*  currentShaderProg;
-
-    // TODO: Possibly convert to a LUT
-    QList<QGLEngineShaderProg> cachedPrograms;
-    QCache<QByteArray, QGLShader> customShaderCache;
-
-    QGLShader* compiledShaders[TotalShaderCount];
-
-    void compileNamedShader(QGLEngineShaderManager::ShaderName name, QGLShader::ShaderType type);
-
-    static const char* qglEngineShaderSourceCode[TotalShaderCount];
+    QGLEngineSharedShaders *sharedShaders;
+    QGLShader *customShader;
 };
 
 QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 0c01263..e24539b 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -316,6 +316,7 @@ extern QImage qt_imageForBrush(int brushStyle, bool invert);
 
 QGL2PaintEngineExPrivate::~QGL2PaintEngineExPrivate()
 {
+    delete shaderManager;
 }
 
 void QGL2PaintEngineExPrivate::updateTextureFilter(GLenum target, GLenum wrapMode, bool smoothPixmapTransform, GLuint id)
@@ -1330,8 +1331,7 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
     qt_resolve_version_2_0_functions(d->ctx);
 #endif
 
-    d->shaderManager = QGLEngineShaderManager::managerForContext(d->ctx);
-    d->shaderManager->setDirty();
+    d->shaderManager = new QGLEngineShaderManager(d->ctx);
 
     glViewport(0, 0, d->width, d->height);
 
@@ -1415,6 +1415,9 @@ bool QGL2PaintEngineEx::end()
 
     d->resetGLState();
 
+    delete d->shaderManager;
+    d->shaderManager = 0;
+
     return false;
 }
 
@@ -1430,11 +1433,13 @@ void QGL2PaintEngineEx::ensureActive()
             p->transferMode(BrushDrawingMode);
             p->drawable.doneCurrent();
         }
+        d->drawable.context()->makeCurrent();
         d->drawable.makeCurrent();
 
         ctx->d_ptr->active_engine = this;
-
         d->needsSync = true;
+    } else {
+        d->drawable.context()->makeCurrent();
     }
 
     if (d->needsSync) {
@@ -1658,10 +1663,16 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
 {
     Q_Q(QGL2PaintEngineEx);
 
-    if (q->paintDevice()->devType() == QInternal::Widget)
+    if (systemClip.isEmpty()) {
         use_system_clip = false;
-    else
-        use_system_clip = !systemClip.isEmpty();
+    } else {
+        if (q->paintDevice()->devType() == QInternal::Widget && currentClipWidget) {
+            QWidgetPrivate *widgetPrivate = qt_widget_private(currentClipWidget->window());
+            use_system_clip = widgetPrivate->extra && widgetPrivate->extra->inRenderWithPainter;
+        } else {
+            use_system_clip = true;
+        }
+    }
 
     glDisable(GL_DEPTH_TEST);
     q->state()->depthTestEnabled = false;
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 552e390..cb23b11 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -196,6 +196,8 @@ public:
 
     float zValueForRenderText() const;
 
+    static QGLEngineShaderManager* shaderManagerForEngine(QGL2PaintEngineEx *engine) { return engine->d_func()->shaderManager; }
+
     QGL2PaintEngineEx* q;
     QGLDrawable drawable;
     int width, height;
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 8b7674e..dde4eba 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -2005,9 +2005,15 @@ QGLTexture* QGLContextPrivate::bindTexture(const QImage &image, GLenum target, G
 
     QImage::Format target_format = img.format();
     bool premul = options & QGLContext::PremultipliedAlphaBindOption;
-    GLenum texture_format = QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_2
-                            ? GL_BGRA : GL_RGBA;
-    GLuint pixel_type = GL_UNSIGNED_BYTE;
+    GLenum texture_format;
+    GLuint pixel_type;
+    if (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_2) {
+        texture_format = GL_BGRA;
+        pixel_type = GL_UNSIGNED_INT_8_8_8_8_REV;
+    } else {
+        texture_format = GL_RGBA;
+        pixel_type = GL_UNSIGNED_BYTE;
+    }
 
     switch (target_format) {
     case QImage::Format_ARGB32:
@@ -2034,7 +2040,6 @@ QGLTexture* QGLContextPrivate::bindTexture(const QImage &image, GLenum target, G
         if (format == GL_RGBA)
             format = GL_RGB;
         break;
-
     default:
         if (img.hasAlphaChannel()) {
             img = img.convertToFormat(premul
@@ -2062,6 +2067,30 @@ QGLTexture* QGLContextPrivate::bindTexture(const QImage &image, GLenum target, G
         }
     }
 
+    if (texture_format == GL_RGBA) {
+        // The only case where we end up with a depth different from
+        // 32 in the switch above is for the RGB16 case, where we set
+        // the format to GL_RGB
+        Q_ASSERT(img.depth() == 32);
+        const int width = img.width();
+        const int height = img.height();
+
+        if (pixel_type == GL_UNSIGNED_INT_8_8_8_8_REV
+            || (pixel_type == GL_UNSIGNED_BYTE && QSysInfo::ByteOrder == QSysInfo::LittleEndian)) {
+            for (int i=0; i < height; ++i) {
+                uint *p = (uint *) img.scanLine(i);
+                for (int x=0; x<width; ++x)
+                    p[x] = ((p[x] << 16) & 0xff0000) | ((p[x] >> 16) & 0xff) | (p[x] & 0xff00ff00);
+            }
+        } else {
+            for (int i=0; i < height; ++i) {
+                uint *p = (uint *) img.scanLine(i);
+                for (int x=0; x<width; ++x)
+                    p[x] = (p[x] << 8) | ((p[x] >> 24) & 0xff);
+            }
+        }
+    }
+
     const QImage &constRef = img; // to avoid detach in bits()...
     glTexImage2D(target, 0, format, img.width(), img.height(), 0, texture_format,
                  pixel_type, constRef.bits());
@@ -3533,12 +3562,7 @@ bool QGLWidget::event(QEvent *e)
 #elif defined(Q_WS_WIN)
     if (e->type() == QEvent::ParentChange) {
         QGLContext *newContext = new QGLContext(d->glcx->requestedFormat(), this);
-        QList<const QGLContext *> shares = qgl_share_reg()->shares(d->glcx);
-        setContext(newContext);
-        for (int i = 0; i < shares.size(); ++i) {
-            if (newContext != shares.at(i))
-                qgl_share_reg()->addShare(newContext, shares.at(i));
-        }
+        setContext(newContext, d->glcx);
 
         // the overlay needs to be recreated as well
         delete d->olcx;
@@ -4922,13 +4946,13 @@ void QGLShareRegister::removeShare(const QGLContext *context) {
 QGLContextResource::QGLContextResource(FreeFunc f, QObject *parent)
     : QObject(parent), free(f)
 {
-    connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext *)), this, SLOT(aboutToDestroyContext(const QGLContext *)));
+    connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext *)), this, SLOT(removeOne(const QGLContext *)));
 }
 
 QGLContextResource::~QGLContextResource()
 {
     while (!m_resources.empty())
-        remove(m_resources.begin().key());
+        removeGroup(m_resources.begin().key());
 }
 
 void QGLContextResource::insert(const QGLContext *key, void *value)
@@ -4976,7 +5000,7 @@ void *QGLContextResource::value(const QGLContext *key)
     return it.value();
 }
 
-void QGLContextResource::remove(const QGLContext *key)
+void QGLContextResource::removeGroup(const QGLContext *key)
 {
     QList<const QGLContext *> shares = qgl_share_reg()->shares(key);
     if (shares.size() == 0)
@@ -5000,7 +5024,7 @@ void QGLContextResource::remove(const QGLContext *key)
     }
 }
 
-void QGLContextResource::aboutToDestroyContext(const QGLContext *key)
+void QGLContextResource::removeOne(const QGLContext *key)
 {
     ResourceHash::iterator it = m_resources.find(key);
     if (it == m_resources.end())
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index a39c52c..72ec35e 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -540,10 +540,10 @@ public:
     // Return resource for 'key' or a shared context.
     void *value(const QGLContext *key);
     // Free resource for 'key' and all its shared contexts.
-    void remove(const QGLContext *key);
+    void removeGroup(const QGLContext *key);
 private slots:
     // Remove entry 'key' from cache and delete resource if there are no shared contexts.
-    void aboutToDestroyContext(const QGLContext *key);
+    void removeOne(const QGLContext *key);
 private:
     typedef QHash<const QGLContext *, void *> ResourceHash;
     ResourceHash m_resources;
diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h
index 8839f60..b1c9503 100644
--- a/src/opengl/qglextensions_p.h
+++ b/src/opengl/qglextensions_p.h
@@ -418,6 +418,10 @@ struct QGLExtensionFuncs
 #define GL_UNSIGNED_SHORT_5_6_5 33635
 #endif
 
+#ifndef GL_UNSIGNED_INT_8_8_8_8_REV
+#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
+#endif
+
 #ifndef GL_MULTISAMPLE
 #define GL_MULTISAMPLE  0x809D
 #endif
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index 8fd113a..94e3930 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -97,7 +97,7 @@ public:
     \i \link setSamples() Number of samples per pixels.\endlink
     \i \link setAttachment() Depth and/or stencil attachments.\endlink
     \i \link setTextureTarget() Texture target.\endlink
-    \i \link setInternalFormat() Internal format.\endlink
+    \i \link setInternalTextureFormat() Internal texture format.\endlink
     \endlist
 
     Note that the desired attachments or number of samples per pixels might not
@@ -109,38 +109,28 @@ public:
 */
 
 /*!
-    Creates a QGLFramebufferObjectFormat object with properties specifying
+    Creates a QGLFramebufferObjectFormat object for specifying
     the format of an OpenGL framebuffer object.
 
-    A multisample framebuffer object is specified by setting \a samples
-    to a value different from zero. If the desired amount of samples per pixel is
-    not supported by the hardware then the maximum number of samples per pixel
-    will be used. Note that multisample framebuffer objects can not be bound as
-    textures. Also, the \c{GL_EXT_framebuffer_multisample} extension is required
-    to create a framebuffer with more than one sample per pixel.
+    By default the format specifies a non-multisample framebuffer object with no
+    attachments, texture target \c GL_TEXTURE_2D, and internal format \c GL_RGBA8.
 
-    For multisample framebuffer objects a color render buffer is created,
-    otherwise a texture with the texture target \a target is created.
-    The color render buffer or texture will have the internal format
-    \a internalFormat, and will be bound to the \c GL_COLOR_ATTACHMENT0
-    attachment in the framebuffer object.
-
-    The \a attachment parameter describes the depth/stencil buffer
-    configuration.
-
-    \sa samples(), attachment(), target(), internalFormat()
+    \sa samples(), attachment(), target(), internalTextureFormat()
 */
 
-QGLFramebufferObjectFormat::QGLFramebufferObjectFormat(int samples,
-                                                       QGLFramebufferObject::Attachment attachment,
-                                                       GLenum target,
-                                                       GLenum internalFormat)
+#ifndef QT_OPENGL_ES
+#define DEFAULT_FORMAT GL_RGBA8
+#else
+#define DEFAULT_FORMAT GL_RGBA
+#endif
+
+QGLFramebufferObjectFormat::QGLFramebufferObjectFormat()
 {
     d = new QGLFramebufferObjectFormatPrivate;
-    d->samples = samples;
-    d->attachment = attachment;
-    d->target = target;
-    d->internal_format = internalFormat;
+    d->samples = 0;
+    d->attachment = QGLFramebufferObject::NoAttachment;
+    d->target = GL_TEXTURE_2D;
+    d->internal_format = DEFAULT_FORMAT;
 }
 
 /*!
@@ -176,6 +166,12 @@ QGLFramebufferObjectFormat::~QGLFramebufferObjectFormat()
     to \a samples.
     A sample count of 0 represents a regular non-multisample framebuffer object.
 
+    If the desired amount of samples per pixel is not supported by the hardware
+    then the maximum number of samples per pixel will be used. Note that
+    multisample framebuffer objects can not be bound as textures. Also, the
+    \c{GL_EXT_framebuffer_multisample} extension is required to create a
+    framebuffer with more than one sample per pixel.
+
     \sa samples()
 */
 void QGLFramebufferObjectFormat::setSamples(int samples)
@@ -195,7 +191,7 @@ int QGLFramebufferObjectFormat::samples() const
 }
 
 /*!
-    Sets the attachments a framebuffer object should have to \a attachment.
+    Sets the attachment configuration of a framebuffer object to \a attachment.
 
     \sa attachment()
 */
@@ -238,31 +234,46 @@ GLenum QGLFramebufferObjectFormat::textureTarget() const
 }
 
 /*!
-    Sets the internal format of a framebuffer object's texture or multisample
-    framebuffer object's color buffer to \a internalFormat.
+    Sets the internal format of a framebuffer object's texture or
+    multisample framebuffer object's color buffer to
+    \a internalTextureFormat.
 
-    \sa internalFormat()
+    \sa internalTextureFormat()
 */
-void QGLFramebufferObjectFormat::setInternalFormat(GLenum internalFormat)
+void QGLFramebufferObjectFormat::setInternalTextureFormat(GLenum internalTextureFormat)
 {
-    d->internal_format = internalFormat;
+    d->internal_format = internalTextureFormat;
 }
 
 /*!
     Returns the internal format of a framebuffer object's texture or
     multisample framebuffer object's color buffer.
 
-    \sa setInternalFormat()
+    \sa setInternalTextureFormat()
 */
-GLenum QGLFramebufferObjectFormat::internalFormat() const
+GLenum QGLFramebufferObjectFormat::internalTextureFormat() const
 {
     return d->internal_format;
 }
 
+#ifdef Q_MAC_COMPAT_GL_FUNCTIONS
+/*! \internal */
+void QGLFramebufferObjectFormat::setTextureTarget(QMacCompatGLenum target)
+{
+    d->target = target;
+}
+
+/*! \internal */
+void QGLFramebufferObjectFormat::setInternalTextureFormat(QMacCompatGLenum internalTextureFormat)
+{
+    d->internal_format = internalTextureFormat;
+}
+#endif
+
 class QGLFramebufferObjectPrivate
 {
 public:
-    QGLFramebufferObjectPrivate() : depth_stencil_buffer(0), valid(false), bound(false), ctx(0), previous_fbo(0), engine(0) {}
+    QGLFramebufferObjectPrivate() : depth_stencil_buffer(0), valid(false), ctx(0), previous_fbo(0), engine(0) {}
     ~QGLFramebufferObjectPrivate() {}
 
     void init(const QSize& sz, QGLFramebufferObject::Attachment attachment,
@@ -276,7 +287,6 @@ public:
     QSize size;
     QGLFramebufferObjectFormat format;
     uint valid : 1;
-    uint bound : 1;
     QGLFramebufferObject::Attachment fbo_attachment;
     QGLContext *ctx; // for Windows extension ptrs
     GLuint previous_fbo;
@@ -469,7 +479,7 @@ void QGLFramebufferObjectPrivate::init(const QSize &sz, QGLFramebufferObject::At
     format.setTextureTarget(target);
     format.setSamples(int(samples));
     format.setAttachment(fbo_attachment);
-    format.setInternalFormat(internal_format);
+    format.setInternalTextureFormat(internal_format);
 }
 
 /*!
@@ -526,6 +536,12 @@ void QGLFramebufferObjectPrivate::init(const QSize &sz, QGLFramebufferObject::At
     the constructors that take a QGLFramebufferObject parameter, and set the
     QGLFramebufferObject::samples() property to a non-zero value.
 
+    For multisample framebuffer objects a color render buffer is created,
+    otherwise a texture with the specified texture target is created.
+    The color render buffer or texture will have the specified internal
+    format, and will be bound to the \c GL_COLOR_ATTACHMENT0
+    attachment in the framebuffer object.
+
     If you want to use a framebuffer object with multisampling enabled
     as a texture, you first need to copy from it to a regular framebuffer
     object using QGLContext::blitFramebuffer().
@@ -579,12 +595,6 @@ void QGLFramebufferObjectPrivate::init(const QSize &sz, QGLFramebufferObject::At
     \sa size(), texture(), attachment()
 */
 
-#ifndef QT_OPENGL_ES
-#define DEFAULT_FORMAT GL_RGBA8
-#else
-#define DEFAULT_FORMAT GL_RGBA
-#endif
-
 QGLFramebufferObject::QGLFramebufferObject(const QSize &size, GLenum target)
     : d_ptr(new QGLFramebufferObjectPrivate)
 {
@@ -626,7 +636,7 @@ QGLFramebufferObject::QGLFramebufferObject(const QSize &size, const QGLFramebuff
     : d_ptr(new QGLFramebufferObjectPrivate)
 {
     Q_D(QGLFramebufferObject);
-    d->init(size, format.attachment(), format.textureTarget(), format.internalFormat(), format.samples());
+    d->init(size, format.attachment(), format.textureTarget(), format.internalTextureFormat(), format.samples());
 }
 
 /*! \overload
@@ -639,7 +649,7 @@ QGLFramebufferObject::QGLFramebufferObject(int width, int height, const QGLFrame
     : d_ptr(new QGLFramebufferObjectPrivate)
 {
     Q_D(QGLFramebufferObject);
-    d->init(QSize(width, height), format.attachment(), format.textureTarget(), format.internalFormat(), format.samples());
+    d->init(QSize(width, height), format.attachment(), format.textureTarget(), format.internalTextureFormat(), format.samples());
 }
 
 #ifdef Q_MAC_COMPAT_GL_FUNCTIONS
@@ -781,7 +791,7 @@ bool QGLFramebufferObject::bind()
     Q_D(QGLFramebufferObject);
     QGL_FUNC_CONTEXT;
     glBindFramebuffer(GL_FRAMEBUFFER_EXT, d->fbo);
-    d->bound = d->valid = d->checkFramebufferStatus();
+    d->valid = d->checkFramebufferStatus();
     const QGLContext *context = QGLContext::currentContext();
     if (d->valid && context) {
         // Save the previous setting to automatically restore in release().
@@ -812,7 +822,6 @@ bool QGLFramebufferObject::release()
 	return false;
     Q_D(QGLFramebufferObject);
     QGL_FUNC_CONTEXT;
-    d->bound = false;
 
     const QGLContext *context = QGLContext::currentContext();
     if (context) {
@@ -877,7 +886,7 @@ QImage QGLFramebufferObject::toImage() const
 
     // qt_gl_read_framebuffer doesn't work on a multisample FBO
     if (format().samples() != 0) {
-        QGLFramebufferObject temp(size());
+        QGLFramebufferObject temp(size(), QGLFramebufferObjectFormat());
 
         QRect rect(QPoint(0, 0), size());
         blitFramebuffer(&temp, rect, const_cast<QGLFramebufferObject *>(this), rect);
@@ -1091,7 +1100,7 @@ QGLFramebufferObject::Attachment QGLFramebufferObject::attachment() const
 bool QGLFramebufferObject::isBound() const
 {
     Q_D(const QGLFramebufferObject);
-    return d->bound;
+    return d->ctx->d_ptr->current_fbo == d->fbo;
 }
 
 /*!
diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h
index cfc824b..ec1ae7d 100644
--- a/src/opengl/qglframebufferobject.h
+++ b/src/opengl/qglframebufferobject.h
@@ -137,18 +137,7 @@ class QGLFramebufferObjectFormatPrivate;
 class Q_OPENGL_EXPORT QGLFramebufferObjectFormat
 {
 public:
-#if !defined(QT_OPENGL_ES) || defined(Q_QDOC)
-    QGLFramebufferObjectFormat(int samples = 0,
-                               QGLFramebufferObject::Attachment attachment = QGLFramebufferObject::NoAttachment,
-                               GLenum target = GL_TEXTURE_2D,
-                               GLenum internalFormat = GL_RGBA8);
-#else
-    QGLFramebufferObjectFormat(int samples = 0,
-                               QGLFramebufferObject::Attachment attachment = QGLFramebufferObject::NoAttachment,
-                               GLenum target = GL_TEXTURE_2D,
-                               GLenum internalFormat = GL_RGBA);
-#endif
-
+    QGLFramebufferObjectFormat();
     QGLFramebufferObjectFormat(const QGLFramebufferObjectFormat &other);
     QGLFramebufferObjectFormat &operator=(const QGLFramebufferObjectFormat &other);
     ~QGLFramebufferObjectFormat();
@@ -162,8 +151,13 @@ public:
     void setTextureTarget(GLenum target);
     GLenum textureTarget() const;
 
-    void setInternalFormat(GLenum internalFormat);
-    GLenum internalFormat() const;
+    void setInternalTextureFormat(GLenum internalTextureFormat);
+    GLenum internalTextureFormat() const;
+
+#ifdef Q_MAC_COMPAT_GL_FUNCTIONS
+    void setTextureTarget(QMacCompatGLenum target);
+    void setInternalTextureFormat(QMacCompatGLenum internalTextureFormat);
+#endif
 
 private:
     QGLFramebufferObjectFormatPrivate *d;
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp
index 54d54e9..f082ff0 100644
--- a/src/opengl/qglpixelbuffer.cpp
+++ b/src/opengl/qglpixelbuffer.cpp
@@ -110,8 +110,10 @@ void QGLPixelBufferPrivate::common_init(const QSize &size, const QGLFormat &form
         invalid = false;
         qctx = new QGLContext(format);
         qctx->d_func()->sharing = (shareWidget != 0);
-        if (shareWidget != 0 && shareWidget->d_func()->glcx)
+        if (shareWidget != 0 && shareWidget->d_func()->glcx) {
             qgl_share_reg()->addShare(qctx, shareWidget->d_func()->glcx);
+            shareWidget->d_func()->glcx->d_func()->sharing = true;
+        }
 
         qctx->d_func()->paintDevice = q;
         qctx->d_func()->valid = true;
diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp
index c51ccc7..68db9c0 100644
--- a/src/opengl/qglpixmapfilter.cpp
+++ b/src/opengl/qglpixmapfilter.cpp
@@ -324,7 +324,7 @@ bool QGLPixmapBlurFilter::processGL(QPainter *painter, const QPointF &pos, const
     filter->setSource(generateBlurShader(radius(), quality() == Qt::SmoothTransformation));
 
     QGLFramebufferObjectFormat format;
-    format.setInternalFormat(src.hasAlphaChannel() ? GL_RGBA : GL_RGB);
+    format.setInternalTextureFormat(GLenum(src.hasAlphaChannel() ? GL_RGBA : GL_RGB));
     QGLFramebufferObject *fbo = qgl_fbo_pool()->acquire(src.size(), format);
 
     if (!fbo)
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 56b55d0..bcc6c61 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -2288,6 +2288,58 @@ void QGLShaderProgram::setUniformValue(const char *name, const QSizeF& size)
     setUniformValue(uniformLocation(name), size);
 }
 
+// We have to repack matrices from qreal to GLfloat.
+#define setUniformMatrix(func,location,value,cols,rows) \
+    if (location == -1) \
+        return; \
+    if (sizeof(qreal) == sizeof(GLfloat)) { \
+        func(location, 1, GL_FALSE, \
+             reinterpret_cast<const GLfloat *>(value.constData())); \
+    } else { \
+        GLfloat mat[cols * rows]; \
+        const qreal *data = value.constData(); \
+        for (int i = 0; i < cols * rows; ++i) \
+            mat[i] = data[i]; \
+        func(location, 1, GL_FALSE, mat); \
+    }
+#if !defined(QT_OPENGL_ES_2)
+#define setUniformGenericMatrix(func,colfunc,location,value,cols,rows) \
+    if (location == -1) \
+        return; \
+    if (sizeof(qreal) == sizeof(GLfloat)) { \
+        const GLfloat *data = reinterpret_cast<const GLfloat *> \
+            (value.constData());  \
+        if (func) \
+            func(location, 1, GL_FALSE, data); \
+        else \
+            colfunc(location, cols, data); \
+    } else { \
+        GLfloat mat[cols * rows]; \
+        const qreal *data = value.constData(); \
+        for (int i = 0; i < cols * rows; ++i) \
+            mat[i] = data[i]; \
+        if (func) \
+            func(location, 1, GL_FALSE, mat); \
+        else \
+            colfunc(location, cols, mat); \
+    }
+#else
+#define setUniformGenericMatrix(func,colfunc,location,value,cols,rows) \
+    if (location == -1) \
+        return; \
+    if (sizeof(qreal) == sizeof(GLfloat)) { \
+        const GLfloat *data = reinterpret_cast<const GLfloat *> \
+            (value.constData());  \
+        colfunc(location, cols, data); \
+    } else { \
+        GLfloat mat[cols * rows]; \
+        const qreal *data = value.constData(); \
+        for (int i = 0; i < cols * rows; ++i) \
+            mat[i] = data[i]; \
+        colfunc(location, cols, mat); \
+    }
+#endif
+
 /*!
     Sets the uniform variable at \a location in the current context
     to a 2x2 matrix \a value.
@@ -2296,8 +2348,7 @@ void QGLShaderProgram::setUniformValue(const char *name, const QSizeF& size)
 */
 void QGLShaderProgram::setUniformValue(int location, const QMatrix2x2& value)
 {
-    if (location != -1)
-        glUniformMatrix2fv(location, 1, GL_FALSE, value.data());
+    setUniformMatrix(glUniformMatrix2fv, location, value, 2, 2);
 }
 
 /*!
@@ -2321,20 +2372,8 @@ void QGLShaderProgram::setUniformValue(const char *name, const QMatrix2x2& value
 */
 void QGLShaderProgram::setUniformValue(int location, const QMatrix2x3& value)
 {
-#if !defined(QT_OPENGL_ES_2)
-    if (location != -1) {
-        if (glUniformMatrix2x3fv) {
-            // OpenGL 2.1+: pass the matrix directly.
-            glUniformMatrix2x3fv(location, 1, GL_FALSE, value.data());
-        } else {
-            // OpenGL 2.0: pass the matrix columns as a vector.
-            glUniform3fv(location, 2, value.data());
-        }
-    }
-#else
-    if (location != -1)
-        glUniform3fv(location, 2, value.data());
-#endif
+    setUniformGenericMatrix
+        (glUniformMatrix2x3fv, glUniform3fv, location, value, 2, 3);
 }
 
 /*!
@@ -2358,20 +2397,8 @@ void QGLShaderProgram::setUniformValue(const char *name, const QMatrix2x3& value
 */
 void QGLShaderProgram::setUniformValue(int location, const QMatrix2x4& value)
 {
-#if !defined(QT_OPENGL_ES_2)
-    if (location != -1) {
-        if (glUniformMatrix2x4fv) {
-            // OpenGL 2.1+: pass the matrix directly.
-            glUniformMatrix2x4fv(location, 1, GL_FALSE, value.data());
-        } else {
-            // OpenGL 2.0: pass the matrix columns as a vector.
-            glUniform4fv(location, 2, value.data());
-        }
-    }
-#else
-    if (location != -1)
-        glUniform4fv(location, 2, value.data());
-#endif
+    setUniformGenericMatrix
+        (glUniformMatrix2x4fv, glUniform4fv, location, value, 2, 4);
 }
 
 /*!
@@ -2395,20 +2422,8 @@ void QGLShaderProgram::setUniformValue(const char *name, const QMatrix2x4& value
 */
 void QGLShaderProgram::setUniformValue(int location, const QMatrix3x2& value)
 {
-#if !defined(QT_OPENGL_ES_2)
-    if (location != -1) {
-        if (glUniformMatrix3x2fv) {
-            // OpenGL 2.1+: pass the matrix directly.
-            glUniformMatrix3x2fv(location, 1, GL_FALSE, value.data());
-        } else {
-            // OpenGL 2.0: pass the matrix columns as a vector.
-            glUniform2fv(location, 3, value.data());
-        }
-    }
-#else
-    if (location != -1)
-        glUniform2fv(location, 3, value.data());
-#endif
+    setUniformGenericMatrix
+        (glUniformMatrix3x2fv, glUniform2fv, location, value, 3, 2);
 }
 
 /*!
@@ -2432,8 +2447,7 @@ void QGLShaderProgram::setUniformValue(const char *name, const QMatrix3x2& value
 */
 void QGLShaderProgram::setUniformValue(int location, const QMatrix3x3& value)
 {
-    if (location != -1)
-        glUniformMatrix3fv(location, 1, GL_FALSE, value.data());
+    setUniformMatrix(glUniformMatrix3fv, location, value, 3, 3);
 }
 
 /*!
@@ -2457,20 +2471,8 @@ void QGLShaderProgram::setUniformValue(const char *name, const QMatrix3x3& value
 */
 void QGLShaderProgram::setUniformValue(int location, const QMatrix3x4& value)
 {
-#if !defined(QT_OPENGL_ES_2)
-    if (location != -1) {
-        if (glUniformMatrix3x4fv) {
-            // OpenGL 2.1+: pass the matrix directly.
-            glUniformMatrix3x4fv(location, 1, GL_FALSE, value.data());
-        } else {
-            // OpenGL 2.0: pass the matrix columns as a vector.
-            glUniform4fv(location, 3, value.data());
-        }
-    }
-#else
-    if (location != -1)
-        glUniform4fv(location, 3, value.data());
-#endif
+    setUniformGenericMatrix
+        (glUniformMatrix3x4fv, glUniform4fv, location, value, 3, 4);
 }
 
 /*!
@@ -2494,20 +2496,8 @@ void QGLShaderProgram::setUniformValue(const char *name, const QMatrix3x4& value
 */
 void QGLShaderProgram::setUniformValue(int location, const QMatrix4x2& value)
 {
-#if !defined(QT_OPENGL_ES_2)
-    if (location != -1) {
-        if (glUniformMatrix4x2fv) {
-            // OpenGL 2.1+: pass the matrix directly.
-            glUniformMatrix4x2fv(location, 1, GL_FALSE, value.data());
-        } else {
-            // OpenGL 2.0: pass the matrix columns as a vector.
-            glUniform2fv(location, 4, value.data());
-        }
-    }
-#else
-    if (location != -1)
-        glUniform2fv(location, 4, value.data());
-#endif
+    setUniformGenericMatrix
+        (glUniformMatrix4x2fv, glUniform2fv, location, value, 4, 2);
 }
 
 /*!
@@ -2531,20 +2521,8 @@ void QGLShaderProgram::setUniformValue(const char *name, const QMatrix4x2& value
 */
 void QGLShaderProgram::setUniformValue(int location, const QMatrix4x3& value)
 {
-#if !defined(QT_OPENGL_ES_2)
-    if (location != -1) {
-        if (glUniformMatrix4x3fv) {
-            // OpenGL 2.1+: pass the matrix directly.
-            glUniformMatrix4x3fv(location, 1, GL_FALSE, value.data());
-        } else {
-            // OpenGL 2.0: pass the matrix columns as a vector.
-            glUniform3fv(location, 4, value.data());
-        }
-    }
-#else
-    if (location != -1)
-        glUniform3fv(location, 4, value.data());
-#endif
+    setUniformGenericMatrix
+        (glUniformMatrix4x3fv, glUniform3fv, location, value, 4, 3);
 }
 
 /*!
@@ -2568,8 +2546,7 @@ void QGLShaderProgram::setUniformValue(const char *name, const QMatrix4x3& value
 */
 void QGLShaderProgram::setUniformValue(int location, const QMatrix4x4& value)
 {
-    if (location != -1)
-        glUniformMatrix4fv(location, 1, GL_FALSE, value.data());
+    setUniformMatrix(glUniformMatrix4fv, location, value, 4, 4);
 }
 
 /*!
@@ -2815,18 +2792,20 @@ void QGLShaderProgram::setUniformValueArray(const char *name, const QVector4D *v
     setUniformValueArray(uniformLocation(name), values, count);
 }
 
-// We may have to repack matrix arrays if the matrix types
-// contain additional flag bits.  Especially QMatrix4x4.
+// We have to repack matrix arrays from qreal to GLfloat.
 #define setUniformMatrixArray(func,location,values,count,type,cols,rows) \
     if (location == -1 || count <= 0) \
         return; \
-    if (count == 1 || sizeof(type) == cols * rows * sizeof(GLfloat)) { \
-        func(location, count, GL_FALSE, values->constData()); \
+    if (sizeof(type) == sizeof(GLfloat) * cols * rows) { \
+        func(location, count, GL_FALSE, \
+             reinterpret_cast<const GLfloat *>(values[0].constData())); \
     } else { \
         QVarLengthArray<GLfloat> temp(cols * rows * count); \
         for (int index = 0; index < count; ++index) { \
-            qMemCopy(temp.data() + cols * rows * index, \
-                     values[index].constData(), cols * rows * sizeof(GLfloat)); \
+            for (int index2 = 0; index2 < (cols * rows); ++index2) { \
+                temp.data()[cols * rows * index + index2] = \
+                    values[index].constData()[index2]; \
+            } \
         } \
         func(location, count, GL_FALSE, temp.constData()); \
     }
@@ -2834,16 +2813,20 @@ void QGLShaderProgram::setUniformValueArray(const char *name, const QVector4D *v
 #define setUniformGenericMatrixArray(func,colfunc,location,values,count,type,cols,rows) \
     if (location == -1 || count <= 0) \
         return; \
-    if (count == 1 || sizeof(type) == cols * rows * sizeof(GLfloat)) { \
+    if (sizeof(type) == sizeof(GLfloat) * cols * rows) { \
+        const GLfloat *data = reinterpret_cast<const GLfloat *> \
+            (values[0].constData());  \
         if (func) \
-            func(location, count, GL_FALSE, values->constData()); \
+            func(location, count, GL_FALSE, data); \
         else \
-            colfunc(location, cols * count, values->constData()); \
+            colfunc(location, count * cols, data); \
     } else { \
         QVarLengthArray<GLfloat> temp(cols * rows * count); \
         for (int index = 0; index < count; ++index) { \
-            qMemCopy(temp.data() + cols * rows * index, \
-                     values[index].constData(), cols * rows * sizeof(GLfloat)); \
+            for (int index2 = 0; index2 < (cols * rows); ++index2) { \
+                temp.data()[cols * rows * index + index2] = \
+                    values[index].constData()[index2]; \
+            } \
         } \
         if (func) \
             func(location, count, GL_FALSE, temp.constData()); \
@@ -2854,13 +2837,17 @@ void QGLShaderProgram::setUniformValueArray(const char *name, const QVector4D *v
 #define setUniformGenericMatrixArray(func,colfunc,location,values,count,type,cols,rows) \
     if (location == -1 || count <= 0) \
         return; \
-    if (count == 1 || sizeof(type) == cols * rows * sizeof(GLfloat)) { \
-        colfunc(location, cols * count, values->constData()); \
+    if (sizeof(type) == sizeof(GLfloat) * cols * rows) { \
+        const GLfloat *data = reinterpret_cast<const GLfloat *> \
+            (values[0].constData());  \
+        colfunc(location, count * cols, data); \
     } else { \
         QVarLengthArray<GLfloat> temp(cols * rows * count); \
         for (int index = 0; index < count; ++index) { \
-            qMemCopy(temp.data() + cols * rows * index, \
-                     values[index].constData(), cols * rows * sizeof(GLfloat)); \
+            for (int index2 = 0; index2 < (cols * rows); ++index2) { \
+                temp.data()[cols * rows * index + index2] = \
+                    values[index].constData()[index2]; \
+            } \
         } \
         colfunc(location, count * cols, temp.constData()); \
     }
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index 5e87e96..d63d2ad 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -84,7 +84,7 @@ QGLFramebufferObject *QGLFramebufferObjectPool::acquire(const QSize &requestSize
         if (format.samples() == requestFormat.samples()
             && format.attachment() == requestFormat.attachment()
             && format.textureTarget() == requestFormat.textureTarget()
-            && format.internalFormat() == requestFormat.internalFormat())
+            && format.internalTextureFormat() == requestFormat.internalTextureFormat())
         {
             // choose the fbo with a matching format and the closest size
             if (!candidate || areaDiff(requestSize, candidate) > areaDiff(requestSize, fbo))
@@ -467,7 +467,7 @@ QPaintEngine* QGLPixmapData::paintEngine() const
         QGLFramebufferObjectFormat format;
         format.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
         format.setSamples(4);
-        format.setInternalFormat(m_hasAlpha ? GL_RGBA : GL_RGB);
+        format.setInternalTextureFormat(GLenum(m_hasAlpha ? GL_RGBA : GL_RGB));
 
         m_renderFbo = qgl_fbo_pool()->acquire(size(), format);
 
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index a59501c..a85b9ae 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -569,7 +569,7 @@ void QGLWindowSurface::updateGeometry()
 
         QGLFramebufferObjectFormat format;
         format.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
-        format.setInternalFormat(GL_RGBA);
+        format.setInternalTextureFormat(GLenum(GL_RGBA));
         format.setTextureTarget(target);
 
         if (QGLExtensions::glExtensions & QGLExtensions::FramebufferBlit)
diff --git a/src/opengl/util/glsl_to_include.sh b/src/opengl/util/glsl_to_include.sh
index 59d4693..083ad1e 100755
--- a/src/opengl/util/glsl_to_include.sh
+++ b/src/opengl/util/glsl_to_include.sh
@@ -1,4 +1,44 @@
 #! /bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Compile a .glsl file to a file that can be included in a C++ program
 USAGE="Usage: $0 <file.glsl>"
diff --git a/src/plugins/gfxdrivers/directfb/directfb.pro b/src/plugins/gfxdrivers/directfb/directfb.pro
index c5da3df..d397050 100644
--- a/src/plugins/gfxdrivers/directfb/directfb.pro
+++ b/src/plugins/gfxdrivers/directfb/directfb.pro
@@ -1,47 +1,15 @@
 TARGET = qdirectfbscreen
 include(../../qpluginbase.pri)
+include($$QT_SOURCE_TREE/src/gui/embedded/directfb.pri)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers
 
-# These defines might be necessary if your DirectFB driver doesn't
-# support all of the DirectFB API.
-#
-#DEFINES += QT_DIRECTFB_WINDOW_AS_CURSOR
-#DEFINES += QT_NO_DIRECTFB_IMAGEPROVIDER
-#DEFINES += QT_DIRECTFB_IMAGEPROVIDER_KEEPALIVE
-#DEFINES += QT_DIRECTFB_IMAGECACHE
-#DEFINES += QT_NO_DIRECTFB_WM
-#DEFINES += QT_NO_DIRECTFB_LAYER
-#DEFINES += QT_NO_DIRECTFB_PALETTE
-#DEFINES += QT_NO_DIRECTFB_PREALLOCATED
-#DEFINES += QT_NO_DIRECTFB_MOUSE
-#DEFINES += QT_NO_DIRECTFB_KEYBOARD
-#DEFINES += QT_DIRECTFB_TIMING
-#DEFINES += QT_NO_DIRECTFB_OPAQUE_DETECTION
-#DIRECTFB_DRAWINGOPERATIONS=DRAW_RECTS|DRAW_LINES|DRAW_IMAGE|DRAW_PIXMAP|DRAW_TILED_PIXMAP|STROKE_PATH|DRAW_PATH|DRAW_POINTS|DRAW_ELLIPSE|DRAW_POLYGON|DRAW_TEXT|FILL_PATH|FILL_RECT|DRAW_COLORSPANS
-#DEFINES += \"QT_DIRECTFB_WARN_ON_RASTERFALLBACKS=$$DIRECTFB_DRAWINGOPERATIONS\"
-#DEFINES += \"QT_DIRECTFB_DISABLE_RASTERFALLBACKS=$$DIRECTFB_DRAWINGOPERATIONS\"
-
 target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers
 INSTALLS += target
 
-HEADERS = qdirectfbscreen.h \
-          qdirectfbwindowsurface.h \
-          qdirectfbpaintengine.h \
-          qdirectfbpaintdevice.h \
-          qdirectfbpixmap.h \
-          qdirectfbkeyboard.h \
-          qdirectfbmouse.h
-
-SOURCES = qdirectfbscreen.cpp \
-          qdirectfbscreenplugin.cpp \
-          qdirectfbwindowsurface.cpp \
-          qdirectfbpaintengine.cpp \
-          qdirectfbpaintdevice.cpp \
-          qdirectfbpixmap.cpp \
-          qdirectfbkeyboard.cpp \
-          qdirectfbmouse.cpp
+SOURCES += qdirectfbscreenplugin.cpp
 
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DIRECTFB
 LIBS += $$QT_LIBS_DIRECTFB
 DEFINES += $$QT_DEFINES_DIRECTFB
+contains(gfx-plugins, directfb):DEFINES += QT_QWS_DIRECTFB
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
index 2fb1520..896f512 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
@@ -121,8 +121,8 @@ QDirectFBMouseHandlerPrivate::QDirectFBMouseHandlerPrivate(QDirectFBMouseHandler
         return;
     }
 
-    int flags = ::fcntl(fd, F_GETFL, 0);
-    ::fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+    int flags = fcntl(fd, F_GETFL, 0);
+    fcntl(fd, F_SETFL, flags | O_NONBLOCK);
 
     // DirectFB seems to assume that the mouse always starts centered
     prevPoint = QPoint(screen->deviceWidth() / 2, screen->deviceHeight() / 2);
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
index 106de0d..b82433d 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
@@ -48,14 +48,26 @@
 QT_BEGIN_NAMESPACE
 
 QDirectFBPaintDevice::QDirectFBPaintDevice(QDirectFBScreen *scr)
-    : QCustomRasterPaintDevice(0), dfbSurface(0), lockedImage(0), screen(scr),
-      bpl(-1), lockFlgs(DFBSurfaceLockFlags(0)), mem(0), engine(0),
-      imageFormat(QImage::Format_Invalid)
-{}
+    : QCustomRasterPaintDevice(0), dfbSurface(0), screen(scr),
+      bpl(-1), lockFlgs(DFBSurfaceLockFlags(0)), mem(0), engine(0), imageFormat(QImage::Format_Invalid)
+{
+#ifdef QT_DIRECTFB_SUBSURFACE
+    subSurface = 0;
+    syncPending = false;
+#endif
+}
 
 QDirectFBPaintDevice::~QDirectFBPaintDevice()
 {
-    delete lockedImage;
+    if (QDirectFBScreen::instance()) {
+        unlockSurface();
+#ifdef QT_DIRECTFB_SUBSURFACE
+        releaseSubSurface();
+#endif
+        if (dfbSurface) {
+            screen->releaseDFBSurface(dfbSurface);
+        }
+    }
     delete engine;
 }
 
@@ -64,30 +76,58 @@ IDirectFBSurface *QDirectFBPaintDevice::directFBSurface() const
     return dfbSurface;
 }
 
-void QDirectFBPaintDevice::lockDirectFB(DFBSurfaceLockFlags flags)
+bool QDirectFBPaintDevice::lockSurface(DFBSurfaceLockFlags lockFlags)
 {
-    if (!(lockFlgs & flags)) {
-        if (lockFlgs)
-            unlockDirectFB();
-        mem = QDirectFBScreen::lockSurface(dfbSurface, flags, &bpl);
+    if (lockFlgs && (lockFlags & ~lockFlgs))
+        unlockSurface();
+    if (!mem) {
+        Q_ASSERT(dfbSurface);
+#ifdef QT_DIRECTFB_SUBSURFACE
+        if (!subSurface) {
+            DFBResult result;
+            subSurface = screen->getSubSurface(dfbSurface, QRect(), QDirectFBScreen::TrackSurface, &result);
+            if (result != DFB_OK || !subSurface) {
+                DirectFBError("Couldn't create sub surface", result);
+                return false;
+            }
+        }
+        IDirectFBSurface *surface = subSurface;
+#else
+        IDirectFBSurface *surface = dfbSurface;
+#endif
+        Q_ASSERT(surface);
+        mem = QDirectFBScreen::lockSurface(surface, lockFlags, &bpl);
+        lockFlgs = lockFlags;
         Q_ASSERT(mem);
+        Q_ASSERT(bpl > 0);
         const QSize s = size();
-        lockedImage = new QImage(mem, s.width(), s.height(), bpl,
-                                 QDirectFBScreen::getImageFormat(dfbSurface));
-        lockFlgs = flags;
+        lockedImage = QImage(mem, s.width(), s.height(), bpl,
+                             QDirectFBScreen::getImageFormat(dfbSurface));
+        return true;
     }
+#ifdef QT_DIRECTFB_SUBSURFACE
+    if (syncPending) {
+        syncPending = false;
+        screen->waitIdle();
+    }
+#endif
+    return false;
 }
 
-void QDirectFBPaintDevice::unlockDirectFB()
+void QDirectFBPaintDevice::unlockSurface()
 {
-    if (!lockedImage || !QDirectFBScreen::instance())
-        return;
-
-    dfbSurface->Unlock(dfbSurface);
-    delete lockedImage;
-    lockedImage = 0;
-    mem = 0;
-    lockFlgs = DFBSurfaceLockFlags(0);
+    if (QDirectFBScreen::instance() && lockFlgs) {
+#ifdef QT_DIRECTFB_SUBSURFACE
+        IDirectFBSurface *surface = subSurface;
+#else
+        IDirectFBSurface *surface = dfbSurface;
+#endif
+        if (surface) {
+            surface->Unlock(surface);
+            lockFlgs = static_cast<DFBSurfaceLockFlags>(0);
+            mem = 0;
+        }
+    }
 }
 
 void *QDirectFBPaintDevice::memory() const
@@ -102,17 +142,10 @@ QImage::Format QDirectFBPaintDevice::format() const
 
 int QDirectFBPaintDevice::bytesPerLine() const
 {
-    if (bpl == -1) {
-        // Can only get the stride when we lock the surface
-        Q_ASSERT(!lockedImage);
-        QDirectFBPaintDevice* that = const_cast<QDirectFBPaintDevice*>(this);
-        that->lockDirectFB(DSLF_READ|DSLF_WRITE);
-        Q_ASSERT(bpl != -1);
-    }
+    Q_ASSERT(!mem || bpl != -1);
     return bpl;
 }
 
-
 QSize QDirectFBPaintDevice::size() const
 {
     int w, h;
@@ -142,8 +175,8 @@ int QDirectFBPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) const
     case QPaintDevice::PdmDepth:
         return QDirectFBScreen::depth(imageFormat);
     case QPaintDevice::PdmNumColors: {
-        if (lockedImage)
-            return lockedImage->numColors();
+        if (!lockedImage.isNull())
+            return lockedImage.numColors();
 
         DFBResult result;
         IDirectFBPalette *palette = 0;
@@ -171,6 +204,17 @@ QPaintEngine *QDirectFBPaintDevice::paintEngine() const
     return engine;
 }
 
+#ifdef QT_DIRECTFB_SUBSURFACE
+void QDirectFBPaintDevice::releaseSubSurface()
+{
+    Q_ASSERT(QDirectFBScreen::instance());
+    if (subSurface) {
+        screen->releaseDFBSurface(subSurface);
+        subSurface = 0;
+    }
+}
+#endif
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_QWS_DIRECTFB
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
index f5de44b..adb80e2 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
@@ -62,8 +62,8 @@ public:
 
     virtual IDirectFBSurface *directFBSurface() const;
 
-    void lockDirectFB(DFBSurfaceLockFlags lock);
-    void unlockDirectFB();
+    bool lockSurface(DFBSurfaceLockFlags lockFlags);
+    void unlockSurface();
 
     // Reimplemented from QCustomRasterPaintDevice:
     void *memory() const;
@@ -73,7 +73,6 @@ public:
     int metric(QPaintDevice::PaintDeviceMetric metric) const;
     DFBSurfaceLockFlags lockFlags() const { return lockFlgs; }
     QPaintEngine *paintEngine() const;
-
 protected:
     QDirectFBPaintDevice(QDirectFBScreen *scr);
     inline int dotsPerMeterX() const
@@ -84,17 +83,21 @@ protected:
     {
         return (screen->deviceHeight() * 1000) / screen->physicalHeight();
     }
-protected:
+
     IDirectFBSurface *dfbSurface;
-    QImage *lockedImage;
+#ifdef QT_DIRECTFB_SUBSURFACE
+    void releaseSubSurface();
+    IDirectFBSurface *subSurface;
+    friend class QDirectFBPaintEnginePrivate;
+    bool syncPending;
+#endif
+    QImage lockedImage;
     QDirectFBScreen *screen;
     int bpl;
     DFBSurfaceLockFlags lockFlgs;
     uchar *mem;
     QDirectFBPaintEngine *engine;
     QImage::Format imageFormat;
-private:
-    Q_DISABLE_COPY(QDirectFBPaintDevice);
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index 9a9553e..6535d65 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -93,6 +93,7 @@ public:
 
     inline void lock();
     inline void unlock();
+    static inline void unlock(QDirectFBPaintDevice *device);
 
     inline bool isSimpleBrush(const QBrush &brush) const;
 
@@ -109,7 +110,7 @@ public:
 #endif
 
     void prepareForBlit(bool alpha);
-private:
+
     IDirectFBSurface *surface;
 
     bool antialiased;
@@ -129,7 +130,6 @@ private:
     QRect currentClip;
 
     QDirectFBPaintEngine *q;
-    friend class QDirectFBPaintEngine;
 };
 
 class SurfaceCache
@@ -222,6 +222,7 @@ template <class T>
 static inline void drawRects(const T *rects, int n, const QTransform &transform, IDirectFBSurface *surface);
 
 #define CLIPPED_PAINT(operation) {                                      \
+        d->unlock();                                                    \
         DFBRegion clipRegion;                                           \
         switch (d->clipType) {                                          \
         case QDirectFBPaintEnginePrivate::NoClip:                       \
@@ -269,6 +270,7 @@ bool QDirectFBPaintEngine::begin(QPaintDevice *device)
         QPixmapData *data = static_cast<QPixmap*>(device)->pixmapData();
         Q_ASSERT(data->classId() == QPixmapData::DirectFBClass);
         QDirectFBPixmapData *dfbPixmapData = static_cast<QDirectFBPixmapData*>(data);
+        QDirectFBPaintEnginePrivate::unlock(dfbPixmapData);
         d->dfbDevice = static_cast<QDirectFBPaintDevice*>(dfbPixmapData);
     }
 
@@ -409,14 +411,13 @@ void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount)
         QRasterPaintEngine::drawRects(rects, rectCount);
         return;
     }
-    d->unlock();
     if (brush != Qt::NoBrush) {
         d->setDFBColor(brush.color());
-        CLIPPED_PAINT(::fillRects<QRect>(rects, rectCount, state()->matrix, d->surface));
+        CLIPPED_PAINT(QT_PREPEND_NAMESPACE(fillRects<QRect>)(rects, rectCount, state()->matrix, d->surface));
     }
     if (pen != Qt::NoPen) {
         d->setDFBColor(pen.color());
-        CLIPPED_PAINT(::drawRects<QRect>(rects, rectCount, state()->matrix, d->surface));
+        CLIPPED_PAINT(QT_PREPEND_NAMESPACE(drawRects<QRect>)(rects, rectCount, state()->matrix, d->surface));
     }
 }
 
@@ -438,14 +439,13 @@ void QDirectFBPaintEngine::drawRects(const QRectF *rects, int rectCount)
         QRasterPaintEngine::drawRects(rects, rectCount);
         return;
     }
-    d->unlock();
     if (brush != Qt::NoBrush) {
         d->setDFBColor(brush.color());
-        CLIPPED_PAINT(::fillRects<QRectF>(rects, rectCount, state()->matrix, d->surface));
+        CLIPPED_PAINT(fillRects<QRectF>(rects, rectCount, state()->matrix, d->surface));
     }
     if (pen != Qt::NoPen) {
         d->setDFBColor(pen.color());
-        CLIPPED_PAINT(::drawRects<QRectF>(rects, rectCount, state()->matrix, d->surface));
+        CLIPPED_PAINT(QT_PREPEND_NAMESPACE(drawRects<QRectF>)(rects, rectCount, state()->matrix, d->surface));
     }
 }
 
@@ -464,9 +464,8 @@ void QDirectFBPaintEngine::drawLines(const QLine *lines, int lineCount)
 
     const QPen &pen = state()->pen;
     if (pen != Qt::NoPen) {
-        d->unlock();
         d->setDFBColor(pen.color());
-        CLIPPED_PAINT(::drawLines<QLine>(lines, lineCount, state()->matrix, d->surface));
+        CLIPPED_PAINT(QT_PREPEND_NAMESPACE(drawLines<QLine>)(lines, lineCount, state()->matrix, d->surface));
     }
 }
 
@@ -485,9 +484,8 @@ void QDirectFBPaintEngine::drawLines(const QLineF *lines, int lineCount)
 
     const QPen &pen = state()->pen;
     if (pen != Qt::NoPen) {
-        d->unlock();
         d->setDFBColor(pen.color());
-        CLIPPED_PAINT(::drawLines<QLineF>(lines, lineCount, state()->matrix, d->surface));
+        CLIPPED_PAINT(QT_PREPEND_NAMESPACE(drawLines<QLineF>)(lines, lineCount, state()->matrix, d->surface));
     }
 }
 
@@ -533,7 +531,6 @@ void QDirectFBPaintEngine::drawImage(const QRectF &r, const QImage &image,
         return;
     }
 #if !defined QT_NO_DIRECTFB_PREALLOCATED || defined QT_DIRECTFB_IMAGECACHE
-    d->unlock();
     bool release;
     IDirectFBSurface *imgSurface = d->getSurface(image, &release);
     d->prepareForBlit(QDirectFBScreen::hasAlphaChannel(imgSurface));
@@ -561,25 +558,25 @@ void QDirectFBPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pixmap,
         RASTERFALLBACK(DRAW_PIXMAP, r, pixmap.size(), sr);
         d->lock();
         QRasterPaintEngine::drawPixmap(r, pixmap, sr);
-    } else if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
-               || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-               || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
-               || (state()->renderHints & QPainter::SmoothPixmapTransform
-                   && state()->matrix.mapRect(r).size() != sr.size())) {
-        RASTERFALLBACK(DRAW_PIXMAP, r, pixmap.size(), sr);
-        const QImage *img = static_cast<QDirectFBPixmapData*>(pixmap.pixmapData())->buffer(DSLF_READ);
-        d->lock();
-        QRasterPaintEngine::drawImage(r, *img, sr);
     } else {
-        d->unlock();
-        d->prepareForBlit(pixmap.hasAlphaChannel());
         QPixmapData *data = pixmap.pixmapData();
         Q_ASSERT(data->classId() == QPixmapData::DirectFBClass);
         QDirectFBPixmapData *dfbData = static_cast<QDirectFBPixmapData*>(data);
-        dfbData->unlockDirectFB();
-        IDirectFBSurface *s = dfbData->directFBSurface();
-
-        CLIPPED_PAINT(d->blit(r, s, sr));
+        if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
+               || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
+               || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
+               || (state()->renderHints & QPainter::SmoothPixmapTransform
+                   && state()->matrix.mapRect(r).size() != sr.size())) {
+            RASTERFALLBACK(DRAW_PIXMAP, r, pixmap.size(), sr);
+            const QImage *img = dfbData->buffer();
+            d->lock();
+            QRasterPaintEngine::drawImage(r, *img, sr);
+        } else {
+            QDirectFBPaintEnginePrivate::unlock(dfbData);
+            d->prepareForBlit(pixmap.hasAlphaChannel());
+            IDirectFBSurface *s = dfbData->directFBSurface();
+            CLIPPED_PAINT(d->blit(r, s, sr));
+        }
     }
 }
 
@@ -602,14 +599,16 @@ void QDirectFBPaintEngine::drawTiledPixmap(const QRectF &r,
                || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
                || (state()->renderHints & QPainter::SmoothPixmapTransform && state()->matrix.isScaling())) {
         RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), offset);
-        const QImage *img = static_cast<QDirectFBPixmapData*>(pixmap.pixmapData())->buffer(DSLF_READ);
+        QPixmapData *pixmapData = pixmap.pixmapData();
+        Q_ASSERT(pixmapData->classId() == QPixmapData::DirectFBClass);
+        QDirectFBPixmapData *dfbData = static_cast<QDirectFBPixmapData*>(pixmapData);
+        const QImage *img = dfbData->buffer();
         d->lock();
         QRasterPixmapData *data = new QRasterPixmapData(QPixmapData::PixmapType);
         data->fromImage(*img, Qt::AutoColor);
         const QPixmap pix(data);
         QRasterPaintEngine::drawTiledPixmap(r, pix, offset);
     } else {
-        d->unlock();
         CLIPPED_PAINT(d->drawTiledPixmap(r, pixmap, offset));
     }
 }
@@ -708,7 +707,6 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush)
             const QColor color = brush.color();
             if (!color.isValid())
                 return;
-            d->unlock();
             d->setDFBColor(color);
             const QRect r = state()->matrix.mapRect(rect).toRect();
             CLIPPED_PAINT(d->surface->FillRectangle(d->surface, r.x(), r.y(), r.width(), r.height()));
@@ -725,7 +723,6 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush)
             if (texture.pixmapData()->classId() != QPixmapData::DirectFBClass)
                 break;
 
-            d->unlock();
             CLIPPED_PAINT(d->drawTiledPixmap(rect, texture, rect.topLeft() - state()->brushOrigin));
             return; }
         default:
@@ -749,7 +746,6 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QColor &color)
         d->lock();
         QRasterPaintEngine::fillRect(rect, color);
     } else {
-        d->unlock();
         d->setDFBColor(color);
         const QRect r = state()->matrix.mapRect(rect).toRect();
         CLIPPED_PAINT(d->surface->FillRectangle(d->surface, r.x(), r.y(), r.width(), r.height()));
@@ -811,8 +807,7 @@ void QDirectFBPaintEnginePrivate::lock()
     // lock so we need to call the base implementation of prepare so
     // it updates its rasterBuffer to point to the new buffer address.
     Q_ASSERT(dfbDevice);
-    if (dfbDevice->lockFlags() != (DSLF_WRITE|DSLF_READ)) {
-        dfbDevice->lockDirectFB(DSLF_READ|DSLF_WRITE);
+    if (dfbDevice->lockSurface(DSLF_READ|DSLF_WRITE)) {
         prepare(dfbDevice);
     }
 }
@@ -820,7 +815,21 @@ void QDirectFBPaintEnginePrivate::lock()
 void QDirectFBPaintEnginePrivate::unlock()
 {
     Q_ASSERT(dfbDevice);
-    dfbDevice->unlockDirectFB();
+#ifdef QT_DIRECTFB_SUBSURFACE
+    dfbDevice->syncPending = true;
+#else
+    QDirectFBPaintEnginePrivate::unlock(dfbDevice);
+#endif
+}
+
+void QDirectFBPaintEnginePrivate::unlock(QDirectFBPaintDevice *device)
+{
+#ifdef QT_NO_DIRECTFB_SUBSURFACE
+    Q_ASSERT(device);
+    device->unlockSurface();
+#else
+    Q_UNUSED(device);
+#endif
 }
 
 void QDirectFBPaintEnginePrivate::setTransform(const QTransform &transform)
@@ -895,10 +904,10 @@ void QDirectFBPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode m
     case QPainter::CompositionMode_Plus:
         surface->SetPorterDuff(surface, DSPD_ADD);
         break;
-#endif
     case QPainter::CompositionMode_Xor:
         surface->SetPorterDuff(surface, DSPD_XOR);
         break;
+#endif
     default:
         compositionModeStatus = 0;
         break;
@@ -1031,7 +1040,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
     QPixmapData *data = pixmap.pixmapData();
     Q_ASSERT(data->classId() == QPixmapData::DirectFBClass);
     QDirectFBPixmapData *dfbData = static_cast<QDirectFBPixmapData*>(data);
-    dfbData->unlockDirectFB();
+    QDirectFBPaintEnginePrivate::unlock(dfbData);
     const QSize pixmapSize = dfbData->size();
     IDirectFBSurface *sourceSurface = dfbData->directFBSurface();
     if (transform.isScaling()) {
@@ -1040,8 +1049,8 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
         offset.ry() *= transform.m22();
 
         const QSizeF mappedSize(pixmapSize.width() * transform.m11(), pixmapSize.height() * transform.m22());
-        qreal y = ::fixCoord(destinationRect.y(), mappedSize.height(), offset.y());
-        const qreal startX = ::fixCoord(destinationRect.x(), mappedSize.width(), offset.x());
+        qreal y = fixCoord(destinationRect.y(), mappedSize.height(), offset.y());
+        const qreal startX = fixCoord(destinationRect.x(), mappedSize.width(), offset.x());
         while (y <= destinationRect.bottom()) {
             qreal x = startX;
             while (x <= destinationRect.right()) {
@@ -1052,8 +1061,8 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
             y += mappedSize.height();
         }
     } else {
-        qreal y = ::fixCoord(destinationRect.y(), pixmapSize.height(), offset.y());
-        const qreal startX = ::fixCoord(destinationRect.x(), pixmapSize.width(), offset.x());
+        qreal y = fixCoord(destinationRect.y(), pixmapSize.height(), offset.y());
+        const qreal startX = fixCoord(destinationRect.x(), pixmapSize.width(), offset.x());
         int horizontal = qMax(1, destinationRect.width() / pixmapSize.width()) + 1;
         if (startX != destinationRect.x())
             ++horizontal;
@@ -1165,12 +1174,12 @@ template <class T>
 static inline void drawLines(const T *lines, int n, const QTransform &transform, IDirectFBSurface *surface)
 {
     if (n == 1) {
-        const QLine l = ::map(transform, lines[0]);
+        const QLine l = map(transform, lines[0]);
         surface->DrawLine(surface, l.x1(), l.y1(), l.x2(), l.y2());
     } else {
         QVarLengthArray<DFBRegion, 32> lineArray(n);
         for (int i=0; i<n; ++i) {
-            const QLine l = ::map(transform, lines[i]);
+            const QLine l = map(transform, lines[i]);
             lineArray[i].x1 = l.x1();
             lineArray[i].y1 = l.y1();
             lineArray[i].x2 = l.x2();
@@ -1184,12 +1193,12 @@ template <class T>
 static inline void fillRects(const T *rects, int n, const QTransform &transform, IDirectFBSurface *surface)
 {
     if (n == 1) {
-        const QRect r = ::mapRect(transform, rects[0]);
+        const QRect r = mapRect(transform, rects[0]);
         surface->FillRectangle(surface, r.x(), r.y(), r.width(), r.height());
     } else {
         QVarLengthArray<DFBRectangle, 32> rectArray(n);
         for (int i=0; i<n; ++i) {
-            const QRect r = ::mapRect(transform, rects[i]);
+            const QRect r = mapRect(transform, rects[i]);
             rectArray[i].x = r.x();
             rectArray[i].y = r.y();
             rectArray[i].w = r.width();
@@ -1203,7 +1212,7 @@ template <class T>
 static inline void drawRects(const T *rects, int n, const QTransform &transform, IDirectFBSurface *surface)
 {
     for (int i=0; i<n; ++i) {
-        const QRect r = ::mapRect(transform, rects[i]);
+        const QRect r = mapRect(transform, rects[i]);
         surface->DrawRectangle(surface, r.x(), r.y(), r.width(), r.height());
     }
 }
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index 0717020..6550683 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -64,9 +64,6 @@ QDirectFBPixmapData::QDirectFBPixmapData(QDirectFBScreen *screen, PixelType pixe
 
 QDirectFBPixmapData::~QDirectFBPixmapData()
 {
-    unlockDirectFB();
-    if (dfbSurface && QDirectFBScreen::instance())
-        screen->releaseDFBSurface(dfbSurface);
 }
 
 void QDirectFBPixmapData::resize(int width, int height)
@@ -167,7 +164,7 @@ static bool checkForAlphaPixels(const QImage &img)
 bool QDirectFBPixmapData::hasAlphaChannel(const QImage &img)
 {
 #ifndef QT_NO_DIRECTFB_OPAQUE_DETECTION
-    return ::checkForAlphaPixels(img);
+    return checkForAlphaPixels(img);
 #else
     return img.hasAlphaChannel();
 #endif
@@ -375,9 +372,13 @@ void QDirectFBPixmapData::copy(const QPixmapData *data, const QRect &rect)
         QPixmapData::copy(data, rect);
         return;
     }
-    unlockDirectFB();
 
     const QDirectFBPixmapData *otherData = static_cast<const QDirectFBPixmapData*>(data);
+#ifdef QT_NO_DIRECTFB_SUBSURFACE
+    if (otherData->lockFlags()) {
+        const_cast<QDirectFBPixmapData*>(otherData)->unlockSurface();
+    }
+#endif
     IDirectFBSurface *src = otherData->directFBSurface();
     alpha = data->hasAlphaChannel();
     imageFormat = (alpha
@@ -405,6 +406,7 @@ void QDirectFBPixmapData::copy(const QPixmapData *data, const QRect &rect)
     h = rect.height();
     d = otherData->d;
     is_null = (w <= 0 || h <= 0);
+    unlockSurface();
     DFBResult result = dfbSurface->Blit(dfbSurface, src, &blitRect, 0, 0);
 #if (Q_DIRECTFB_VERSION >= 0x010000)
     dfbSurface->ReleaseSource(dfbSurface);
@@ -443,7 +445,7 @@ void QDirectFBPixmapData::fill(const QColor &color)
 
     alpha = (color.alpha() < 255);
 
-    if (alpha && ::isOpaqueFormat(imageFormat)) {
+    if (alpha && isOpaqueFormat(imageFormat)) {
         QSize size;
         dfbSurface->GetSize(dfbSurface, &size.rwidth(), &size.rheight());
         screen->releaseDFBSurface(dfbSurface);
@@ -465,18 +467,21 @@ QPixmap QDirectFBPixmapData::transformed(const QTransform &transform,
                                          Qt::TransformationMode mode) const
 {
     QDirectFBPixmapData *that = const_cast<QDirectFBPixmapData*>(this);
+#ifdef QT_NO_DIRECTFB_SUBSURFACE
+    if (lockFlags())
+        that->unlockSurface();
+#endif
+
     if (!dfbSurface || transform.type() != QTransform::TxScale
         || mode != Qt::FastTransformation)
     {
         const QImage *image = that->buffer();
         Q_ASSERT(image);
         const QImage transformed = image->transformed(transform, mode);
-        that->unlockDirectFB();
         QDirectFBPixmapData *data = new QDirectFBPixmapData(screen, QPixmapData::PixmapType);
         data->fromImage(transformed, Qt::AutoColor);
         return QPixmap(data);
     }
-    that->unlockDirectFB();
 
     const QSize size = transform.mapRect(QRect(0, 0, w, h)).size();
     if (size.isEmpty())
@@ -556,14 +561,12 @@ QPaintEngine *QDirectFBPixmapData::paintEngine() const
 
 QImage *QDirectFBPixmapData::buffer()
 {
-    lockDirectFB(DSLF_READ|DSLF_WRITE);
-    return lockedImage;
-}
-
-QImage * QDirectFBPixmapData::buffer(DFBSurfaceLockFlags lockFlags)
-{
-    lockDirectFB(lockFlags);
-    return lockedImage;
+    if (!lockFlgs) {
+        lockSurface(DSLF_READ|DSLF_WRITE);
+    }
+    Q_ASSERT(lockFlgs);
+    Q_ASSERT(!lockedImage.isNull());
+    return &lockedImage;
 }
 
 void QDirectFBPixmapData::invalidate()
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
index 7b4ae47..5d3a2f6 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
@@ -81,11 +81,9 @@ public:
     virtual QImage toImage() const;
     virtual QPaintEngine *paintEngine() const;
     virtual QImage *buffer();
-    virtual int metric(QPaintDevice::PaintDeviceMetric m) const {return QDirectFBPaintDevice::metric(m);}
-
-    QImage *buffer(DFBSurfaceLockFlags lockFlags);
-
     // Pure virtual in QPixmapData, so re-implement here and delegate to QDirectFBPaintDevice
+    virtual int metric(QPaintDevice::PaintDeviceMetric m) const { return QDirectFBPaintDevice::metric(m); }
+
     inline QImage::Format pixelFormat() const { return imageFormat; }
     static bool hasAlphaChannel(const QImage &img);
     inline bool hasAlphaChannel() const { return alpha; }
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index 59fa191..211e8a5 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -95,6 +95,9 @@ public:
     IDirectFBImageProvider *imageProvider;
 #endif
     QColor backgroundColor;
+    IDirectFBSurface *cursorSurface;
+    qint64 cursorImageKey;
+
     QDirectFBScreen *q;
 };
 
@@ -117,6 +120,8 @@ QDirectFBScreenPrivate::QDirectFBScreenPrivate(QDirectFBScreen *qptr)
 #if defined QT_DIRECTFB_IMAGEPROVIDER && defined QT_DIRECTFB_IMAGEPROVIDER_KEEPALIVE
     , imageProvider(0)
 #endif
+    , cursorSurface(0)
+    , cursorImageKey(0)
     , q(qptr)
 {
 #ifndef QT_NO_QWS_SIGNALHANDLER
@@ -319,14 +324,38 @@ IDirectFBSurface *QDirectFBScreen::createDFBSurface(DFBSurfaceDescription desc,
 
     if (options & TrackSurface) {
         d_ptr->allocatedSurfaces.insert(newSurface);
-
-        //qDebug("Created a new DirectFB surface at %p. New count = %d",
-        //        newSurface, d_ptr->allocatedSurfaces.count());
     }
 
     return newSurface;
 }
 
+#ifdef QT_DIRECTFB_SUBSURFACE
+IDirectFBSurface *QDirectFBScreen::getSubSurface(IDirectFBSurface *surface,
+                                                 const QRect &rect,
+                                                 SurfaceCreationOptions options,
+                                                 DFBResult *resultPtr)
+{
+    Q_ASSERT(!(options & NoPreallocated));
+    Q_ASSERT(surface);
+    DFBResult res;
+    DFBResult &result = (resultPtr ? *resultPtr : res);
+    IDirectFBSurface *subSurface = 0;
+    if (rect.isNull()) {
+        result = surface->GetSubSurface(surface, 0, &subSurface);
+    } else {
+        const DFBRectangle subRect = { rect.x(), rect.y(), rect.width(), rect.height() };
+        result = surface->GetSubSurface(surface, &subRect, &subSurface);
+    }
+    if (result != DFB_OK) {
+        DirectFBError("Can't get sub surface", result);
+    } else if (options & TrackSurface) {
+        d_ptr->allocatedSurfaces.insert(subSurface);
+    }
+    return subSurface;
+}
+#endif
+
+
 void QDirectFBScreen::releaseDFBSurface(IDirectFBSurface *surface)
 {
     Q_ASSERT(QDirectFBScreen::instance());
@@ -999,9 +1028,9 @@ static void printDirectFBInfo(IDirectFB *fb, IDirectFBSurface *primarySurface)
            dev.name, dev.vendor, dev.driver.name, dev.driver.major,
            dev.driver.minor, dev.driver.vendor, DFB_PIXELFORMAT_INDEX(pixelFormat),
            QDirectFBScreen::getImageFormat(primarySurface), dev.acceleration_mask,
-           ::flagDescriptions(dev.acceleration_mask, accelerationDescriptions).constData(),
-           dev.blitting_flags, ::flagDescriptions(dev.blitting_flags, blitDescriptions).constData(),
-           dev.drawing_flags, ::flagDescriptions(dev.drawing_flags, drawDescriptions).constData(),
+           flagDescriptions(dev.acceleration_mask, accelerationDescriptions).constData(),
+           dev.blitting_flags, flagDescriptions(dev.blitting_flags, blitDescriptions).constData(),
+           dev.drawing_flags, flagDescriptions(dev.drawing_flags, drawDescriptions).constData(),
            (dev.video_memory >> 10));
 }
 #endif
@@ -1067,7 +1096,7 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
 
 #ifdef QT_DIRECTFB_IMAGECACHE
     int imageCacheSize = 4 * 1024 * 1024; // 4 MB
-    ::setIntOption(displayArgs, QLatin1String("imagecachesize"), &imageCacheSize);
+    setIntOption(displayArgs, QLatin1String("imagecachesize"), &imageCacheSize);
     QDirectFBPaintEngine::initImageCache(imageCacheSize);
 #endif
 
@@ -1168,6 +1197,33 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
     lstep = 0;
     size = 0;
 
+    if (result != DFB_OK) {
+        DirectFBError("QDirectFBScreen::connect: "
+                      "Unable to get screen!", result);
+        return false;
+    }
+    const QString qws_size = qgetenv("QWS_SIZE");
+    if (!qws_size.isEmpty()) {
+        QRegExp rx(QLatin1String("(\\d+)x(\\d+)"));
+        if (!rx.exactMatch(qws_size)) {
+            qWarning("QDirectFBScreen::connect: Can't parse QWS_SIZE=\"%s\"", qPrintable(qws_size));
+        } else {
+            int *ints[2] = { &w, &h };
+            for (int i=0; i<2; ++i) {
+                *ints[i] = rx.cap(i + 1).toInt();
+                if (*ints[i] <= 0) {
+                    qWarning("QDirectFBScreen::connect: %s is not a positive integer",
+                             qPrintable(rx.cap(i + 1)));
+                    w = h = 0;
+                    break;
+                }
+            }
+        }
+    }
+
+    setIntOption(displayArgs, QLatin1String("width"), &w);
+    setIntOption(displayArgs, QLatin1String("height"), &h);
+
 #ifndef QT_NO_DIRECTFB_LAYER
     result = d_ptr->dfb->GetDisplayLayer(d_ptr->dfb, DLID_PRIMARY,
                                          &d_ptr->dfbLayer);
@@ -1180,19 +1236,26 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
 #else
     result = d_ptr->dfb->GetScreen(d_ptr->dfb, 0, &d_ptr->dfbScreen);
 #endif
-    if (result != DFB_OK) {
-        DirectFBError("QDirectFBScreen::connect: "
-                      "Unable to get screen!", result);
-        return false;
-    }
-    result = d_ptr->dfbScreen->GetSize(d_ptr->dfbScreen, &w, &h);
-    if (result != DFB_OK) {
-        DirectFBError("QDirectFBScreen::connect: "
-                      "Unable to get screen size!", result);
+
+    if (w <= 0 || h <= 0) {
+#ifdef QT_NO_DIRECTFB_WM
+        result = d_ptr->primarySurface->GetSize(d_ptr->primarySurface, &w, &h);
+#elif (Q_DIRECTFB_VERSION >= 0x010000)
+        result = d_ptr->dfbScreen->GetSize(d_ptr->dfbScreen, &w, &h);
+#else
+        qWarning("QDirectFBScreen::connect: DirectFB versions prior to 1.0 do not offer a way\n"
+                 "query the size of the primary surface in windowed mode. You have to specify\n"
+                 "the size of the display using QWS_SIZE=[0-9]x[0-9] or\n"
+                 "QWS_DISPLAY=directfb:width=[0-9]:height=[0-9]");
         return false;
+#endif
+        if (result != DFB_OK) {
+            DirectFBError("QDirectFBScreen::connect: "
+                          "Unable to get screen size!", result);
+            return false;
+        }
     }
-    ::setIntOption(displayArgs, QLatin1String("width"), &w);
-    ::setIntOption(displayArgs, QLatin1String("height"), &h);
+
 
     dw = w;
     dh = h;
@@ -1200,8 +1263,8 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
     Q_ASSERT(dw != 0 && dh != 0);
 
     physWidth = physHeight = -1;
-    ::setIntOption(displayArgs, QLatin1String("mmWidth"), &physWidth);
-    ::setIntOption(displayArgs, QLatin1String("mmHeight"), &physHeight);
+    setIntOption(displayArgs, QLatin1String("mmWidth"), &physWidth);
+    setIntOption(displayArgs, QLatin1String("mmHeight"), &physHeight);
     const int dpi = 72;
     if (physWidth < 0)
         physWidth = qRound(dw * 25.4 / dpi);
@@ -1328,94 +1391,149 @@ QWSWindowSurface *QDirectFBScreen::createSurface(const QString &key) const
     return QScreen::createSurface(key);
 }
 
-// Normally, when using DirectFB to compose the windows (I.e. when
-// QT_NO_DIRECTFB_WM isn't set), exposeRegion will simply return. If
-// QT_NO_DIRECTFB_WM is set, exposeRegion will compose only non-directFB
-// window surfaces. Normal, directFB surfaces are handled by DirectFB.
-void QDirectFBScreen::exposeRegion(QRegion r, int changing)
+#if defined QT_NO_DIRECTFB_WM
+struct PaintCommand {
+    PaintCommand() : dfbSurface(0), windowOpacity(255), blittingFlags(DSBLIT_NOFX) {}
+    IDirectFBSurface *dfbSurface;
+    QImage image;
+    QPoint windowPosition;
+    QRegion source;
+    quint8 windowOpacity;
+    DFBSurfaceBlittingFlags blittingFlags;
+};
+
+static inline void initParameters(DFBRectangle &source, const QRect &sourceGlobal, const QPoint &pos)
+{
+    source.x = sourceGlobal.x() - pos.x();
+    source.y = sourceGlobal.y() - pos.y();
+    source.w = sourceGlobal.width();
+    source.h = sourceGlobal.height();
+}
+#endif
+
+void QDirectFBScreen::exposeRegion(QRegion r, int)
 {
+    Q_UNUSED(r);
 #if defined QT_NO_DIRECTFB_WM
-    const QList<QWSWindow*> windows = QWSServer::instance()->clientWindows();
-    if (changing < 0 || changing >= windows.size()) {
-        return;
-    }
 
-    QWSWindow *win = windows.at(changing);
-    QWSWindowSurface *s = win->windowSurface();
     r &= region();
     if (r.isEmpty()) {
         return;
     }
+    r = r.boundingRect();
 
-    const QRect brect = r.boundingRect();
+    IDirectFBSurface *primary = d_ptr->primarySurface;
+    const QList<QWSWindow*> windows = QWSServer::instance()->clientWindows();
+    QVarLengthArray<PaintCommand, 4> commands(windows.size());
+    QRegion region = r;
+    int idx = 0;
+    for (int i=0; i<windows.size(); ++i) {
+        QWSWindowSurface *surface = windows.at(i)->windowSurface();
+        if (!surface)
+            continue;
+
+        const QRect windowGeometry = surface->geometry();
+        const QRegion intersection = region & windowGeometry;
+        if (intersection.isEmpty()) {
+            continue;
+        }
 
-    if (!s) {
-        solidFill(d_ptr->backgroundColor, r);
-    } else {
-        const QRect windowGeometry = s->geometry();
-        const QRegion outsideWindow = r.subtracted(windowGeometry);
-        if (!outsideWindow.isEmpty()) {
-            solidFill(d_ptr->backgroundColor, outsideWindow);
+        PaintCommand &cmd = commands[idx];
+
+        if (surface->key() == QLatin1String("directfb")) {
+            const QDirectFBWindowSurface *ws = static_cast<QDirectFBWindowSurface*>(surface);
+            cmd.dfbSurface = ws->directFBSurface();
+
+            if (!cmd.dfbSurface) {
+                continue;
+            }
+        } else {
+            cmd.image = surface->image();
+            if (cmd.image.isNull()) {
+                continue;
+            }
         }
-        const QRegion insideWindow = r.intersected(windowGeometry);
-        if (!insideWindow.isEmpty()) {
-            QDirectFBWindowSurface *dfbWindowSurface = (s->key() == QLatin1String("directfb"))
-                                                       ? static_cast<QDirectFBWindowSurface*>(s) : 0;
-            if (dfbWindowSurface) {
-                IDirectFBSurface *surface = dfbWindowSurface->directFBSurface();
-                Q_ASSERT(surface);
-                const int n = insideWindow.numRects();
-                if (n == 1 || d_ptr->directFBFlags & BoundingRectFlip) {
-                    const QRect source = (insideWindow.boundingRect().intersected(windowGeometry)).translated(-windowGeometry.topLeft());
-                    const DFBRectangle rect = {
-                        source.x(), source.y(), source.width(), source.height()
-                    };
-
-                    d_ptr->primarySurface->Blit(d_ptr->primarySurface, surface, &rect,
-                                                windowGeometry.x() + source.x(),
-                                                windowGeometry.y() + source.y());
-
-                } else {
-                    const QVector<QRect> rects = insideWindow.rects();
-                    QVarLengthArray<DFBRectangle, 16> dfbRectangles(n);
-                    QVarLengthArray<DFBPoint, 16> dfbPoints(n);
-
-                    for (int i=0; i<n; ++i) {
-                        const QRect source = (rects.at(i).intersected(windowGeometry)).translated(-windowGeometry.topLeft());
-                        DFBRectangle &rect = dfbRectangles[i];
-                        rect.x = source.x();
-                        rect.y = source.y();
-                        rect.w = source.width();
-                        rect.h = source.height();
-                        dfbPoints[i].x = (windowGeometry.x() + source.x());
-                        dfbPoints[i].y = (windowGeometry.y() + source.y());
-                    }
-                    d_ptr->primarySurface->BatchBlit(d_ptr->primarySurface, surface, dfbRectangles.constData(),
-                                                     dfbPoints.constData(), n);
-                }
+        ++idx;
+
+        cmd.windowPosition = windowGeometry.topLeft();
+        cmd.source = intersection;
+        if (windows.at(i)->isOpaque()) {
+            region -= intersection;
+            if (region.isEmpty())
+                break;
+        } else {
+            cmd.windowOpacity = windows.at(i)->opacity();
+            cmd.blittingFlags = cmd.windowOpacity == 255
+                                ? DSBLIT_BLEND_ALPHACHANNEL
+                                : (DSBLIT_BLEND_ALPHACHANNEL|DSBLIT_BLEND_COLORALPHA);
+        }
+    }
+    if (!region.isEmpty()) {
+        solidFill(d_ptr->backgroundColor, region);
+    }
+
+    while (idx > 0) {
+        const PaintCommand &cmd = commands[--idx];
+        Q_ASSERT(cmd.dfbSurface || !cmd.image.isNull());
+        IDirectFBSurface *surface;
+        if (cmd.dfbSurface) {
+            surface = cmd.dfbSurface;
+        } else {
+            Q_ASSERT(!cmd.image.isNull());
+            DFBResult result;
+            surface = createDFBSurface(cmd.image, cmd.image.format(), DontTrackSurface, &result);
+            Q_ASSERT((result != DFB_OK) == !surface);
+            if (result != DFB_OK) {
+                DirectFBError("QDirectFBScreen::exposeRegion: Can't create surface from image", result);
+                continue;
             }
         }
+
+        primary->SetBlittingFlags(primary, cmd.blittingFlags);
+        if (cmd.blittingFlags & DSBLIT_BLEND_COLORALPHA) {
+            primary->SetColor(primary, 0xff, 0xff, 0xff, cmd.windowOpacity);
+        }
+        const QRegion &region = cmd.source;
+        const int rectCount = region.numRects();
+        DFBRectangle source;
+        if (rectCount == 1) {
+            ::initParameters(source, region.boundingRect(), cmd.windowPosition);
+            primary->Blit(primary, surface, &source, cmd.windowPosition.x() + source.x, cmd.windowPosition.y() + source.y);
+        } else {
+            const QVector<QRect> rects = region.rects();
+            for (int i=0; i<rectCount; ++i) {
+                ::initParameters(source, rects.at(i), cmd.windowPosition);
+                primary->Blit(primary, surface, &source, cmd.windowPosition.x() + source.x, cmd.windowPosition.y() + source.y);
+            }
+        }
+        if (surface != cmd.dfbSurface) {
+            surface->Release(surface);
+        }
     }
 
-#ifdef QT_NO_DIRECTFB_CURSOR
+    primary->SetColor(primary, 0xff, 0xff, 0xff, 0xff);
+
+#if defined QT_NO_DIRECTFB_CURSOR and !defined QT_NO_QWS_CURSOR
     if (QScreenCursor *cursor = QScreenCursor::instance()) {
         const QRect cursorRectangle = cursor->boundingRect();
-        if (cursor->isVisible() && !cursor->isAccelerated() && cursorRectangle.intersects(brect)) {
+        if (cursor->isVisible() && !cursor->isAccelerated() && r.intersects(cursorRectangle)) {
             const QImage image = cursor->image();
-            IDirectFBSurface *surface = createDFBSurface(image, image.format(), QDirectFBScreen::DontTrackSurface);
-            d_ptr->primarySurface->SetBlittingFlags(d_ptr->primarySurface, DSBLIT_BLEND_ALPHACHANNEL);
-            d_ptr->primarySurface->Blit(d_ptr->primarySurface, surface, 0, cursorRectangle.x(), cursorRectangle.y());
-            surface->Release(surface);
-#if (Q_DIRECTFB_VERSION >= 0x010000)
-            d_ptr->primarySurface->ReleaseSource(d_ptr->primarySurface);
-#endif
+            if (image.cacheKey() != d_ptr->cursorImageKey) {
+                if (d_ptr->cursorSurface) {
+                    releaseDFBSurface(d_ptr->cursorSurface);
+                }
+                d_ptr->cursorSurface = createDFBSurface(image, image.format(), QDirectFBScreen::TrackSurface);
+                d_ptr->cursorImageKey = image.cacheKey();
+            }
+
+            Q_ASSERT(d_ptr->cursorSurface);
+            primary->SetBlittingFlags(primary, DSBLIT_BLEND_ALPHACHANNEL);
+            primary->Blit(primary, d_ptr->cursorSurface, 0, cursorRectangle.x(), cursorRectangle.y());
         }
     }
 #endif
-    flipSurface(d_ptr->primarySurface, d_ptr->flipFlags, r, QPoint());
-#else
-    Q_UNUSED(r);
-    Q_UNUSED(changing);
+    flipSurface(primary, d_ptr->flipFlags, r, QPoint());
+    primary->SetBlittingFlags(primary, DSBLIT_NOFX);
 #endif
 }
 
@@ -1432,7 +1550,7 @@ void QDirectFBScreen::solidFill(const QColor &color, const QRegion &region)
                                     color.red(), color.green(), color.blue(),
                                     color.alpha());
     const int n = region.numRects();
-    if (n > 1) {
+    if (n == 1) {
         const QRect r = region.boundingRect();
         d_ptr->primarySurface->FillRectangle(d_ptr->primarySurface, r.x(), r.y(), r.width(), r.height());
     } else {
@@ -1527,6 +1645,11 @@ void QDirectFBScreen::setDirectFBImageProvider(IDirectFBImageProvider *provider)
 }
 #endif
 
+void QDirectFBScreen::waitIdle()
+{
+    d_ptr->dfb->WaitIdle(d_ptr->dfb);
+}
+
 IDirectFBSurface * QDirectFBScreen::surfaceForWidget(const QWidget *widget, QRect *rect) const
 {
     Q_ASSERT(widget);
@@ -1540,6 +1663,7 @@ IDirectFBSurface * QDirectFBScreen::surfaceForWidget(const QWidget *widget, QRec
     return 0;
 }
 
+#ifdef QT_DIRECTFB_SUBSURFACE
 IDirectFBSurface *QDirectFBScreen::subSurfaceForWidget(const QWidget *widget, const QRect &area) const
 {
     Q_ASSERT(widget);
@@ -1550,7 +1674,7 @@ IDirectFBSurface *QDirectFBScreen::subSurfaceForWidget(const QWidget *widget, co
         if (!area.isNull())
             rect &= area.translated(widget->mapTo(widget->window(), QPoint(0, 0)));
         if (!rect.isNull()) {
-            const DFBRectangle subRect = {rect.x(), rect.y(), rect.width(), rect.height() };
+            const DFBRectangle subRect = { rect.x(), rect.y(), rect.width(), rect.height() };
             const DFBResult result = surface->GetSubSurface(surface, &subRect, &subSurface);
             if (result != DFB_OK) {
                 DirectFBError("QDirectFBScreen::subSurface(): Can't get sub surface", result);
@@ -1559,6 +1683,7 @@ IDirectFBSurface *QDirectFBScreen::subSurfaceForWidget(const QWidget *widget, co
     }
     return subSurface;
 }
+#endif
 
 QT_END_NAMESPACE
 
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
index e74adb1..0ce7a53 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
@@ -54,6 +54,9 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
 
+#if !defined QT_NO_DIRECTFB_SUBSURFACE && !defined QT_DIRECTFB_SUBSURFACE
+#define QT_DIRECTFB_SUBSURFACE
+#endif
 #if !defined QT_NO_DIRECTFB_LAYER && !defined QT_DIRECTFB_LAYER
 #define QT_DIRECTFB_LAYER
 #endif
@@ -166,8 +169,11 @@ public:
         return static_cast<QDirectFBScreen*>(inst);
     }
 
+    void waitIdle();
     IDirectFBSurface *surfaceForWidget(const QWidget *widget, QRect *rect) const;
+#ifdef QT_DIRECTFB_SUBSURFACE
     IDirectFBSurface *subSurfaceForWidget(const QWidget *widget, const QRect &area = QRect()) const;
+#endif
 
     IDirectFB *dfb();
 #ifdef QT_NO_DIRECTFB_WM
@@ -199,6 +205,12 @@ public:
     IDirectFBSurface *createDFBSurface(DFBSurfaceDescription desc,
                                        SurfaceCreationOptions options,
                                        DFBResult *result);
+#ifdef QT_DIRECTFB_SUBSURFACE
+    IDirectFBSurface *getSubSurface(IDirectFBSurface *surface,
+                                    const QRect &rect,
+                                    SurfaceCreationOptions options,
+                                    DFBResult *result);
+#endif
 
     void flipSurface(IDirectFBSurface *surface, DFBSurfaceFlipFlags flipFlags,
                      const QRegion &region, const QPoint &offset);
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index 73a6dd7..61cfec51 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -100,6 +100,13 @@ QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirect
 
 QDirectFBWindowSurface::~QDirectFBWindowSurface()
 {
+    releaseSurface();
+    // these are not tracked by QDirectFBScreen so we don't want QDirectFBPaintDevice to release it
+}
+
+bool QDirectFBWindowSurface::isValid() const
+{
+    return true;
 }
 
 #ifdef QT_DIRECTFB_WM
@@ -111,15 +118,8 @@ void QDirectFBWindowSurface::raise()
         sibling->raise();
     }
 }
-#endif
 
-bool QDirectFBWindowSurface::isValid() const
-{
-    return true;
-}
-
-#ifndef QT_NO_DIRECTFB_WM
-void QDirectFBWindowSurface::createWindow()
+void QDirectFBWindowSurface::createWindow(const QRect &rect)
 {
     IDirectFBDisplayLayer *layer = screen->dfbDisplayLayer();
     if (!layer)
@@ -127,8 +127,12 @@ void QDirectFBWindowSurface::createWindow()
 
     DFBWindowDescription description;
     description.caps = DWCAPS_NODECORATION|DWCAPS_DOUBLEBUFFER;
-    description.flags = DWDESC_CAPS|DWDESC_SURFACE_CAPS|DWDESC_PIXELFORMAT;
+    description.flags = DWDESC_CAPS|DWDESC_SURFACE_CAPS|DWDESC_PIXELFORMAT|DWDESC_HEIGHT|DWDESC_WIDTH|DWDESC_POSX|DWDESC_POSY;
 
+    description.posx = rect.x();
+    description.posy = rect.y();
+    description.width = rect.width();
+    description.height = rect.height();
     description.surface_caps = DSCAPS_NONE;
     if (screen->directFBFlags() & QDirectFBScreen::VideoOnly)
         description.surface_caps |= DSCAPS_VIDEOONLY;
@@ -148,10 +152,8 @@ void QDirectFBWindowSurface::createWindow()
     dfbWindow->GetSurface(dfbWindow, &dfbSurface);
     updateFormat();
 }
-#endif // QT_NO_DIRECTFB_WM
 
-#ifndef QT_NO_DIRECTFB_WM
-static DFBResult setGeometry(IDirectFBWindow *dfbWindow, const QRect &old, const QRect &rect)
+static DFBResult setWindowGeometry(IDirectFBWindow *dfbWindow, const QRect &old, const QRect &rect)
 {
     DFBResult result = DFB_OK;
     const bool isMove = old.isEmpty() || rect.topLeft() != old.topLeft();
@@ -178,15 +180,27 @@ static DFBResult setGeometry(IDirectFBWindow *dfbWindow, const QRect &old, const
 #endif
     return result;
 }
-#endif
+#endif // QT_NO_DIRECTFB_WM
 
 void QDirectFBWindowSurface::setGeometry(const QRect &rect)
 {
+    const QRect oldRect = geometry();
+    if (oldRect == rect)
+        return;
+
     IDirectFBSurface *oldSurface = dfbSurface;
-#ifdef QT_NO_DIRECTFB_WM
-    IDirectFBSurface *primarySurface = screen->primarySurface();
-    Q_ASSERT(primarySurface);
+    const bool sizeChanged = oldRect.size() != rect.size();
+    if (sizeChanged) {
+        delete engine;
+        engine = 0;
+        unlockSurface();
+#ifdef QT_DIRECTFB_SUBSURFACE
+        releaseSubSurface();
 #endif
+        releaseSurface();
+        Q_ASSERT(!dfbSurface);
+    }
+
     if (rect.isNull()) {
 #ifndef QT_NO_DIRECTFB_WM
         if (dfbWindow) {
@@ -194,26 +208,25 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect)
             dfbWindow = 0;
         }
 #endif
-        if (dfbSurface) {
-#ifdef QT_NO_DIRECTFB_WM
-            if (dfbSurface != primarySurface)
+        Q_ASSERT(!dfbSurface);
+#ifdef QT_DIRECTFB_SUBSURFACE
+        Q_ASSERT(!subSurface);
 #endif
-                dfbSurface->Release(dfbSurface);
-            dfbSurface = 0;
-        }
-    } else if (rect != geometry()) {
-        const QRect oldRect = geometry();
-        DFBResult result = DFB_OK;
-        // If we're in a resize, the surface shouldn't be locked
-        Q_ASSERT((lockedImage == 0) || (rect.size() == geometry().size()));
+    } else {
 #ifdef QT_DIRECTFB_WM
-        if (!dfbWindow)
-            createWindow();
-        ::setGeometry(dfbWindow, oldRect, rect);
+        if (!dfbWindow) {
+            createWindow(rect);
+        } else {
+            setWindowGeometry(dfbWindow, oldRect, rect);
+            Q_ASSERT(!sizeChanged || !dfbSurface);
+            if (sizeChanged)
+                dfbWindow->GetSurface(dfbWindow, &dfbSurface);
+        }
 #else
+        IDirectFBSurface *primarySurface = screen->primarySurface();
+        DFBResult result = DFB_OK;
         if (mode == Primary) {
-            if (dfbSurface && dfbSurface != primarySurface)
-                dfbSurface->Release(dfbSurface);
+            Q_ASSERT(primarySurface);
             if (rect == screen->region().boundingRect()) {
                 dfbSurface = primarySurface;
             } else {
@@ -221,28 +234,23 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect)
                                          rect.width(), rect.height() };
                 result = primarySurface->GetSubSurface(primarySurface, &r, &dfbSurface);
             }
-        } else {
-            if (!dfbSurface || oldRect.size() != rect.size()) {
-                if (dfbSurface)
-                    dfbSurface->Release(dfbSurface);
+        } else { // mode == Offscreen
+            if (!dfbSurface) {
                 dfbSurface = screen->createDFBSurface(rect.size(), screen->pixelFormat(), QDirectFBScreen::DontTrackSurface);
             }
-            const QRegion region = QRegion(oldRect.isEmpty() ? screen->region() : QRegion(oldRect)).subtracted(rect);
-            screen->erase(region);
-            screen->flipSurface(primarySurface, flipFlags, region, QPoint());
-        }
-#endif
-        if (size() != geometry().size()) {
-            delete engine;
-            engine = 0;
         }
-
         if (result != DFB_OK)
             DirectFBErrorFatal("QDirectFBWindowSurface::setGeometry()", result);
+#endif
     }
     if (oldSurface != dfbSurface)
         updateFormat();
+
     QWSWindowSurface::setGeometry(rect);
+#ifdef QT_NO_DIRECTFB_WM
+    if (oldRect.isEmpty())
+        screen->exposeRegion(screen->region(), 0);
+#endif
 }
 
 QByteArray QDirectFBWindowSurface::permanentState() const
@@ -271,12 +279,12 @@ bool QDirectFBWindowSurface::scroll(const QRegion &region, int dx, int dy)
         return false;
     dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
     if (region.numRects() == 1) {
-        ::scrollSurface(dfbSurface, region.boundingRect(), dx, dy);
+        scrollSurface(dfbSurface, region.boundingRect(), dx, dy);
     } else {
         const QVector<QRect> rects = region.rects();
         const int n = rects.size();
         for (int i=0; i<n; ++i) {
-            ::scrollSurface(dfbSurface, rects.at(i), dx, dy);
+            scrollSurface(dfbSurface, rects.at(i), dx, dy);
         }
     }
     return true;
@@ -343,63 +351,16 @@ void QDirectFBWindowSurface::flush(QWidget *, const QRegion &region,
 
     const QRect windowGeometry = QDirectFBWindowSurface::geometry();
 #ifdef QT_NO_DIRECTFB_WM
-    IDirectFBSurface *primarySurface = screen->primarySurface();
     if (mode == Offscreen) {
-        primarySurface->SetBlittingFlags(primarySurface, DSBLIT_NOFX);
-        const QRect windowRect(0, 0, windowGeometry.width(), windowGeometry.height());
-        const int n = region.numRects();
-        if (n == 1 || boundingRectFlip ) {
-            const QRect regionBoundingRect = region.boundingRect().translated(offset);
-            const QRect source = windowRect & regionBoundingRect;
-            const DFBRectangle rect = {
-                source.x(), source.y(), source.width(), source.height()
-            };
-            primarySurface->Blit(primarySurface, dfbSurface, &rect,
-                                 windowGeometry.x() + source.x(),
-                                 windowGeometry.y() + source.y());
-        } else {
-            const QVector<QRect> rects = region.rects();
-            QVarLengthArray<DFBRectangle, 16> dfbRectangles(n);
-            QVarLengthArray<DFBPoint, 16> dfbPoints(n);
-
-            for (int i=0; i<n; ++i) {
-                const QRect &r = rects.at(i).translated(offset);
-                const QRect source = windowRect & r;
-                DFBRectangle &rect = dfbRectangles[i];
-                rect.x = source.x();
-                rect.y = source.y();
-                rect.w = source.width();
-                rect.h = source.height();
-                dfbPoints[i].x = (windowGeometry.x() + source.x());
-                dfbPoints[i].y = (windowGeometry.y() + source.y());
-            }
-            primarySurface->BatchBlit(primarySurface, dfbSurface, dfbRectangles.constData(),
-                                      dfbPoints.constData(), n);
-        }
-    }
-
-#ifdef QT_NO_DIRECTFB_CURSOR
-    if (QScreenCursor *cursor = QScreenCursor::instance()) {
-        const QRect cursorRectangle = cursor->boundingRect();
-        if (cursor->isVisible() && !cursor->isAccelerated()
-            && region.intersects(cursorRectangle.translated(-(offset + windowGeometry.topLeft())))) {
-            const QImage image = cursor->image();
-
-            IDirectFBSurface *surface = screen->createDFBSurface(image, image.format(), QDirectFBScreen::DontTrackSurface);
-            primarySurface->SetBlittingFlags(primarySurface, DSBLIT_BLEND_ALPHACHANNEL);
-            primarySurface->Blit(primarySurface, surface, 0, cursorRectangle.x(), cursorRectangle.y());
-            surface->Release(surface);
-#if (Q_DIRECTFB_VERSION >= 0x010000)
-            primarySurface->ReleaseSource(primarySurface);
-#endif
-        }
+        QRegion r = region;
+        r.translate(offset + windowGeometry.topLeft());
+        screen->exposeRegion(r, 0);
+    } else {
+        screen->flipSurface(dfbSurface, flipFlags, region, offset);
     }
-#endif
-    if (mode == Offscreen) {
-        screen->flipSurface(primarySurface, flipFlags, region, offset + windowGeometry.topLeft());
-    } else
-#endif
+#else
     screen->flipSurface(dfbSurface, flipFlags, region, offset);
+#endif
 
 #ifdef QT_DIRECTFB_TIMING
     enum { Secs = 3 };
@@ -414,13 +375,16 @@ void QDirectFBWindowSurface::flush(QWidget *, const QRegion &region,
 
 void QDirectFBWindowSurface::beginPaint(const QRegion &)
 {
-    if (!engine)
+    if (!engine) {
         engine = new QDirectFBPaintEngine(this);
+    }
 }
 
 void QDirectFBWindowSurface::endPaint(const QRegion &)
 {
-    unlockDirectFB();
+#ifdef QT_NO_DIRECTFB_SUBSURFACE
+    unlockSurface();
+#endif
 }
 
 IDirectFBSurface *QDirectFBWindowSurface::directFBSurface() const
@@ -457,6 +421,24 @@ void QDirectFBWindowSurface::updateFormat()
     imageFormat = dfbSurface ? QDirectFBScreen::getImageFormat(dfbSurface) : QImage::Format_Invalid;
 }
 
+void QDirectFBWindowSurface::releaseSurface()
+{
+    if (dfbSurface) {
+#ifdef QT_NO_DIRECTFB_SUBSURFACE
+        if (lockFlgs)
+            unlockSurface();
+#endif
+#ifdef QT_NO_DIRECTFB_WM
+        Q_ASSERT(screen->primarySurface());
+        if (dfbSurface != screen->primarySurface())
+#endif
+
+            dfbSurface->Release(dfbSurface);
+        dfbSurface = 0;
+    }
+}
+
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_QWS_DIRECTFB
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
index ca76613..7ae9bfe 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
@@ -95,10 +95,11 @@ public:
     IDirectFBSurface *directFBSurface() const;
 private:
     void updateFormat();
+    void releaseSurface();
     QDirectFBWindowSurface *sibling;
 
 #ifdef QT_DIRECTFB_WM
-    void createWindow();
+    void createWindow(const QRect &rect);
     IDirectFBWindow *dfbWindow;
 #else
     enum Mode {
diff --git a/src/plugins/graphicssystems/graphicssystems.pro b/src/plugins/graphicssystems/graphicssystems.pro
index bfdec6a..14e3cfc 100644
--- a/src/plugins/graphicssystems/graphicssystems.pro
+++ b/src/plugins/graphicssystems/graphicssystems.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+SUBDIRS += trace
 contains(QT_CONFIG, opengl):SUBDIRS += opengl
 contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl):SUBDIRS += openvg
 
diff --git a/mkspecs/common/symbian/fixed_stdlib.h b/src/plugins/graphicssystems/trace/main.cpp
index 8b9c68e..908e3f4 100644
--- a/mkspecs/common/symbian/fixed_stdlib.h
+++ b/src/plugins/graphicssystems/trace/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the makespecs of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,26 +39,31 @@
 **
 ****************************************************************************/
 
-#ifndef FIXED_STDLIB_H
-#define FIXED_STDLIB_H
+#include <private/qgraphicssystemplugin_p.h>
+#include "qgraphicssystem_trace_p.h"
 
-// This hack fixes defect in Symbian stdlib.h. The original file
-// does not work correctly when intermixing C and C++ (STL). Remove the hack
-// when Open C / C++ team has fixed the defect.
+QT_BEGIN_NAMESPACE
 
-// If _WCHAR_T_DECLARED is defined, undef it and store information that we
-// need to revert the _WCHAR_T_DECLARED define after include
-#   ifdef _WCHAR_T_DECLARED
-#       define QT_REVERT_WCHAR_T_DECLARED
-#       undef _WCHAR_T_DECLARED
-#   endif //_WCHAR_T_DECLARED
+class QTraceGraphicsSystemPlugin : public QGraphicsSystemPlugin
+{
+public:
+    QStringList keys() const;
+    QGraphicsSystem *create(const QString&);
+};
 
-#include <stdlib.h>
+QStringList QTraceGraphicsSystemPlugin::keys() const
+{
+    return QStringList(QLatin1String("Trace"));
+}
 
-// Revert _WCHAR_T_DECLARED if necessary
-#   ifdef QT_REVERT_WCHAR_T_DECLARED
-#       define _WCHAR_T_DECLARED
-#       undef QT_REVERT_WCHAR_T_DECLARED
-#   endif //QT_REVERT_WCHAR_T_DECLARED
+QGraphicsSystem* QTraceGraphicsSystemPlugin::create(const QString& system)
+{
+    if (system.toLower() == QLatin1String("trace"))
+        return new QTraceGraphicsSystem;
 
-#endif
+    return 0;
+}
+
+Q_EXPORT_PLUGIN2(trace, QTraceGraphicsSystemPlugin)
+
+QT_END_NAMESPACE
diff --git a/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp b/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp
new file mode 100644
index 0000000..36a8df1
--- /dev/null
+++ b/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qgraphicssystem_trace_p.h"
+#include <private/qpixmap_raster_p.h>
+#include <private/qpaintbuffer_p.h>
+#include <private/qwindowsurface_raster_p.h>
+
+#include <QFile>
+#include <QPainter>
+#include <QtDebug>
+
+QT_BEGIN_NAMESPACE
+
+class QTraceWindowSurface : public QRasterWindowSurface
+{
+public:
+    QTraceWindowSurface(QWidget *widget);
+    ~QTraceWindowSurface();
+
+    QPaintDevice *paintDevice();
+    void endPaint(const QRegion &rgn);
+
+private:
+    QPaintBuffer *buffer;
+
+    QFile *outputFile;
+    QDataStream *out;
+
+    int frameId;
+};
+
+QTraceWindowSurface::QTraceWindowSurface(QWidget *widget)
+    : QRasterWindowSurface(widget)
+    , buffer(0)
+    , outputFile(0)
+    , out(0)
+    , frameId(0)
+{
+}
+
+QTraceWindowSurface::~QTraceWindowSurface()
+{
+    delete out;
+    delete outputFile;
+}
+
+QPaintDevice *QTraceWindowSurface::paintDevice()
+{
+    if (!buffer) {
+        buffer = new QPaintBuffer;
+        buffer->setBoundingRect(geometry());
+    }
+    return buffer;
+}
+
+void QTraceWindowSurface::endPaint(const QRegion &rgn)
+{
+    if (!out) {
+        outputFile = new QFile(QString(QLatin1String("qtgraphics-%0.trace")).arg((qulonglong)window()->winId()));
+        if (outputFile->open(QIODevice::WriteOnly))
+            out = new QDataStream(outputFile);
+    }
+
+    QPainter p(QRasterWindowSurface::paintDevice());
+    buffer->draw(&p);
+    p.end();
+
+    if (out) {
+        *out << frameId++;
+        *out << (qulonglong)window()->winId();
+        *out << geometry();
+        *out << rgn;
+        *out << *buffer;
+    }
+
+    delete buffer;
+    buffer = 0;
+}
+
+QTraceGraphicsSystem::QTraceGraphicsSystem()
+{
+}
+
+QPixmapData *QTraceGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const
+{
+    return new QRasterPixmapData(type);
+}
+
+QWindowSurface *QTraceGraphicsSystem::createWindowSurface(QWidget *widget) const
+{
+    return new QTraceWindowSurface(widget);
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h b/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h
new file mode 100644
index 0000000..5deafc9
--- /dev/null
+++ b/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGRAPHICSSYSTEM_TRACE_P_H
+#define QGRAPHICSSYSTEM_TRACE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/private/qgraphicssystem_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QTraceGraphicsSystem : public QGraphicsSystem
+{
+public:
+    QTraceGraphicsSystem();
+
+    QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
+    QWindowSurface *createWindowSurface(QWidget *widget) const;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/plugins/graphicssystems/trace/trace.pro b/src/plugins/graphicssystems/trace/trace.pro
new file mode 100644
index 0000000..d548a6c
--- /dev/null
+++ b/src/plugins/graphicssystems/trace/trace.pro
@@ -0,0 +1,12 @@
+TARGET = qtracegraphicssystem
+include(../../qpluginbase.pri)
+
+QT += network
+
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems
+
+SOURCES = main.cpp qgraphicssystem_trace.cpp
+
+target.path += $$[QT_INSTALL_PLUGINS]/graphicssystems
+INSTALLS += target
+INCLUDEPATH += ../../../3rdparty/harfbuzz/src
diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index 10563c1..a3abc98 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.5.3
+   VERSION=4.6.0
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp
index bac8f3a..2b17b27 100644
--- a/src/s60main/qts60main.cpp
+++ b/src/s60main/qts60main.cpp
@@ -40,17 +40,10 @@
 ****************************************************************************/
 
 // INCLUDE FILES
-#include <exception>
-#include <eikstart.h>
-#include "qts60mainapplication_p.h"
+#include <e32base.h>
+#include <qglobal.h>
 
-/**
- * factory function to create the QtS60Main application class
- */
-LOCAL_C CApaApplication* NewApplication()
-{
-    return new CQtS60MainApplication;
-}
+GLDEF_C TInt QtMainWrapper();
 
 /**
  * A normal Symbian OS executable provides an E32Main() function which is
@@ -58,5 +51,10 @@ LOCAL_C CApaApplication* NewApplication()
  */
 GLDEF_C TInt E32Main()
 {
-    return EikStart::RunApplication(NewApplication);
+    CTrapCleanup *cleanupStack = q_check_ptr(CTrapCleanup::New());
+    TInt err = 0;
+    TRAP(err, QtMainWrapper());
+    delete cleanupStack;
+
+    return err;
 }
diff --git a/src/s60main/qts60main_mcrt0.cpp b/src/s60main/qts60main_mcrt0.cpp
index ea6132f..1040652 100644
--- a/src/s60main/qts60main_mcrt0.cpp
+++ b/src/s60main/qts60main_mcrt0.cpp
@@ -49,8 +49,12 @@
 
 #include <e32std.h>
 #include <e32base.h>
+#include <exception>
 #include "estlib.h"
 
+// Needed for QT_TRYCATCH_LEAVING.
+#include <qglobal.h>
+
 #ifdef __ARMCC__
 __asm int CallMain(int argc, char *argv[], char *envp[])
 {
diff --git a/src/s60main/qts60mainappui_p.h b/src/s60main/qts60mainappui_p.h
deleted file mode 100644
index 7f8d730..0000000
--- a/src/s60main/qts60mainappui_p.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Symbian application wrapper of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __QtS60MainAPPUI_H__
-#define __QtS60MainAPPUI_H__
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-// INCLUDES
-#include <aknappui.h>
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-/**
-* CQtS60MainAppUi application UI class.
-* Interacts with the user through the UI and request message processing
-* from the handler class
-*/
-class CQtS60MainAppUi : public CAknAppUi
-    {
-    public: // Constructors and destructor
-
-        /**
-        * ConstructL.
-        * 2nd phase constructor.
-        */
-        void ConstructL();
-
-        /**
-        * CQtS60MainAppUi.
-        * C++ default constructor. This needs to be public due to
-        * the way the framework constructs the AppUi
-        */
-        CQtS60MainAppUi();
-
-        /**
-        * ~CQtS60MainAppUi.
-        * Virtual Destructor.
-        */
-        virtual ~CQtS60MainAppUi();
-
-    protected:
-        void RestoreMenuL(CCoeControl* aMenuWindow,TInt aMenuId,TMenuType aMenuType);
-        void DynInitMenuBarL(TInt aResourceId, CEikMenuBar *aMenuBar);
-        void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane *aMenuPane);
-
-    private:  // Functions from base classes
-
-        /**
-        * From CEikAppUi, HandleCommandL.
-        * Takes care of command handling.
-        * @param aCommand Command to be handled.
-        */
-        void HandleCommandL( TInt aCommand );
-
-        /**
-        * From CAknAppUi, HandleResourceChangeL
-        * Handles resource change events such as layout switches in global level.
-        * @param aType event type.
-        */
-        void HandleResourceChangeL(TInt aType);
-
-        /**
-        *  HandleStatusPaneSizeChange.
-        *  Called by the framework when the application status pane
-		*  size is changed.
-        */
-		void HandleStatusPaneSizeChange();
-
-        /**
-        *  Static callback method for invoking Qt main.
-        *  Called asynchronously from ConstructL() - passes call to non static method.
-        */
-        static TInt OpenCMainStaticCallBack(  TAny* aObject );
-
-        /**
-        *  Callback method for invoking Qt main.
-        *  Called from static OpenCMainStaticCallBack.
-        */
-        void OpenCMainCallBack();
-
-    protected:
-        void HandleWsEventL(const TWsEvent& aEvent, CCoeControl* aDestination);
-
-
-    private: // Data
-
-        /**
-        * Async callback object to call Qt main
-        * Owned by CQtS60MainAppUi
-        */
-        CAsyncCallBack* iAsyncCallBack;
-
-    };
-
-#endif // __QtS60MainAPPUI_H__
-
-// End of File
diff --git a/src/s60main/qts60maindocument_p.h b/src/s60main/qts60maindocument_p.h
deleted file mode 100644
index 35d6d85..0000000
--- a/src/s60main/qts60maindocument_p.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Symbian application wrapper of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __QTS60MAINDOCUMENT_H__
-#define __QTS60MAINDOCUMENT_H__
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-// INCLUDES
-#include <akndoc.h>
-
-// FORWARD DECLARATIONS
-class CQtS60MainAppUi;
-class CEikApplication;
-
-
-// CLASS DECLARATION
-
-/**
-* CQtS60MainDocument application class.
-* An instance of class CQtS60MainDocument is the Document part of the
-* AVKON application framework for the QtS60Main application.
-*/
-class CQtS60MainDocument : public CAknDocument
-    {
-    public: // Constructors and destructor
-
-        /**
-        * NewL.
-        * Two-phased constructor.
-        * Construct a CQtS60MainDocument for the AVKON application aApp
-        * using two phase construction, and return a pointer
-        * to the created object.
-        * @param aApp Application creating this document.
-        * @return A pointer to the created instance of CQtS60MainDocument.
-        */
-        static CQtS60MainDocument* NewL( CEikApplication& aApp );
-
-        /**
-        * NewLC.
-        * Two-phased constructor.
-        * Construct a CQtS60MainDocument for the AVKON application aApp
-        * using two phase construction, and return a pointer
-        * to the created object.
-        * @param aApp Application creating this document.
-        * @return A pointer to the created instance of CQtS60MainDocument.
-        */
-        static CQtS60MainDocument* NewLC( CEikApplication& aApp );
-
-        /**
-        * ~CQtS60MainDocument
-        * Virtual Destructor.
-        */
-        virtual ~CQtS60MainDocument();
-
-    public: // Functions from base classes
-
-        /**
-        * CreateAppUiL
-        * From CEikDocument, CreateAppUiL.
-        * Create a CQtS60MainAppUi object and return a pointer to it.
-        * The object returned is owned by the Uikon framework.
-        * @return Pointer to created instance of AppUi.
-        */
-        CEikAppUi* CreateAppUiL();
-
-    private: // Constructors
-
-        /**
-        * ConstructL
-        * 2nd phase constructor.
-        */
-        void ConstructL();
-
-        /**
-        * CQtS60MainDocument.
-        * C++ default constructor.
-        * @param aApp Application creating this document.
-        */
-        CQtS60MainDocument( CEikApplication& aApp );
-
-    };
-
-#endif // __QTS60MAINDOCUMENT_H__
-
-// End of File
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
index a4833af..cc3c547 100644
--- a/src/s60main/s60main.pro
+++ b/src/s60main/s60main.pro
@@ -14,13 +14,7 @@ symbian {
     CONFIG	-=  jpeg
     INCLUDEPATH	+=  tmp $$QMAKE_INCDIR_QT/QtCore $$MW_LAYER_SYSTEMINCLUDE
     SOURCES	 =  qts60main.cpp \
-                    qts60mainapplication.cpp \
-                    qts60mainappui.cpp \
-                    qts60maindocument.cpp
-
-    HEADERS      =  qts60mainapplication_p.h \
-                    qts60mainappui_p.h \
-                    qts60maindocument_p.h
+                    qts60main_mcrt0.cpp
 
     # This block serves the minimalistic resource file for S60 3.1 platforms.
     # Note there is no way to ifdef S60 version in mmp file, that is why the resource
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index d467250..d85ecd2 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -791,7 +791,8 @@ static QScriptValue __setupPackage__(QScriptContext *ctx, QScriptEngine *eng)
 } // namespace QScript
 
 QScriptEnginePrivate::QScriptEnginePrivate()
-    : registeredScriptValues(0), freeScriptValues(0), inEval(false)
+    : registeredScriptValues(0), freeScriptValues(0),
+      registeredScriptStrings(0), inEval(false)
 {
     qMetaTypeId<QScriptValue>();
 
@@ -839,6 +840,7 @@ QScriptEnginePrivate::~QScriptEnginePrivate()
     while (!ownedAgents.isEmpty())
         delete ownedAgents.takeFirst();
     detachAllRegisteredScriptValues();
+    detachAllRegisteredScriptStrings();
     qDeleteAll(m_qobjectData);
     qDeleteAll(m_typeInfos);
     JSC::JSLock lock(false);
@@ -1352,6 +1354,19 @@ void QScriptEnginePrivate::detachAllRegisteredScriptValues()
     registeredScriptValues = 0;
 }
 
+void QScriptEnginePrivate::detachAllRegisteredScriptStrings()
+{
+    QScriptStringPrivate *it;
+    QScriptStringPrivate *next;
+    for (it = registeredScriptStrings; it != 0; it = next) {
+        it->detachFromEngine();
+        next = it->next;
+        it->prev = 0;
+        it->next = 0;
+    }
+    registeredScriptStrings = 0;
+}
+
 #ifdef QT_NO_QOBJECT
 
 QScriptEngine::QScriptEngine()
@@ -3236,11 +3251,10 @@ QStringList QScriptEngine::importedExtensions() const
     The \c Container type must provide a \c const_iterator class to enable the
     contents of the container to be copied into the array.
 
-    Additionally, the type of each element in the sequence should be suitable
-    for conversion to a QScriptValue.
-    See \l{QtScript Module#Conversion Between QtScript and C++ Types}
-    {Conversion Between QtScript and C++ Types} for more information about the
-    restrictions on types that can be used with QScriptValue.
+    Additionally, the type of each element in the sequence should be
+    suitable for conversion to a QScriptValue.  See
+    \l{Conversion Between QtScript and C++ Types} for more information
+    about the restrictions on types that can be used with QScriptValue.
 
     \sa qScriptValueFromValue()
 */
@@ -3257,11 +3271,11 @@ QStringList QScriptEngine::importedExtensions() const
     as long as it provides a \c length property describing how many elements
     it contains.
 
-    Additionally, the type of each element in the sequence must be suitable
-    for conversion to a C++ type from a QScriptValue.
-    See \l{QtScript Module#Conversion Between QtScript and C++ Types}
-    {Conversion Between QtScript and C++ Types} for more information about the
-    restrictions on types that can be used with QScriptValue.
+    Additionally, the type of each element in the sequence must be
+    suitable for conversion to a C++ type from a QScriptValue.  See
+    \l{Conversion Between QtScript and C++ Types} for more information
+    about the restrictions on types that can be used with
+    QScriptValue.
 
     \sa qscriptvalue_cast()
 */
@@ -3622,9 +3636,11 @@ QScriptEngineAgent *QScriptEngine::agent() const
 QScriptString QScriptEngine::toStringHandle(const QString &str)
 {
     Q_D(QScriptEngine);
-    QScriptString ss;
-    QScriptStringPrivate::init(ss, this, JSC::Identifier(d->currentFrame, str));
-    return ss;
+    QScriptString result;
+    QScriptStringPrivate *p = new QScriptStringPrivate(d, JSC::Identifier(d->currentFrame, str), QScriptStringPrivate::HeapAllocated);
+    QScriptStringPrivate::init(result, p);
+    d->registerScriptString(p);
+    return result;
 }
 
 /*!
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index f06f717..826c2da 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -58,6 +58,7 @@
 #include <QtCore/qhash.h>
 #include <QtCore/qset.h>
 #include "qscriptvalue_p.h"
+#include "qscriptstring_p.h"
 
 #include "RefPtr.h"
 #include "Structure.h"
@@ -217,6 +218,10 @@ public:
     inline void unregisterScriptValue(QScriptValuePrivate *value);
     void detachAllRegisteredScriptValues();
 
+    inline void registerScriptString(QScriptStringPrivate *value);
+    inline void unregisterScriptString(QScriptStringPrivate *value);
+    void detachAllRegisteredScriptStrings();
+
     // private slots
     void _q_objectDestroyed(QObject *);
 #endif
@@ -241,6 +246,7 @@ public:
     int agentLineNumber;
     QScriptValuePrivate *registeredScriptValues;
     QScriptValuePrivate *freeScriptValues;
+    QScriptStringPrivate *registeredScriptStrings;
     QHash<int, QScriptTypeInfo*> m_typeInfos;
     int processEventsInterval;
     QScriptValue abortResult;
@@ -362,6 +368,29 @@ inline QScriptValue QScriptValuePrivate::property(const QString &name, int resol
     return property(JSC::Identifier(exec, name), resolveMode);
 }
 
+inline void QScriptEnginePrivate::registerScriptString(QScriptStringPrivate *value)
+{
+    Q_ASSERT(value->type == QScriptStringPrivate::HeapAllocated);
+    value->prev = 0;
+    value->next = registeredScriptStrings;
+    if (registeredScriptStrings)
+        registeredScriptStrings->prev = value;
+    registeredScriptStrings = value;
+}
+
+inline void QScriptEnginePrivate::unregisterScriptString(QScriptStringPrivate *value)
+{
+    Q_ASSERT(value->type == QScriptStringPrivate::HeapAllocated);
+    if (value->prev)
+        value->prev->next = value->next;
+    if (value->next)
+        value->next->prev = value->prev;
+    if (value == registeredScriptStrings)
+        registeredScriptStrings = value->next;
+    value->prev = 0;
+    value->next = 0;
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp
index 58a7c2b..94b69b9 100644
--- a/src/script/api/qscriptstring.cpp
+++ b/src/script/api/qscriptstring.cpp
@@ -39,10 +39,11 @@
 **
 ****************************************************************************/
 
-#include "config.h"
+#include "config.h" // compile on Windows
 #include "qscriptstring.h"
-
 #include "qscriptstring_p.h"
+#include "qscriptengine.h"
+#include "qscriptengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -70,32 +71,6 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-  \internal
-*/
-QScriptStringPrivate::QScriptStringPrivate(QScriptEngine *e, const JSC::Identifier &id)
-    : engine(e), identifier(id)
-{
-    ref = 0;
-}
-
-/*!
-  \internal
-*/
-QScriptStringPrivate::~QScriptStringPrivate()
-{
-}
-
-/*!
-  \internal
-*/
-void QScriptStringPrivate::init(QScriptString &q, QScriptEngine *engine,
-                                const JSC::Identifier &value)
-{
-    Q_ASSERT(!q.isValid());
-    q.d_ptr = new QScriptStringPrivate(engine, value);
-}
-
-/*!
   Constructs an invalid QScriptString.
 */
 QScriptString::QScriptString()
@@ -109,6 +84,13 @@ QScriptString::QScriptString()
 QScriptString::QScriptString(const QScriptString &other)
     : d_ptr(other.d_ptr)
 {
+    if (d_func() && (d_func()->type == QScriptStringPrivate::StackAllocated)) {
+        Q_ASSERT(d_func()->ref != 1);
+        d_ptr.detach();
+        d_func()->ref = 1;
+        d_func()->type = QScriptStringPrivate::HeapAllocated;
+        d_func()->engine->registerScriptString(d_func());
+    }
 }
 
 /*!
@@ -116,6 +98,19 @@ QScriptString::QScriptString(const QScriptString &other)
 */
 QScriptString::~QScriptString()
 {
+    Q_D(QScriptString);
+    if (d) {
+        switch (d->type) {
+        case QScriptStringPrivate::StackAllocated:
+            Q_ASSERT(d->ref == 1);
+            d->ref.ref(); // avoid deletion
+            break;
+        case QScriptStringPrivate::HeapAllocated:
+            if (d->engine && (d->ref == 1))
+                d->engine->unregisterScriptString(d);
+            break;
+        }
+    }
 }
 
 /*!
@@ -123,7 +118,18 @@ QScriptString::~QScriptString()
 */
 QScriptString &QScriptString::operator=(const QScriptString &other)
 {
+    if (d_func() && d_func()->engine && (d_func()->ref == 1) && (d_func()->type == QScriptStringPrivate::HeapAllocated)) {
+        // current d_ptr will be deleted at the assignment below, so unregister it first
+        d_func()->engine->unregisterScriptString(d_func());
+    }
     d_ptr = other.d_ptr;
+    if (d_func() && (d_func()->type == QScriptStringPrivate::StackAllocated)) {
+        Q_ASSERT(d_func()->ref != 1);
+        d_ptr.detach();
+        d_func()->ref = 1;
+        d_func()->type = QScriptStringPrivate::HeapAllocated;
+        d_func()->engine->registerScriptString(d_func());
+    }
     return *this;
 }
 
@@ -147,7 +153,7 @@ bool QScriptString::operator==(const QScriptString &other) const
     if (d == other.d_func())
         return true;
     if (!d || !other.d_func())
-        return false;
+        return d == other.d_func();
     if (d->engine != other.d_func()->engine)
         return false;
     if (!d->engine)
diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h
index 30e6856..2808916 100644
--- a/src/script/api/qscriptstring.h
+++ b/src/script/api/qscriptstring.h
@@ -52,10 +52,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Script)
 
-class QScriptEngine;
 class QScriptStringPrivate;
-struct QScriptStringPrivatePointerDeleter;
-
 class Q_SCRIPT_EXPORT QScriptString
 {
 public:
diff --git a/src/script/api/qscriptstring_p.h b/src/script/api/qscriptstring_p.h
index 8f76648..05fed77 100644
--- a/src/script/api/qscriptstring_p.h
+++ b/src/script/api/qscriptstring_p.h
@@ -55,34 +55,58 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#include <QtCore/qstring.h>
-#include <QtCore/qpointer.h>
-#include "qscriptengine.h"
-
 #include "Identifier.h"
 
-
 QT_BEGIN_NAMESPACE
 
-class QScriptString;
-class QScriptEngine;
+class QScriptEnginePrivate;
 class QScriptStringPrivate
 {
 public:
-    QScriptStringPrivate(QScriptEngine *engine, const JSC::Identifier &id);
-    ~QScriptStringPrivate();
+    enum AllocationType {
+        StackAllocated,
+        HeapAllocated
+    };
 
-    static void init(QScriptString &q, QScriptEngine *engine, const JSC::Identifier &id);
+    inline QScriptStringPrivate(QScriptEnginePrivate *engine, const JSC::Identifier &id,
+                                AllocationType type);
+    inline ~QScriptStringPrivate();
+    static inline void init(QScriptString &q, QScriptStringPrivate *d);
+
+    inline void detachFromEngine();
 
     QBasicAtomicInt ref;
-#ifndef QT_NO_QOBJECT
-    QPointer<QScriptEngine> engine;
-#else
-    void *engine;
-#endif
+    QScriptEnginePrivate *engine;
     JSC::Identifier identifier;
+    AllocationType type;
+
+    // linked list of engine's script values
+    QScriptStringPrivate *prev;
+    QScriptStringPrivate *next;
 };
 
+inline QScriptStringPrivate::QScriptStringPrivate(QScriptEnginePrivate *e, const JSC::Identifier &id,
+                                                  AllocationType tp)
+    : engine(e), identifier(id), type(tp), prev(0), next(0)
+{
+    ref = 0;
+}
+
+inline QScriptStringPrivate::~QScriptStringPrivate()
+{
+}
+
+inline void QScriptStringPrivate::init(QScriptString &q, QScriptStringPrivate *d)
+{
+    q.d_ptr = d;
+}
+
+inline void QScriptStringPrivate::detachFromEngine()
+{
+    engine = 0;
+    identifier = JSC::Identifier();
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/script/bridge/qscriptclassobject.cpp b/src/script/bridge/qscriptclassobject.cpp
index c8633ab..5dea491 100644
--- a/src/script/bridge/qscriptclassobject.cpp
+++ b/src/script/bridge/qscriptclassobject.cpp
@@ -97,8 +97,9 @@ bool ClassObjectDelegate::getOwnPropertySlot(QScriptObject* object,
 
     QScriptEnginePrivate *engine = scriptEngineFromExec(exec);
     QScriptValue scriptObject = engine->scriptValueFromJSCValue(object);
-    QString name(propertyName.ustring());
-    QScriptString scriptName = QScriptEnginePrivate::get(engine)->toStringHandle(name);
+    QScriptString scriptName;
+    QScriptStringPrivate scriptName_d(engine, propertyName, QScriptStringPrivate::StackAllocated);
+    QScriptStringPrivate::init(scriptName, &scriptName_d);
     uint id = 0;
     QScriptClass::QueryFlags flags = m_scriptClass->queryProperty(
         scriptObject, scriptName, QScriptClass::HandlesReadAccess, &id);
@@ -116,8 +117,9 @@ void ClassObjectDelegate::put(QScriptObject* object, JSC::ExecState *exec,
 {
     QScriptEnginePrivate *engine = scriptEngineFromExec(exec);
     QScriptValue scriptObject = engine->scriptValueFromJSCValue(object);
-    QString name(propertyName.ustring());
-    QScriptString scriptName = QScriptEnginePrivate::get(engine)->toStringHandle(name);
+    QScriptString scriptName;
+    QScriptStringPrivate scriptName_d(engine, propertyName, QScriptStringPrivate::StackAllocated);
+    QScriptStringPrivate::init(scriptName, &scriptName_d);
     uint id = 0;
     QScriptClass::QueryFlags flags = m_scriptClass->queryProperty(
         scriptObject, scriptName, QScriptClass::HandlesWriteAccess, &id);
@@ -135,8 +137,9 @@ bool ClassObjectDelegate::deleteProperty(QScriptObject* object, JSC::ExecState *
     // ### avoid duplication of put()
     QScriptEnginePrivate *engine = scriptEngineFromExec(exec);
     QScriptValue scriptObject = engine->scriptValueFromJSCValue(object);
-    QString name(propertyName.ustring());
-    QScriptString scriptName = QScriptEnginePrivate::get(engine)->toStringHandle(name);
+    QScriptString scriptName;
+    QScriptStringPrivate scriptName_d(engine, propertyName, QScriptStringPrivate::StackAllocated);
+    QScriptStringPrivate::init(scriptName, &scriptName_d);
     uint id = 0;
     QScriptClass::QueryFlags flags = m_scriptClass->queryProperty(
         scriptObject, scriptName, QScriptClass::HandlesWriteAccess, &id);
@@ -155,8 +158,9 @@ bool ClassObjectDelegate::getPropertyAttributes(const QScriptObject* object, JSC
 {
     QScriptEnginePrivate *engine = scriptEngineFromExec(exec);
     QScriptValue scriptObject = engine->scriptValueFromJSCValue(object);
-    QString name(propertyName.ustring());
-    QScriptString scriptName = QScriptEnginePrivate::get(engine)->toStringHandle(name);
+    QScriptString scriptName;
+    QScriptStringPrivate scriptName_d(engine, propertyName, QScriptStringPrivate::StackAllocated);
+    QScriptStringPrivate::init(scriptName, &scriptName_d);
     uint id = 0;
     QScriptClass::QueryFlags flags = m_scriptClass->queryProperty(
         scriptObject, scriptName, QScriptClass::HandlesReadAccess, &id);
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index 0592a89..ecfb060 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -610,7 +610,7 @@ static JSC::JSValue callQtMethod(JSC::ExecState *exec, QMetaMethod::MethodType c
             if (i < (int)scriptArgs.size())
                 actual = engine->scriptValueFromJSCValue(scriptArgs.at(i));
             else
-                actual = QScriptValue::QScriptValue(QScriptValue::UndefinedValue);
+                actual = QScriptValue(QScriptValue::UndefinedValue);
             QScriptMetaType argType = mtd.argumentType(i);
             int tid = -1;
             QVariant v;
@@ -1869,6 +1869,7 @@ JSC::JSValue QMetaObjectWrapperObject::execute(JSC::ExecState *exec,
         QScriptContext *ctx = eng_p->contextForFrame(exec);
         JSC::CallData callData;
         JSC::CallType callType = data->ctor.getCallData(callData);
+        Q_UNUSED(callType);
         Q_ASSERT_X(callType == JSC::CallTypeHost, Q_FUNC_INFO, "script constructors not supported");
         if (data->ctor.isObject(&FunctionWithArgWrapper::info)) {
             FunctionWithArgWrapper *wrapper = static_cast<FunctionWithArgWrapper*>(JSC::asObject(data->ctor));
diff --git a/src/script/parser/qscript.g b/src/script/parser/qscript.g
index bcf27da..c5902f6 100644
--- a/src/script/parser/qscript.g
+++ b/src/script/parser/qscript.g
@@ -37,9 +37,6 @@
 --
 -- $QT_END_LICENSE$
 --
--- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
---
 ----------------------------------------------------------------------------
 
 %parser         QScriptGrammar
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index fa79460..097ecbf 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -1310,23 +1310,42 @@ QSqlResult *QMYSQLDriver::createResult() const
 QStringList QMYSQLDriver::tables(QSql::TableType type) const
 {
     QStringList tl;
-    if (!isOpen())
-        return tl;
-    if (!(type & QSql::Tables))
-        return tl;
-
-    MYSQL_RES* tableRes = mysql_list_tables(d->mysql, NULL);
-    MYSQL_ROW row;
-    int i = 0;
-    while (tableRes) {
-        mysql_data_seek(tableRes, i);
-        row = mysql_fetch_row(tableRes);
-        if (!row)
-            break;
-        tl.append(toUnicode(d->tc, row[0]));
-        i++;
+#if MYSQL_VERSION_ID >= 40100
+    if( mysql_get_server_version(d->mysql) < 50000)
+    {
+#endif
+        if (!isOpen())
+            return tl;
+        if (!(type & QSql::Tables))
+            return tl;
+
+        MYSQL_RES* tableRes = mysql_list_tables(d->mysql, NULL);
+        MYSQL_ROW row;
+        int i = 0;
+        while (tableRes) {
+            mysql_data_seek(tableRes, i);
+            row = mysql_fetch_row(tableRes);
+            if (!row)
+                break;
+            tl.append(toUnicode(d->tc, row[0]));
+            i++;
+        }
+        mysql_free_result(tableRes);
+#if MYSQL_VERSION_ID >= 40100
+    } else {
+        QSqlQuery q(createResult());
+        if(type & QSql::Tables) {
+            q.exec(QLatin1String("select table_name from information_schema.tables where table_type = 'BASE TABLE'"));
+            while(q.next())
+                tl.append(q.value(0).toString());
+        }
+        if(type & QSql::Views) {
+            q.exec(QLatin1String("select table_name from information_schema.tables where table_type = 'VIEW'"));
+            while(q.next())
+                tl.append(q.value(0).toString());
+        }
     }
-    mysql_free_result(tableRes);
+#endif
     return tl;
 }
 
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp
index 7dd2ea9..6437841 100644
--- a/src/sql/drivers/oci/qsql_oci.cpp
+++ b/src/sql/drivers/oci/qsql_oci.cpp
@@ -2220,6 +2220,22 @@ QStringList QOCIDriver::tables(QSql::TableType type) const
             else
                 tl.append(t.value(1).toString());
         }
+
+        // list all table synonyms as well
+        t.exec(QLatin1String("select owner, synonym_name from all_synonyms "
+                "where owner != 'MDSYS' "
+                "and owner != 'LBACSYS' "
+                "and owner != 'SYS' "
+                "and owner != 'SYSTEM' "
+                "and owner != 'WKSYS'"
+                "and owner != 'CTXSYS'"
+                "and owner != 'WMSYS'"));
+        while (t.next()) {
+            if (t.value(0).toString() != d->user)
+                tl.append(t.value(0).toString() + QLatin1String(".") + t.value(1).toString());
+            else
+                tl.append(t.value(1).toString());
+        }
     }
     if (type & QSql::Views) {
         t.exec(QLatin1String("select owner, view_name from all_views "
@@ -2269,8 +2285,8 @@ QSqlRecord QOCIDriver::record(const QString& tablename) const
     // eg. a sub-query on the sys.synonyms table
     QString stmt(QLatin1String("select column_name, data_type, data_length, "
                   "data_precision, data_scale, nullable, data_default%1"
-                  "from all_tab_columns "
-                  "where table_name=%2"));
+                  "from all_tab_columns a "
+                  "where a.table_name=%2"));
     if (d->serverVersion >= 9)
         stmt = stmt.arg(QLatin1String(", char_length "));
     else
@@ -2294,12 +2310,15 @@ QSqlRecord QOCIDriver::record(const QString& tablename) const
     else
         owner = owner.toUpper();
 
-    tmpStmt += QLatin1String(" and owner='") + owner + QLatin1Char('\'');
+    tmpStmt += QLatin1String(" and a.owner='") + owner + QLatin1Char('\'');
     t.setForwardOnly(true);
     t.exec(tmpStmt);
     if (!t.next()) { // try and see if the tablename is a synonym
-        stmt= stmt.arg(QLatin1String("(select tname from sys.synonyms where sname='")
-                        + table + QLatin1String("' and creator=owner)"));
+        stmt = stmt + QLatin1String(" join all_synonyms b "
+                              "on a.owner=b.table_owner and a.table_name=b.table_name "
+                              "where b.owner='") + owner +
+                      QLatin1String("' and b.synonym_name='") + table +
+                      QLatin1Char('\'');
         t.setForwardOnly(true);
         t.exec(stmt);
         if (t.next())
diff --git a/src/src.pro b/src/src.pro
index 1801d55..780e56e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -120,7 +120,7 @@ src_webkit.target = sub-webkit
    src_tools_activeqt.depends = src_tools_idc src_gui
    src_plugins.depends = src_gui src_sql src_svg
    contains(QT_CONFIG, webkit)  {
-      src_webkit.depends = src_gui src_sql src_network src_xml
+      src_webkit.depends = src_gui src_sql src_network src_xml src_phonon
       #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore
    }
    contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index e8065da..d51095c 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -58,6 +58,7 @@ class QGraphicsSvgItemPrivate;
 class Q_SVG_EXPORT QGraphicsSvgItem : public QObject, public QGraphicsItem
 {
     Q_OBJECT
+    Q_INTERFACES(QGraphicsItem)
 
 public:
     QGraphicsSvgItem(QGraphicsItem *parentItem=0);
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 371b845..e2c3d92 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -76,6 +76,77 @@ static const char *qt_inherit_text = "inherit";
 
 double qstrtod(const char *s00, char const **se, bool *ok);
 
+// ======== duplicated from qcolor_p
+
+static inline int qsvg_h2i(char hex)
+{
+    if (hex >= '0' && hex <= '9')
+        return hex - '0';
+    if (hex >= 'a' && hex <= 'f')
+        return hex - 'a' + 10;
+    if (hex >= 'A' && hex <= 'F')
+        return hex - 'A' + 10;
+    return -1;
+}
+
+static inline int qsvg_hex2int(const char *s)
+{
+    return (qsvg_h2i(s[0]) << 4) | qsvg_h2i(s[1]);
+}
+
+static inline int qsvg_hex2int(char s)
+{
+    int h = qsvg_h2i(s);
+    return (h << 4) | h;
+}
+
+bool qsvg_get_hex_rgb(const char *name, QRgb *rgb)
+{
+    if(name[0] != '#')
+        return false;
+    name++;
+    int len = qstrlen(name);
+    int r, g, b;
+    if (len == 12) {
+        r = qsvg_hex2int(name);
+        g = qsvg_hex2int(name + 4);
+        b = qsvg_hex2int(name + 8);
+    } else if (len == 9) {
+        r = qsvg_hex2int(name);
+        g = qsvg_hex2int(name + 3);
+        b = qsvg_hex2int(name + 6);
+    } else if (len == 6) {
+        r = qsvg_hex2int(name);
+        g = qsvg_hex2int(name + 2);
+        b = qsvg_hex2int(name + 4);
+    } else if (len == 3) {
+        r = qsvg_hex2int(name[0]);
+        g = qsvg_hex2int(name[1]);
+        b = qsvg_hex2int(name[2]);
+    } else {
+        r = g = b = -1;
+    }
+    if ((uint)r > 255 || (uint)g > 255 || (uint)b > 255) {
+        *rgb = 0;
+        return false;
+    }
+    *rgb = qRgb(r, g ,b);
+    return true;
+}
+
+bool qsvg_get_hex_rgb(const QChar *str, int len, QRgb *rgb)
+{
+    if (len > 13)
+        return false;
+    char tmp[16];
+    for(int i = 0; i < len; ++i)
+        tmp[i] = str[i].toLatin1();
+    tmp[len] = 0;
+    return qsvg_get_hex_rgb(tmp, rgb);
+}
+
+// ======== end of qcolor_p duplicate
+
 static bool parsePathDataFast(const QStringRef &data, QPainterPath &path);
 
 static inline QString someId(const QXmlStreamAttributes &attributes)
@@ -126,7 +197,6 @@ struct QSvgAttributes
 
 QSvgAttributes::QSvgAttributes(const QXmlStreamAttributes &xmlAttributes, QSvgHandler *handler)
 {
-    id = someId(xmlAttributes);
     QStringRef style = xmlAttributes.value(QLatin1String("style"));
     if (!style.isEmpty()) {
         handler->parseCSStoXMLAttrs(style.toString(), &m_cssAttributes);
@@ -267,6 +337,11 @@ QSvgAttributes::QSvgAttributes(const QXmlStreamAttributes &xmlAttributes, QSvgHa
                 fontVariant = value;
             break;
 
+        case 'i':
+            if (name == QLatin1String("id"))
+                id = value.toString();
+            break;
+
         case 'o':
             if (name == QLatin1String("opacity"))
                 opacity = value;
@@ -314,6 +389,11 @@ QSvgAttributes::QSvgAttributes(const QXmlStreamAttributes &xmlAttributes, QSvgHa
                 visibility = value;
             break;
 
+        case 'x':
+            if (name == QLatin1String("xml:id") && id.isEmpty())
+                id = value.toString();
+            break;
+
         default:
             break;
         }
@@ -321,9 +401,6 @@ QSvgAttributes::QSvgAttributes(const QXmlStreamAttributes &xmlAttributes, QSvgHa
 
 }
 
-static inline QString someId(const QSvgAttributes &attributes)
-{ return attributes.id; }
-
 static const char * QSvgStyleSelector_nodeString[] = {
     "svg",
     "g",
@@ -685,42 +762,95 @@ static QString idFromUrl(const QString &url)
     return id;
 }
 
+static inline QStringRef trimRef(const QStringRef &str)
+{
+    if (str.isEmpty())
+        return QStringRef();
+    const QChar *s = str.string()->constData() + str.position();
+    int end = str.length() - 1;
+    if (!s[0].isSpace() && !s[end].isSpace())
+        return str;
+
+    int start = 0;
+    while (start<=end && s[start].isSpace())  // skip white space from start
+        start++;
+    if (start <= end) {                          // only white space
+        while (s[end].isSpace())           // skip white space from end
+            end--;
+    }
+    int l = end - start + 1;
+    if (l <= 0)
+        return QStringRef();
+    return QStringRef(str.string(), str.position() + start, l);
+}
+
 /**
  * returns true when successfuly set the color. false signifies
  * that the color should be inherited
  */
-static bool resolveColor(const QString &colorStr, QColor &color, QSvgHandler *handler)
-{
-    QString colorStrTr = colorStr.trimmed();
-    if (colorStr.startsWith(QLatin1String("rgb("))) {
-        const QChar *s = colorStr.constData() + 4;
-        QVector<qreal> compo = parseNumbersList(s);
-        //1 means that it failed after reaching non-parsable
-        //character which is going to be "%"
-        if (compo.size() == 1) {
-            const QChar *s = colorStr.constData() + 4;
-            compo = parsePercentageList(s);
-            compo[0] *= (qreal)2.55;
-            compo[1] *= (qreal)2.55;
-            compo[2] *= (qreal)2.55;
-        }
-
-        color = QColor(int(compo[0]),
-                       int(compo[1]),
-                       int(compo[2]));
-        return true;
-    } else if (colorStr == QT_INHERIT)  {
+static bool resolveColor(const QStringRef &colorStr, QColor &color, QSvgHandler *handler)
+{
+    QStringRef colorStrTr = trimRef(colorStr);
+    if (colorStrTr.isEmpty())
         return false;
-    } else if (colorStr == QLatin1String("currentColor")) {
-        color = handler->currentColor();
-        return true;
+
+    switch(colorStrTr.at(0).unicode()) {
+
+        case '#':
+            {
+                // #rrggbb is very very common, so let's tackle it here
+                // rather than falling back to QColor
+                QRgb rgb;
+                bool ok = qsvg_get_hex_rgb(colorStrTr.unicode(), colorStrTr.length(), &rgb);
+                if (ok)
+                    color.setRgb(rgb);
+                return ok;
+            }
+            break;
+
+        case 'r':
+            {
+                // starts with "rgb("
+                if (colorStrTr == QLatin1String("rgb(")) {
+                    const QChar *s = colorStrTr.constData() + 4;
+                    QVector<qreal> compo = parseNumbersList(s);
+                    //1 means that it failed after reaching non-parsable
+                    //character which is going to be "%"
+                    if (compo.size() == 1) {
+                        const QChar *s = colorStrTr.constData() + 4;
+                        compo = parsePercentageList(s);
+                        compo[0] *= (qreal)2.55;
+                        compo[1] *= (qreal)2.55;
+                        compo[2] *= (qreal)2.55;
+                    }
+
+                    color = QColor(int(compo[0]),
+                                   int(compo[1]),
+                                   int(compo[2]));
+                    return true;
+                }
+            }
+            break;
+
+        case 'c':
+            if (colorStrTr == QLatin1String("currentColor")) {
+                color = handler->currentColor();
+                return true;
+            }
+            break;
+        case 'i':
+            if (colorStrTr == QT_INHERIT)
+                return false;
+            break;
+        default:
+            break;
     }
 
-    color = QColor(colorStrTr);
+    color = QColor(colorStrTr.toString());
     return color.isValid();
 }
 
-static bool constructColor(const QString &colorStr, const QString &opacity,
+static bool constructColor(const QStringRef &colorStr, const QStringRef &opacity,
                            QColor &color, QSvgHandler *handler)
 {
     if (!resolveColor(colorStr, color, handler))
@@ -833,10 +963,8 @@ static void parseColor(QSvgNode *,
                        const QSvgAttributes &attributes,
                        QSvgHandler *handler)
 {
-    QString colorStr = attributes.color.toString();
-    QString opacity  = attributes.colorOpacity.toString();
     QColor color;
-    if (constructColor(colorStr, opacity, color, handler)) {
+    if (constructColor(attributes.color, attributes.colorOpacity, color, handler)) {
         handler->pushColor(color);
     }
 }
@@ -891,24 +1019,28 @@ static void parseBrush(QSvgNode *node,
                 }
             } else if (attributes.fill != QLatin1String("none")) {
                 QColor color;
-                if (resolveColor(attributes.fill.toString(), color, handler))
+                if (resolveColor(attributes.fill, color, handler))
                     prop->setBrush(QBrush(color));
             } else {
                 prop->setBrush(QBrush(Qt::NoBrush));
             }
         }
-        node->appendStyleProperty(prop, someId(attributes));
+        node->appendStyleProperty(prop, attributes.id);
     }
 }
 
 
 
-static QMatrix parseTransformationMatrix(const QString &value)
+static QMatrix parseTransformationMatrix(const QStringRef &value)
 {
+    if (value.isEmpty())
+        return QMatrix();
+
     QMatrix matrix;
     const QChar *str = value.constData();
+    const QChar *end = str + value.length();
 
-    while (*str != QLatin1Char(0)) {
+    while (str < end) {
         if (str->isSpace() || *str == QLatin1Char(',')) {
             ++str;
             continue;
@@ -973,7 +1105,7 @@ static QMatrix parseTransformationMatrix(const QString &value)
         }
 
 
-        while (str->isSpace())
+        while (str < end && str->isSpace())
             ++str;
         if (*str != QLatin1Char('('))
             goto error;
@@ -1060,7 +1192,7 @@ static void parsePen(QSvgNode *node,
                     }
             } else if (attributes.stroke != QLatin1String("none")) {
                 QColor color;
-                if (resolveColor(attributes.stroke.toString(), color, handler))
+                if (resolveColor(attributes.stroke, color, handler))
                     prop->setStroke(QBrush(color));
             } else {
                 prop->setStroke(QBrush(Qt::NoBrush));
@@ -1129,7 +1261,7 @@ static void parsePen(QSvgNode *node,
         if (!attributes.strokeOpacity.isEmpty() && attributes.strokeOpacity != QT_INHERIT)
             prop->setOpacity(qMin(qreal(1.0), qMax(qreal(0.0), toDouble(attributes.strokeOpacity))));
 
-        node->appendStyleProperty(prop, someId(attributes));
+        node->appendStyleProperty(prop, attributes.id);
     }
 }
 
@@ -1203,7 +1335,7 @@ static void parseFont(QSvgNode *node,
            fontStyle->setTextAnchor(Qt::AlignRight);
     }
 
-    node->appendStyleProperty(fontStyle, someId(attributes));
+    node->appendStyleProperty(fontStyle, attributes.id);
 }
 
 static void parseTransform(QSvgNode *node,
@@ -1212,13 +1344,10 @@ static void parseTransform(QSvgNode *node,
 {
     if (attributes.transform.isEmpty())
         return;
-    QString value = attributes.transform.toString().trimmed();
-    if (value.isEmpty())
-        return;
-    QMatrix matrix = parseTransformationMatrix(value);
+    QMatrix matrix = parseTransformationMatrix(trimRef(attributes.transform));
 
     if (!matrix.isIdentity()) {
-        node->appendStyleProperty(new QSvgTransformStyle(QTransform(matrix)), someId(attributes));
+        node->appendStyleProperty(new QSvgTransformStyle(QTransform(matrix)), attributes.id);
     }
 
 }
@@ -1391,24 +1520,29 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
         QChar pathElem = *str;
         ++str;
         QChar endc = *end;
-        *const_cast<QChar *>(end) = 0; // parseNumbersList requires 0-termination that QStringRef cannot guarantee
-        QVector<qreal> arg = parseNumbersList(str);
+        *const_cast<QChar *>(end) = 0; // parseNumbersArray requires 0-termination that QStringRef cannot guarantee
+        QVarLengthArray<qreal, 8> arg;
+        parseNumbersArray(str, arg);
         *const_cast<QChar *>(end) = endc;
         if (pathElem == QLatin1Char('z') || pathElem == QLatin1Char('Z'))
             arg.append(0);//dummy
-        while (!arg.isEmpty()) {
+        const qreal *num = arg.constData();
+        int count = arg.count();
+        while (count > 0) {
             qreal offsetX = x;        // correction offsets
             qreal offsetY = y;        // for relative commands
             switch (pathElem.unicode()) {
             case 'm': {
-                if (arg.count() < 2) {
-                    arg.pop_front();
+                if (count < 2) {
+                    num++;
+                    count--;
                     break;
                 }
-                x = x0 = arg[0] + offsetX;
-                y = y0 = arg[1] + offsetY;
+                x = x0 = num[0] + offsetX;
+                y = y0 = num[1] + offsetY;
+                num += 2;
+                count -= 2;
                 path.moveTo(x0, y0);
-                arg.pop_front(); arg.pop_front();
 
                  // As per 1.2  spec 8.3.2 The "moveto" commands
                  // If a 'moveto' is followed by multiple pairs of coordinates without explicit commands,
@@ -1417,15 +1551,16 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
             }
                 break;
             case 'M': {
-                if (arg.count() < 2) {
-                    arg.pop_front();
+                if (count < 2) {
+                    num++;
+                    count--;
                     break;
                 }
-                x = x0 = arg[0];
-                y = y0 = arg[1];
-
+                x = x0 = num[0];
+                y = y0 = num[1];
+                num += 2;
+                count -= 2;
                 path.moveTo(x0, y0);
-                arg.pop_front(); arg.pop_front();
 
                 // As per 1.2  spec 8.3.2 The "moveto" commands
                 // If a 'moveto' is followed by multiple pairs of coordinates without explicit commands,
@@ -1437,96 +1572,104 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
             case 'Z': {
                 x = x0;
                 y = y0;
+                count--; // skip dummy
+                num++;
                 path.closeSubpath();
-                arg.pop_front();//pop dummy
             }
                 break;
             case 'l': {
-                if (arg.count() < 2) {
-                    arg.pop_front();
+                if (count < 2) {
+                    num++;
+                    count--;
                     break;
                 }
-                x = arg.front() + offsetX;
-                arg.pop_front();
-                y = arg.front() + offsetY;
-                arg.pop_front();
+                x = x0 = num[0] + offsetX;
+                y = y0 = num[1] + offsetY;
+                num += 2;
+                count -= 2;
                 path.lineTo(x, y);
 
             }
                 break;
             case 'L': {
-                if (arg.count() < 2) {
-                    arg.pop_front();
+                if (count < 2) {
+                    num++;
+                    count--;
                     break;
                 }
-                x = arg.front(); arg.pop_front();
-                y = arg.front(); arg.pop_front();
+                x = x0 = num[0];
+                y = y0 = num[1];
+                num += 2;
+                count -= 2;
                 path.lineTo(x, y);
             }
                 break;
             case 'h': {
-                x = arg.front() + offsetX; arg.pop_front();
+                x = num[0] + offsetX;
+                num++;
+                count--;
                 path.lineTo(x, y);
             }
                 break;
             case 'H': {
-                x = arg[0];
+                x = num[0];
+                num++;
+                count--;
                 path.lineTo(x, y);
-                arg.pop_front();
             }
                 break;
             case 'v': {
-                y = arg[0] + offsetY;
+                y = num[0] + offsetY;
+                num++;
+                count--;
                 path.lineTo(x, y);
-                arg.pop_front();
             }
                 break;
             case 'V': {
-                y = arg[0];
+                y = num[0];
+                num++;
+                count--;
                 path.lineTo(x, y);
-                arg.pop_front();
             }
                 break;
             case 'c': {
-                if (arg.count() < 6) {
-                    while (arg.count())
-                        arg.pop_front();
+                if (count < 6) {
+                    num += count;
+                    count = 0;
                     break;
                 }
-                QPointF c1(arg[0]+offsetX, arg[1]+offsetY);
-                QPointF c2(arg[2]+offsetX, arg[3]+offsetY);
-                QPointF e(arg[4]+offsetX, arg[5]+offsetY);
+                QPointF c1(num[0] + offsetX, num[1] + offsetY);
+                QPointF c2(num[2] + offsetX, num[3] + offsetY);
+                QPointF e(num[4] + offsetX, num[5] + offsetY);
+                num += 6;
+                count -= 6;
                 path.cubicTo(c1, c2, e);
                 ctrlPt = c2;
                 x = e.x();
                 y = e.y();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
                 break;
             }
             case 'C': {
-                if (arg.count() < 6) {
-                    while (arg.count())
-                        arg.pop_front();
+                if (count < 6) {
+                    num += count;
+                    count = 0;
                     break;
                 }
-                QPointF c1(arg[0], arg[1]);
-                QPointF c2(arg[2], arg[3]);
-                QPointF e(arg[4], arg[5]);
+                QPointF c1(num[0], num[1]);
+                QPointF c2(num[2], num[3]);
+                QPointF e(num[4], num[5]);
+                num += 6;
+                count -= 6;
                 path.cubicTo(c1, c2, e);
                 ctrlPt = c2;
                 x = e.x();
                 y = e.y();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
                 break;
             }
             case 's': {
-                if (arg.count() < 4) {
-                    while (arg.count())
-                        arg.pop_front();
+                if (count < 4) {
+                    num += count;
+                    count = 0;
                     break;
                 }
                 QPointF c1;
@@ -1535,20 +1678,20 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
                     c1 = QPointF(2*x-ctrlPt.x(), 2*y-ctrlPt.y());
                 else
                     c1 = QPointF(x, y);
-                QPointF c2(arg[0]+offsetX, arg[1]+offsetY);
-                QPointF e(arg[2]+offsetX, arg[3]+offsetY);
+                QPointF c2(num[0] + offsetX, num[1] + offsetY);
+                QPointF e(num[2] + offsetX, num[3] + offsetY);
+                num += 4;
+                count -= 4;
                 path.cubicTo(c1, c2, e);
                 ctrlPt = c2;
                 x = e.x();
                 y = e.y();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
                 break;
             }
             case 'S': {
-                if (arg.count() < 4) {
-                    while (arg.count())
-                        arg.pop_front();
+                if (count < 4) {
+                    num += count;
+                    count = 0;
                     break;
                 }
                 QPointF c1;
@@ -1557,55 +1700,57 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
                     c1 = QPointF(2*x-ctrlPt.x(), 2*y-ctrlPt.y());
                 else
                     c1 = QPointF(x, y);
-                QPointF c2(arg[0], arg[1]);
-                QPointF e(arg[2], arg[3]);
+                QPointF c2(num[0], num[1]);
+                QPointF e(num[2], num[3]);
+                num += 4;
+                count -= 4;
                 path.cubicTo(c1, c2, e);
                 ctrlPt = c2;
                 x = e.x();
                 y = e.y();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
                 break;
             }
             case 'q': {
-                if (arg.count() < 4) {
-                    while (arg.count())
-                        arg.pop_front();
+                if (count < 4) {
+                    num += count;
+                    count = 0;
                     break;
                 }
-                QPointF c(arg[0]+offsetX, arg[1]+offsetY);
-                QPointF e(arg[2]+offsetX, arg[3]+offsetY);
+                QPointF c(num[0] + offsetX, num[1] + offsetY);
+                QPointF e(num[2] + offsetX, num[3] + offsetY);
+                num += 4;
+                count -= 4;
                 path.quadTo(c, e);
                 ctrlPt = c;
                 x = e.x();
                 y = e.y();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
                 break;
             }
             case 'Q': {
-                if (arg.count() < 4) {
-                    while (arg.count())
-                        arg.pop_front();
+                if (count < 4) {
+                    num += count;
+                    count = 0;
                     break;
                 }
-                QPointF c(arg[0], arg[1]);
-                QPointF e(arg[2], arg[3]);
+                QPointF c(num[0], num[1]);
+                QPointF e(num[2], num[3]);
+                num += 4;
+                count -= 4;
                 path.quadTo(c, e);
                 ctrlPt = c;
                 x = e.x();
                 y = e.y();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
                 break;
             }
             case 't': {
-                if (arg.count() < 2) {
-                    while (arg.count())
-                        arg.pop_front();
+                if (count < 2) {
+                    num += count;
+                    count = 0;
                     break;
                 }
-                QPointF e(arg[0]+offsetX, arg[1]+offsetY);
+                QPointF e(num[0] + offsetX, num[1] + offsetY);
+                num += 2;
+                count -= 2;
                 QPointF c;
                 if (lastMode == 'q' || lastMode == 'Q' ||
                     lastMode == 't' || lastMode == 'T')
@@ -1616,16 +1761,17 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
                 ctrlPt = c;
                 x = e.x();
                 y = e.y();
-                arg.pop_front(); arg.pop_front();
                 break;
             }
             case 'T': {
-                if (arg.count() < 2) {
-                    while (arg.count())
-                        arg.pop_front();
+                if (count < 2) {
+                    num += count;
+                    count = 0;
                     break;
                 }
-                QPointF e(arg[0], arg[1]);
+                QPointF e(num[0], num[1]);
+                num += 2;
+                count -= 2;
                 QPointF c;
                 if (lastMode == 'q' || lastMode == 'Q' ||
                     lastMode == 't' || lastMode == 'T')
@@ -1636,22 +1782,22 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
                 ctrlPt = c;
                 x = e.x();
                 y = e.y();
-                arg.pop_front(); arg.pop_front();
                 break;
             }
             case 'a': {
-                if (arg.count() < 7) {
-                    while (arg.count())
-                        arg.pop_front();
+                if (count < 7) {
+                    num += count;
+                    count = 0;
                     break;
                 }
-                qreal rx = arg[0];
-                qreal ry = arg[1];
-                qreal xAxisRotation = arg[2];
-                qreal largeArcFlag  = arg[3];
-                qreal sweepFlag = arg[4];
-                qreal ex = arg[5] + offsetX;
-                qreal ey = arg[6] + offsetY;
+                qreal rx = (*num++);
+                qreal ry = (*num++);
+                qreal xAxisRotation = (*num++);
+                qreal largeArcFlag  = (*num++);
+                qreal sweepFlag = (*num++);
+                qreal ex = (*num++) + offsetX;
+                qreal ey = (*num++) + offsetY;
+                count -= 7;
                 qreal curx = x;
                 qreal cury = y;
                 pathArc(path, rx, ry, xAxisRotation, int(largeArcFlag),
@@ -1659,36 +1805,29 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
 
                 x = ex;
                 y = ey;
-
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front();
             }
                 break;
             case 'A': {
-                if (arg.count() < 7) {
-                    while (arg.count())
-                        arg.pop_front();
+                if (count < 7) {
+                    num += count;
+                    count = 0;
                     break;
                 }
-                qreal rx = arg[0];
-                qreal ry = arg[1];
-                qreal xAxisRotation = arg[2];
-                qreal largeArcFlag  = arg[3];
-                qreal sweepFlag = arg[4];
-                qreal ex = arg[5];
-                qreal ey = arg[6];
+                qreal rx = (*num++);
+                qreal ry = (*num++);
+                qreal xAxisRotation = (*num++);
+                qreal largeArcFlag  = (*num++);
+                qreal sweepFlag = (*num++);
+                qreal ex = (*num++);
+                qreal ey = (*num++);
+                count -= 7;
                 qreal curx = x;
                 qreal cury = y;
                 pathArc(path, rx, ry, xAxisRotation, int(largeArcFlag),
                         int(sweepFlag), ex, ey, curx, cury);
+
                 x = ex;
                 y = ey;
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front(); arg.pop_front();
-                arg.pop_front();
             }
                 break;
             default:
@@ -1911,7 +2050,7 @@ static void parseOpacity(QSvgNode *node,
 
     if (ok) {
         QSvgOpacityStyle *opacity = new QSvgOpacityStyle(qBound(qreal(0.0), op, qreal(1.0)));
-        node->appendStyleProperty(opacity, someId(attributes));
+        node->appendStyleProperty(opacity, attributes.id);
     }
 }
 
@@ -1983,7 +2122,7 @@ static void parseCompOp(QSvgNode *node,
 
     if (!value.isEmpty()) {
         QSvgCompOpStyle *compop = new QSvgCompOpStyle(svgToQtCompositionMode(value));
-        node->appendStyleProperty(compop, someId(attributes));
+        node->appendStyleProperty(compop, attributes.id);
     }
 }
 
@@ -2113,8 +2252,8 @@ static bool parseAnimateColorNode(QSvgNode *parent,
                                   QSvgHandler *handler)
 {
     QString typeStr    = attributes.value(QLatin1String("type")).toString();
-    QString fromStr    = attributes.value(QLatin1String("from")).toString();
-    QString toStr      = attributes.value(QLatin1String("to")).toString();
+    QStringRef fromStr    = attributes.value(QLatin1String("from"));
+    QStringRef toStr      = attributes.value(QLatin1String("to"));
     QString valuesStr  = attributes.value(QLatin1String("values")).toString();
     QString beginStr   = attributes.value(QLatin1String("begin")).toString();
     QString durStr     = attributes.value(QLatin1String("dur")).toString();
@@ -2125,8 +2264,8 @@ static bool parseAnimateColorNode(QSvgNode *parent,
     QList<QColor> colors;
     if (valuesStr.isEmpty()) {
         QColor startColor, endColor;
-        constructColor(fromStr, QString(), startColor, handler);
-        constructColor(toStr, QString(), endColor, handler);
+        resolveColor(fromStr, startColor, handler);
+        resolveColor(toStr, endColor, handler);
         colors.append(startColor);
         colors.append(endColor);
     } else {
@@ -2134,7 +2273,8 @@ static bool parseAnimateColorNode(QSvgNode *parent,
         QStringList::const_iterator itr;
         for (itr = str.constBegin(); itr != str.constEnd(); ++itr) {
             QColor color;
-            constructColor(*itr, QString(), color, handler);
+            QString str = *itr;
+            resolveColor(QStringRef(&str), color, handler);
             colors.append(color);
         }
     }
@@ -2583,7 +2723,7 @@ static void parseBaseGradient(QSvgNode *node,
                               QSvgHandler *handler)
 {
     QString link   = attributes.value(QLatin1String("xlink:href")).toString();
-    QString trans  = attributes.value(QLatin1String("gradientTransform")).toString();
+    QStringRef trans  = attributes.value(QLatin1String("gradientTransform"));
     QString spread = attributes.value(QLatin1String("spreadMethod")).toString();
     QString units = attributes.value(QLatin1String("gradientUnits")).toString();
 
@@ -2869,11 +3009,11 @@ static QSvgStyleProperty *createSolidColorNode(QSvgNode *parent,
                                                QSvgHandler *handler)
 {
     Q_UNUSED(parent); Q_UNUSED(attributes);
-    QString solidColorStr = attributes.value(QLatin1String("solid-color")).toString();
-    QString solidOpacityStr = attributes.value(QLatin1String("solid-opacity")).toString();
+    QStringRef solidColorStr = attributes.value(QLatin1String("solid-color"));
+    QStringRef solidOpacityStr = attributes.value(QLatin1String("solid-opacity"));
 
     if (solidOpacityStr.isEmpty())
-        solidOpacityStr = attributes.value(QLatin1String("opacity")).toString();
+        solidOpacityStr = attributes.value(QLatin1String("opacity"));
 
     QColor color;
     if (!constructColor(solidColorStr, solidOpacityStr, color, handler))
@@ -2924,19 +3064,19 @@ static bool parseStopNode(QSvgStyleProperty *parent,
     QSvgGradientStyle *style =
         static_cast<QSvgGradientStyle*>(parent);
     QString offsetStr   = attrs.offset.toString();
-    QString colorStr    = attrs.stopColor.toString();
-    QString opacityStr  = attrs.stopOpacity.toString();
+    QStringRef colorStr    = attrs.stopColor;
     QColor color;
 
     bool ok = true;
     qreal offset = convertToNumber(offsetStr, handler, &ok);
     if (!ok)
         offset = 0.0;
+    QString black = QString::fromLatin1("#000000");
     if (colorStr.isEmpty()) {
-        colorStr = QLatin1String("#000000");
+        colorStr = QStringRef(&black);
     }
 
-    constructColor(colorStr, opacityStr, color, handler);
+    constructColor(colorStr, attrs.stopOpacity, color, handler);
 
     QGradient *grad = style->qgradient();
 
diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h
index 9d23c8b..665b784 100644
--- a/src/testlib/qtestmouse.h
+++ b/src/testlib/qtestmouse.h
@@ -67,6 +67,7 @@ QT_MODULE(Test)
 namespace QTest
 {
     enum MouseAction { MousePress, MouseRelease, MouseClick, MouseDClick, MouseMove };
+    const char *mouseActionNames[] = { "MousePress", "MouseRelease", "MouseClick", "MouseDClick", "MouseMove" };
 
     static void mouseEvent(MouseAction action, QWidget *widget, Qt::MouseButton button,
                            Qt::KeyboardModifiers stateKey, QPoint pos, int delay=-1)
@@ -113,8 +114,10 @@ namespace QTest
                 QTEST_ASSERT(false);
         }
         QSpontaneKeyEvent::setSpontaneous(&me);
-        if (!qApp->notify(widget, &me))
-            QTest::qWarn("Mouse event not accepted by receiving widget");
+        if (!qApp->notify(widget, &me)) {
+            QString warning("Mouse event \"%1\" not accepted by receiving widget");
+            QTest::qWarn(warning.arg(mouseActionNames[static_cast<int>(action)]).toAscii().data());
+        }
 
     }
 
diff --git a/src/tools/moc/util/generate.sh b/src/tools/moc/util/generate.sh
index 215b8cb..9673c71 100755
--- a/src/tools/moc/util/generate.sh
+++ b/src/tools/moc/util/generate.sh
@@ -1,4 +1,45 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 qmake
 make
 cat licenseheader.txt > ../keywords.cpp
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 8dcc4aa..197414b 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -474,6 +474,7 @@ WriteInitialization::WriteInitialization(Uic *uic, bool activateScripts) :
       m_dindent(m_indent + m_option.indent),
       m_stdsetdef(true),
       m_layoutMarginType(TopLevelMargin),
+      m_mainFormUsedInRetranslateUi(false),
       m_delayedOut(&m_delayedInitialization, QIODevice::WriteOnly),
       m_refreshOut(&m_refreshInitialization, QIODevice::WriteOnly),
       m_actionOut(&m_delayedActionInitialization, QIODevice::WriteOnly),
@@ -569,11 +570,11 @@ void WriteInitialization::acceptUI(DomUI *node)
 
     m_output << m_option.indent << "} // setupUi\n\n";
 
-    if (m_delayedActionInitialization.isEmpty()) {
+    if (!m_mainFormUsedInRetranslateUi) {
         m_refreshInitialization += m_indent;
         m_refreshInitialization += QLatin1String("Q_UNUSED(");
         m_refreshInitialization += varName ;
-        m_refreshInitialization +=QLatin1String(");\n");
+        m_refreshInitialization += QLatin1String(");\n");
     }
 
     m_output << m_option.indent << "void " << "retranslateUi(" << widgetClassName << " *" << varName << ")\n"
@@ -1531,6 +1532,12 @@ void WriteInitialization::writeProperties(const QString &varName,
             o << ");\n";
             if (defineC)
                 closeIfndef(o, QLatin1String(defineC));
+
+            if (varName == m_mainFormVarName && &o == &m_refreshOut) {
+                // this is the only place (currently) where we output mainForm name to the retranslateUi().
+                // Other places output merely instances of a certain class (which cannot be main form, e.g. QListWidget).
+                m_mainFormUsedInRetranslateUi = true;
+            }
         }
     }
     if (leftMargin != -1 || topMargin != -1 || rightMargin != -1 || bottomMargin != -1) {
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
index 19e4fc7..b0564d0 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -350,6 +350,7 @@ private:
 
     QString m_generatedClass;
     QString m_mainFormVarName;
+    bool m_mainFormUsedInRetranslateUi;
 
     QString m_delayedInitialization;
     QTextStream m_delayedOut;
diff --git a/src/xmlpatterns/data/qatomicvalue.cpp b/src/xmlpatterns/data/qatomicvalue.cpp
index d8186e5..3aca100 100644
--- a/src/xmlpatterns/data/qatomicvalue.cpp
+++ b/src/xmlpatterns/data/qatomicvalue.cpp
@@ -172,13 +172,19 @@ Item AtomicValue::toXDM(const QVariant &value)
             return Item(Double::fromValue(value.toDouble()));
         default:
         {
-            Q_ASSERT_X(false,
-                       Q_FUNC_INFO,
-                       qPrintable(QString::fromLatin1(
-                           "QVariants of type %1 are not supported in "
-                           "Patternist, see the documentation")
+            if (value.userType() == qMetaTypeId<float>())
+            {
+                return Item(Float::fromValue(value.value<float>()));
+            }
+            else {
+                Q_ASSERT_X(false,
+                           Q_FUNC_INFO,
+                           qPrintable(QString::fromLatin1(
+                               "QVariants of type %1 are not supported in "
+                               "Patternist, see the documentation")
                                   .arg(QLatin1String(value.typeName()))));
-            return AtomicValue::Ptr();
+                return AtomicValue::Ptr();
+            }
         }
     }
 }
diff --git a/src/xmlpatterns/environment/createReportContext.sh b/src/xmlpatterns/environment/createReportContext.sh
index dcbf9ea..7f01538 100755
--- a/src/xmlpatterns/environment/createReportContext.sh
+++ b/src/xmlpatterns/environment/createReportContext.sh
@@ -1,4 +1,45 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 # Generate ReportContext.h by invoking createReportContext.xsl, which
 # in turns performs a transformation on the specs, fetched from http://www.w3.org/.
 
diff --git a/src/xmlpatterns/parser/createParser.sh b/src/xmlpatterns/parser/createParser.sh
index 51453eea..8b2849a 100755
--- a/src/xmlpatterns/parser/createParser.sh
+++ b/src/xmlpatterns/parser/createParser.sh
@@ -1,4 +1,44 @@
 #!/bin/bash
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 files="qquerytransformparser_p.h qquerytransformparser.cpp"
 
diff --git a/src/xmlpatterns/parser/createTokenLookup.sh b/src/xmlpatterns/parser/createTokenLookup.sh
index f84ee72..8e90500 100755
--- a/src/xmlpatterns/parser/createTokenLookup.sh
+++ b/src/xmlpatterns/parser/createTokenLookup.sh
@@ -1,4 +1,45 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 outFile="qtokenlookup.cpp"
 
 license=`cat <<EOF
diff --git a/src/xmlpatterns/parser/createXSLTTokenLookup.sh b/src/xmlpatterns/parser/createXSLTTokenLookup.sh
index 3a60dc4..9db886d 100755
--- a/src/xmlpatterns/parser/createXSLTTokenLookup.sh
+++ b/src/xmlpatterns/parser/createXSLTTokenLookup.sh
@@ -1,3 +1,44 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 xmllint --noout --schema ../qtokenautomaton/qtokenautomaton.xsd qxslttokenlookup.xml
 java net.sf.saxon.Transform -xsl:../qtokenautomaton/qautomaton2cpp.xsl qxslttokenlookup.xml
diff --git a/tests/auto/bic/gen.sh b/tests/auto/bic/gen.sh
index 31031aa..84e05bf 100755
--- a/tests/auto/bic/gen.sh
+++ b/tests/auto/bic/gen.sh
@@ -1,4 +1,44 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 if [ "$#" -lt 2 ]; then
     echo "$0 - Generates reference files for b/c autotest"
diff --git a/tests/auto/exceptionsafety_objects/oomsimulator.h b/tests/auto/exceptionsafety_objects/oomsimulator.h
index 8358fea..9432a5b 100644
--- a/tests/auto/exceptionsafety_objects/oomsimulator.h
+++ b/tests/auto/exceptionsafety_objects/oomsimulator.h
@@ -189,6 +189,82 @@ static struct QCrtDebugRegistrator
 
 } crtDebugRegistrator;
 
+#elif defined(Q_OS_SYMBIAN)
+
+struct QAllocFailAllocator : public RAllocator
+{
+    QAllocFailAllocator() : allocator(User::Allocator())
+    {
+        User::SwitchAllocator(this);
+    }
+
+    ~QAllocFailAllocator()
+    {
+        User::SwitchAllocator(&allocator);
+    }
+
+    RAllocator& allocator;
+
+    // from MAllocator
+    TAny* Alloc(TInt aSize)
+    {
+        ++mallocCount;
+        if (mallocFailActive && --mallocFailIndex < 0)
+            return 0; // simulate OOM
+        return allocator.Alloc(aSize);
+    }
+
+    void Free(TAny* aPtr)
+    {
+        allocator.Free(aPtr);
+    }
+
+    TAny* ReAlloc(TAny* aPtr, TInt aSize, TInt aMode)
+    {
+        ++mallocCount;
+        if (mallocFailActive && --mallocFailIndex < 0)
+            return 0; // simulate OOM
+        return allocator.ReAlloc(aPtr, aSize, aMode);
+    }
+
+    TInt AllocLen(const TAny* aCell) const
+    {
+        return allocator.AllocLen(aCell);
+    }
+
+    TInt Compress()
+    {
+        return allocator.Compress();
+    }
+
+    void Reset()
+    {
+        allocator.Reset();
+    }
+
+    TInt AllocSize(TInt& aTotalAllocSize) const
+    {
+        return allocator.AllocSize(aTotalAllocSize);
+    }
+
+    TInt Available(TInt& aBiggestBlock) const
+    {
+        return allocator.Available(aBiggestBlock);
+    }
+
+    TInt DebugFunction(TInt aFunc, TAny* a1, TAny* a2)
+    {
+        return allocator.DebugFunction(aFunc, a1, a2);
+    }
+
+    TInt Extension_(TUint aExtensionId, TAny*& a0, TAny* a1)
+    {
+        return ((MAllocator&)allocator).Extension_(aExtensionId, a0, a1);
+    }
+};
+
+QAllocFailAllocator symbianTestAllocator;
+
 #endif
 
 struct AllocFailer
@@ -201,9 +277,6 @@ struct AllocFailer
 #ifdef RUNNING_ON_VALGRIND
         if (RUNNING_ON_VALGRIND)
             VALGRIND_ENABLE_OOM_AT_ALLOC_INDEX(VALGRIND_GET_ALLOC_INDEX + index + 1);
-#elif defined(Q_OS_SYMBIAN)
-        // symbian alloc fail index is 1 based
-        __UHEAP_BURSTFAILNEXT(index+1, KMaxTUint16);
 #endif
         mallocFailIndex = index;
         mallocFailActive = true;
@@ -214,8 +287,6 @@ struct AllocFailer
         mallocFailActive = false;
 #ifdef RUNNING_ON_VALGRIND
         VALGRIND_ENABLE_OOM_AT_ALLOC_INDEX(0);
-#elif defined(Q_OS_SYMBIAN)
-        __UHEAP_RESET;
 #endif
     }
 
diff --git a/tests/auto/linguist/lconvert/data/makeplurals.pl b/tests/auto/linguist/lconvert/data/makeplurals.pl
index 19bffe0..614399d 100755
--- a/tests/auto/linguist/lconvert/data/makeplurals.pl
+++ b/tests/auto/linguist/lconvert/data/makeplurals.pl
@@ -1,4 +1,44 @@
-#! /usr/bin/env perl
+#!/usr/bin/env perl
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 sub makeit2($$$)
 {
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui
index d2e0c56..536bb2b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui
index d332eeb..d022101 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui
@@ -1,5 +1,45 @@
 <ui version="4.0" >
  <author></author>
+  <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+*********************************************************************</comment>
  <exportmacro></exportmacro>
  <class>FindDialog</class>
  <widget class="QWidget" name="FindDialog" >
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseui/project.ui b/tests/auto/linguist/lupdate/testdata/good/parseui/project.ui
index 65a00c7..780bd40 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseui/project.ui
+++ b/tests/auto/linguist/lupdate/testdata/good/parseui/project.ui
@@ -1,5 +1,45 @@
 <ui version="4.0" >
  <author></author>
+<comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+*********************************************************************</comment>
  <exportmacro></exportmacro>
  <class>FindDialog</class>
  <widget class="QWidget" name="FindDialog" >
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui b/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
index 3aa38c8..709b3e8 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
@@ -1,8 +1,12 @@
 <ui version="4.0" >
  <author></author>
+<comment>*********************************************************************
+**
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
+**
 ** This file is part of the test suite of the Qt Toolkit.
+**
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
@@ -34,6 +38,8 @@
 **
 **
 ** $QT_END_LICENSE$
+**
+*********************************************************************</comment>
  <exportmacro></exportmacro>
  <class>FindDialog</class>
  <widget class="QWidget" name="FindDialog" >
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
index 925a776..462fcbb 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
@@ -1,6 +1,10 @@
+/****************************************************************************
+**
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
+**
 ** This file is part of the test suite of the Qt Toolkit.
+**
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
@@ -32,6 +36,9 @@
 **
 **
 ** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include "finddialog.h"
 #include "mainwindow.h"
 #include "tabbedbrowser.h"
diff --git a/tests/auto/mediaobject/dummy/dummy.pro b/tests/auto/mediaobject/dummy/dummy.pro
index b4f6109..9febde7 100644
--- a/tests/auto/mediaobject/dummy/dummy.pro
+++ b/tests/auto/mediaobject/dummy/dummy.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.5.2
+   VERSION=4.6.0
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/tests/auto/moc/os9-newlines.h b/tests/auto/moc/os9-newlines.h
index b235d22..1e9ab35 100644
--- a/tests/auto/moc/os9-newlines.h
+++ b/tests/auto/moc/os9-newlines.h
@@ -1 +1 @@
-/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file.  Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain
** additional rights.  These rights are described in the Nokia Qt LGPL
** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
** package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/

#include <QObject>

class Os9Newlines : public QObject
{
    Q_OBJECT
public Q_SLOTS:
    inline void testSlot() {}
};


+/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file.  Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain
** additional rights.  These rights are described in the Nokia Qt LGPL
** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
** package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/

#include <QObject>

class Os9Newlines : public QObject
{
    Q_OBJECT
public Q_SLOTS:
    inline void testSlot() {}
};

\ No newline at end of file
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index e12d5e9..d1c179e 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -1,4 +1,6 @@
 /****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -36,6 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #include <QString>
 #ifdef QT_NETWORK_LIB
 #include <QtNetwork/QHostInfo>
@@ -181,7 +184,7 @@ public:
         }
 #endif
         QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID AUTH=PLAIN SASL-IR] " );
-        expected = expected.append(QtNetworkSettings::serverLocalName().toAscii());
+        expected = expected.append(QtNetworkSettings::serverName().toAscii());
         expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
         return expected;
     }
diff --git a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
index fa36845..19fa502 100644
--- a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
+++ b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
@@ -69,6 +69,8 @@ private slots:
     void cacheControl_data();
     void cacheControl();
 
+    void deleteCache();
+
 private:
     void check();
 };
@@ -84,8 +86,8 @@ public:
 #ifdef Q_OS_SYMBIAN
         QString location = QLatin1String("./cache/");
 #else
-        QString location = QDesktopServices::storageLocation(QDesktopServices::DataLocation)
-                                + QLatin1String("/cache/");
+        QString location = QDesktopServices::storageLocation(QDesktopServices::CacheLocation)
+                                    + QLatin1String("/qnetworkdiskcache/");
 #endif
         setCacheDirectory(location);
         clear();
@@ -275,6 +277,20 @@ void tst_QAbstractNetworkCache::check()
     QCOMPARE(diskCache->gotData, fetchFromCache);
 }
 
+void tst_QAbstractNetworkCache::deleteCache()
+{
+    QNetworkAccessManager manager;
+    NetworkDiskCache *diskCache = new NetworkDiskCache(&manager);
+    manager.setCache(diskCache);
+
+    QString url = "httpcachetest_cachecontrol.cgi?max-age=1000";
+    QNetworkRequest request(QUrl(TESTFILE + url));
+    QNetworkReply *reply = manager.get(request);
+    QSignalSpy downloaded1(reply, SIGNAL(finished()));
+    manager.setCache(0);
+    QTRY_COMPARE(downloaded1.count(), 1);
+}
+
 
 QTEST_MAIN(tst_QAbstractNetworkCache)
 #include "tst_qabstractnetworkcache.moc"
diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/qbytearray/tst_qbytearray.cpp
index dfb2fe1..cce4d7d 100644
--- a/tests/auto/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/qbytearray/tst_qbytearray.cpp
@@ -710,6 +710,7 @@ void tst_QByteArray::prepend()
     QCOMPARE(ba.prepend("1"), QByteArray("1foo"));
     QCOMPARE(ba.prepend(QByteArray("2")), QByteArray("21foo"));
     QCOMPARE(ba.prepend('3'), QByteArray("321foo"));
+    QCOMPARE(ba.prepend("\0 ", 2), QByteArray::fromRawData("\0 321foo", 8));
 }
 
 void tst_QByteArray::append()
@@ -720,6 +721,9 @@ void tst_QByteArray::append()
     QCOMPARE(ba.append("1"), QByteArray("foo1"));
     QCOMPARE(ba.append(QByteArray("2")), QByteArray("foo12"));
     QCOMPARE(ba.append('3'), QByteArray("foo123"));
+    QCOMPARE(ba.append("\0"), QByteArray("foo123"));
+    QCOMPARE(ba.append("\0", 1), QByteArray::fromRawData("foo123\0", 7));
+    QCOMPARE(ba.size(), 7);
 }
 
 void tst_QByteArray::insert()
@@ -738,6 +742,10 @@ void tst_QByteArray::insert()
     ba = "ikl";
     QCOMPARE(ba.insert(1, "j"), QByteArray("ijkl"));
     QCOMPARE(ba.size(), 4);
+
+    ba = "ab";
+    QCOMPARE(ba.insert(1, "\0X\0", 3), QByteArray::fromRawData("a\0X\0b", 5));
+    QCOMPARE(ba.size(), 5);
 }
 
 void tst_QByteArray::remove_data()
diff --git a/tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm b/tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm
index fbd6817..6d70aab 100644
--- a/tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm
+++ b/tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include <private/qt_mac_p.h>
 #include <AppKit/AppKit.h>
 
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index 073afc8..77e32ef 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -46,6 +46,7 @@
 #include <qdebug.h>
 #include <qgl.h>
 #include <qglpixelbuffer.h>
+#include <qglframebufferobject.h>
 #include <qglcolormap.h>
 #include <qpaintengine.h>
 
@@ -71,8 +72,12 @@ private slots:
     void partialGLWidgetUpdates_data();
     void partialGLWidgetUpdates();
     void glWidgetRendering();
+    void glFBORendering();
+    void multipleFBOInterleavedRendering();
+    void glFBOUseInGLWidget();
     void glPBufferRendering();
     void glWidgetReparent();
+    void stackedFBOs();
     void colormap();
 };
 
@@ -706,6 +711,231 @@ void tst_QGL::glWidgetRendering()
     QCOMPARE(fb, reference);
 }
 
+// NOTE: This tests that CombinedDepthStencil attachment works by assuming the
+//       GL2 engine is being used and is implemented the same way as it was when
+//       this autotest was written. If this is not the case, there may be some
+//       false-positives: I.e. The test passes when either the depth or stencil
+//       buffer is actually missing. But that's probably ok anyway.
+void tst_QGL::glFBORendering()
+{
+    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
+        QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
+
+    QGLWidget glw;
+    glw.makeCurrent();
+
+    // No multisample with combined depth/stencil attachment:
+    QGLFramebufferObjectFormat fboFormat;
+    fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
+
+    // Don't complicate things by using NPOT:
+    QGLFramebufferObject *fbo = new QGLFramebufferObject(256, 128, fboFormat);
+
+    QPainter fboPainter;
+    bool painterBegun = fboPainter.begin(fbo);
+    QVERIFY(painterBegun);
+
+    QPainterPath intersectingPath;
+    intersectingPath.moveTo(0, 0);
+    intersectingPath.lineTo(100, 0);
+    intersectingPath.lineTo(0, 100);
+    intersectingPath.lineTo(100, 100);
+    intersectingPath.closeSubpath();
+
+    QPainterPath trianglePath;
+    trianglePath.moveTo(50, 0);
+    trianglePath.lineTo(100, 100);
+    trianglePath.lineTo(0, 100);
+    trianglePath.closeSubpath();
+
+    fboPainter.fillRect(0, 0, fbo->width(), fbo->height(), Qt::red); // Background
+    fboPainter.translate(14, 14);
+    fboPainter.fillPath(intersectingPath, Qt::blue); // Test stencil buffer works
+    fboPainter.translate(128, 0);
+    fboPainter.setClipPath(trianglePath); // Test depth buffer works
+    fboPainter.setTransform(QTransform()); // reset xform
+    fboPainter.fillRect(0, 0, fbo->width(), fbo->height(), Qt::green);
+    fboPainter.end();
+
+    QImage fb = fbo->toImage().convertToFormat(QImage::Format_RGB32);
+    delete fbo;
+
+    // As we're doing more than trivial painting, we can't just compare to
+    // an image rendered with raster. Instead, we sample at well-defined
+    // test-points:
+    QCOMPARE(fb.pixel(39, 64), QColor(Qt::red).rgb());
+    QCOMPARE(fb.pixel(89, 64), QColor(Qt::red).rgb());
+    QCOMPARE(fb.pixel(64, 39), QColor(Qt::blue).rgb());
+    QCOMPARE(fb.pixel(64, 89), QColor(Qt::blue).rgb());
+
+    QCOMPARE(fb.pixel(167, 39), QColor(Qt::red).rgb());
+    QCOMPARE(fb.pixel(217, 39), QColor(Qt::red).rgb());
+    QCOMPARE(fb.pixel(192, 64), QColor(Qt::green).rgb());
+}
+
+
+// Tests multiple QPainters active on different FBOs at the same time, with
+// interleaving painting. Performance-wise, this is sub-optimal, but it still
+// has to work flawlessly
+void tst_QGL::multipleFBOInterleavedRendering()
+{
+    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
+        QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
+
+    QGLWidget glw;
+    glw.makeCurrent();
+
+    // No multisample with combined depth/stencil attachment:
+    QGLFramebufferObjectFormat fboFormat;
+    fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
+
+    QGLFramebufferObject *fbo1 = new QGLFramebufferObject(256, 128, fboFormat);
+    QGLFramebufferObject *fbo2 = new QGLFramebufferObject(256, 128, fboFormat);
+    QGLFramebufferObject *fbo3 = new QGLFramebufferObject(256, 128, fboFormat);
+
+    QPainter fbo1Painter;
+    QPainter fbo2Painter;
+    QPainter fbo3Painter;
+
+    QVERIFY(fbo1Painter.begin(fbo1));
+    QVERIFY(fbo2Painter.begin(fbo2));
+    QVERIFY(fbo3Painter.begin(fbo3));
+
+    QPainterPath intersectingPath;
+    intersectingPath.moveTo(0, 0);
+    intersectingPath.lineTo(100, 0);
+    intersectingPath.lineTo(0, 100);
+    intersectingPath.lineTo(100, 100);
+    intersectingPath.closeSubpath();
+
+    QPainterPath trianglePath;
+    trianglePath.moveTo(50, 0);
+    trianglePath.lineTo(100, 100);
+    trianglePath.lineTo(0, 100);
+    trianglePath.closeSubpath();
+
+    fbo1Painter.fillRect(0, 0, fbo1->width(), fbo1->height(), Qt::red); // Background
+    fbo2Painter.fillRect(0, 0, fbo2->width(), fbo2->height(), Qt::green); // Background
+    fbo3Painter.fillRect(0, 0, fbo3->width(), fbo3->height(), Qt::blue); // Background
+
+    fbo1Painter.translate(14, 14);
+    fbo2Painter.translate(14, 14);
+    fbo3Painter.translate(14, 14);
+
+    fbo1Painter.fillPath(intersectingPath, Qt::blue); // Test stencil buffer works
+    fbo2Painter.fillPath(intersectingPath, Qt::red); // Test stencil buffer works
+    fbo3Painter.fillPath(intersectingPath, Qt::green); // Test stencil buffer works
+
+    fbo1Painter.translate(128, 0);
+    fbo2Painter.translate(128, 0);
+    fbo3Painter.translate(128, 0);
+
+    fbo1Painter.setClipPath(trianglePath);
+    fbo2Painter.setClipPath(trianglePath);
+    fbo3Painter.setClipPath(trianglePath);
+
+    fbo1Painter.setTransform(QTransform()); // reset xform
+    fbo2Painter.setTransform(QTransform()); // reset xform
+    fbo3Painter.setTransform(QTransform()); // reset xform
+
+    fbo1Painter.fillRect(0, 0, fbo1->width(), fbo1->height(), Qt::green);
+    fbo2Painter.fillRect(0, 0, fbo2->width(), fbo2->height(), Qt::blue);
+    fbo3Painter.fillRect(0, 0, fbo3->width(), fbo3->height(), Qt::red);
+
+    fbo1Painter.end();
+    fbo2Painter.end();
+    fbo3Painter.end();
+
+    QImage fb1 = fbo1->toImage().convertToFormat(QImage::Format_RGB32);
+    QImage fb2 = fbo2->toImage().convertToFormat(QImage::Format_RGB32);
+    QImage fb3 = fbo3->toImage().convertToFormat(QImage::Format_RGB32);
+    delete fbo1;
+    delete fbo2;
+    delete fbo3;
+
+    // As we're doing more than trivial painting, we can't just compare to
+    // an image rendered with raster. Instead, we sample at well-defined
+    // test-points:
+    QCOMPARE(fb1.pixel(39, 64), QColor(Qt::red).rgb());
+    QCOMPARE(fb1.pixel(89, 64), QColor(Qt::red).rgb());
+    QCOMPARE(fb1.pixel(64, 39), QColor(Qt::blue).rgb());
+    QCOMPARE(fb1.pixel(64, 89), QColor(Qt::blue).rgb());
+    QCOMPARE(fb1.pixel(167, 39), QColor(Qt::red).rgb());
+    QCOMPARE(fb1.pixel(217, 39), QColor(Qt::red).rgb());
+    QCOMPARE(fb1.pixel(192, 64), QColor(Qt::green).rgb());
+
+    QCOMPARE(fb2.pixel(39, 64), QColor(Qt::green).rgb());
+    QCOMPARE(fb2.pixel(89, 64), QColor(Qt::green).rgb());
+    QCOMPARE(fb2.pixel(64, 39), QColor(Qt::red).rgb());
+    QCOMPARE(fb2.pixel(64, 89), QColor(Qt::red).rgb());
+    QCOMPARE(fb2.pixel(167, 39), QColor(Qt::green).rgb());
+    QCOMPARE(fb2.pixel(217, 39), QColor(Qt::green).rgb());
+    QCOMPARE(fb2.pixel(192, 64), QColor(Qt::blue).rgb());
+
+    QCOMPARE(fb3.pixel(39, 64), QColor(Qt::blue).rgb());
+    QCOMPARE(fb3.pixel(89, 64), QColor(Qt::blue).rgb());
+    QCOMPARE(fb3.pixel(64, 39), QColor(Qt::green).rgb());
+    QCOMPARE(fb3.pixel(64, 89), QColor(Qt::green).rgb());
+    QCOMPARE(fb3.pixel(167, 39), QColor(Qt::blue).rgb());
+    QCOMPARE(fb3.pixel(217, 39), QColor(Qt::blue).rgb());
+    QCOMPARE(fb3.pixel(192, 64), QColor(Qt::red).rgb());
+}
+
+class FBOUseInGLWidget : public QGLWidget
+{
+public:
+    bool widgetPainterBeginOk;
+    bool fboPainterBeginOk;
+    QImage fboImage;
+protected:
+    void paintEvent(QPaintEvent*)
+    {
+        QPainter widgetPainter;
+        widgetPainterBeginOk = widgetPainter.begin(this);
+        QGLFramebufferObjectFormat fboFormat;
+        fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
+        QGLFramebufferObject *fbo = new QGLFramebufferObject(128, 128, fboFormat);
+
+        QPainter fboPainter;
+        fboPainterBeginOk = fboPainter.begin(fbo);
+        fboPainter.fillRect(0, 0, 128, 128, Qt::red);
+        fboPainter.end();
+        fboImage = fbo->toImage();
+
+        widgetPainter.fillRect(rect(), Qt::blue);
+
+        delete fbo;
+    }
+
+};
+
+void tst_QGL::glFBOUseInGLWidget()
+{
+    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
+        QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
+
+    FBOUseInGLWidget w;
+    w.resize(128, 128);
+    w.show();
+
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&w);
+#endif
+    QTest::qWait(200);
+
+    QVERIFY(w.widgetPainterBeginOk);
+    QVERIFY(w.fboPainterBeginOk);
+
+    QImage widgetFB = w.grabFrameBuffer(false);
+    QImage widgetReference(widgetFB.size(), widgetFB.format());
+    widgetReference.fill(0xff0000ff);
+    QCOMPARE(widgetFB, widgetReference);
+
+    QImage fboReference(w.fboImage.size(), w.fboImage.format());
+    fboReference.fill(0xffff0000);
+    QCOMPARE(w.fboImage, fboReference);
+}
+
 void tst_QGL::glWidgetReparent()
 {
     // Try it as a top-level first:
@@ -772,6 +1002,109 @@ void tst_QGL::glWidgetReparent()
     delete widget;
 }
 
+// When using multiple FBOs at the same time, unbinding one FBO should re-bind the
+// previous. I.e. It should be possible to have a stack of FBOs where pop'ing there
+// top re-binds the one underneeth.
+void tst_QGL::stackedFBOs()
+{
+    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
+        QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
+
+    QGLWidget glw;
+    glw.show();
+
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&glw);
+#endif
+    QTest::qWait(200);
+
+    glw.makeCurrent();
+
+    // No multisample with combined depth/stencil attachment:
+    QGLFramebufferObjectFormat fboFormat;
+    fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
+
+    // Don't complicate things by using NPOT:
+    QGLFramebufferObject *fbo1 = new QGLFramebufferObject(128, 128, fboFormat);
+    QGLFramebufferObject *fbo2 = new QGLFramebufferObject(128, 128, fboFormat);
+    QGLFramebufferObject *fbo3 = new QGLFramebufferObject(128, 128, fboFormat);
+
+    glClearColor(1.0, 0.0, 1.0, 1.0);
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    fbo1->bind();
+        glClearColor(1.0, 0.0, 0.0, 1.0);
+        glClear(GL_COLOR_BUFFER_BIT);
+
+        fbo2->bind();
+            glClearColor(0.0, 1.0, 0.0, 1.0);
+            glClear(GL_COLOR_BUFFER_BIT);
+
+            fbo3->bind();
+                glClearColor(0.0, 0.0, 1.0, 1.0);
+                glClear(GL_COLOR_BUFFER_BIT);
+                glScissor(32, 32, 64, 64);
+                glEnable(GL_SCISSOR_TEST);
+                glClearColor(0.0, 1.0, 1.0, 1.0);
+                glClear(GL_COLOR_BUFFER_BIT);
+            fbo3->release();
+
+            // Scissor rect & test should be left untouched by the fbo release...
+            glClearColor(0.0, 0.0, 0.0, 1.0);
+            glClear(GL_COLOR_BUFFER_BIT);
+        fbo2->release();
+
+        glClearColor(1.0, 1.0, 1.0, 1.0);
+        glClear(GL_COLOR_BUFFER_BIT);
+    fbo1->release();
+
+    glClearColor(1.0, 1.0, 0.0, 1.0);
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    glw.swapBuffers();
+
+    QImage widgetFB = glw.grabFrameBuffer(false).convertToFormat(QImage::Format_RGB32);
+    QImage fb1 = fbo1->toImage().convertToFormat(QImage::Format_RGB32);
+    QImage fb2 = fbo2->toImage().convertToFormat(QImage::Format_RGB32);
+    QImage fb3 = fbo3->toImage().convertToFormat(QImage::Format_RGB32);
+
+    delete fbo1;
+    delete fbo2;
+    delete fbo3;
+
+    QImage widgetReference(widgetFB.size(), widgetFB.format());
+    QImage fb1Reference(fb1.size(), fb1.format());
+    QImage fb2Reference(fb2.size(), fb2.format());
+    QImage fb3Reference(fb3.size(), fb3.format());
+
+    QPainter widgetReferencePainter(&widgetReference);
+    QPainter fb1ReferencePainter(&fb1Reference);
+    QPainter fb2ReferencePainter(&fb2Reference);
+    QPainter fb3ReferencePainter(&fb3Reference);
+
+    widgetReferencePainter.fillRect(0, 0, widgetReference.width(), widgetReference.height(), Qt::magenta);
+    fb1ReferencePainter.fillRect(0, 0, fb1Reference.width(), fb1Reference.height(), Qt::red);
+    fb2ReferencePainter.fillRect(0, 0, fb2Reference.width(), fb2Reference.height(), Qt::green);
+    fb3ReferencePainter.fillRect(0, 0, fb3Reference.width(), fb3Reference.height(), Qt::blue);
+
+    // Flip y-coords to match GL for the widget (which can be any size)
+    widgetReferencePainter.fillRect(32, glw.height() - 96, 64, 64, Qt::yellow);
+    fb1ReferencePainter.fillRect(32, 32, 64, 64, Qt::white);
+    fb2ReferencePainter.fillRect(32, 32, 64, 64, Qt::black);
+    fb3ReferencePainter.fillRect(32, 32, 64, 64, Qt::cyan);
+
+    widgetReferencePainter.end();
+    fb1ReferencePainter.end();
+    fb2ReferencePainter.end();
+    fb3ReferencePainter.end();
+
+    QCOMPARE(widgetFB, widgetReference);
+    QCOMPARE(fb1, fb1Reference);
+    QCOMPARE(fb2, fb2Reference);
+    QCOMPARE(fb3, fb3Reference);
+}
+
+
 class ColormapExtended : public QGLColormap
 {
 public:
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index e54f95c..59016b9 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -50,6 +50,8 @@ class tst_QGraphicsAnchorLayout : public QObject {
 
 private slots:
     void simple();
+    void simple_center();
+    void simple_semifloat();
     void diagonal();
     void parallel();
     void parallel2();
@@ -60,7 +62,7 @@ private slots:
     void proportionalPreferred();
     void example();
     void setSpacing();
-
+    void hardComplexS60();
 };
 
 class RectWidget : public QGraphicsWidget
@@ -91,6 +93,17 @@ static QGraphicsWidget *createItem(const QSizeF &minimum = QSizeF(100.0, 100.0),
     return w;
 }
 
+static void setAnchor(QGraphicsAnchorLayout *l,
+                      QGraphicsLayoutItem *firstItem,
+                      Qt::AnchorPoint firstEdge,
+                      QGraphicsLayoutItem *secondItem,
+                      Qt::AnchorPoint secondEdge,
+                      qreal spacing)
+{
+    l->addAnchor(firstItem, firstEdge, secondItem, secondEdge);
+    l->setAnchorSpacing(firstItem, firstEdge, secondItem, secondEdge, spacing);
+}
+
 void tst_QGraphicsAnchorLayout::simple()
 {
     QGraphicsWidget *w1 = createItem();
@@ -106,6 +119,92 @@ void tst_QGraphicsAnchorLayout::simple()
     QCOMPARE(l->count(), 2);
 }
 
+void tst_QGraphicsAnchorLayout::simple_center()
+{
+    QSizeF min(10, 10);
+    QSizeF pref(50, 10);
+    QSizeF max(100, 10);
+
+    QGraphicsWidget *a = createItem(min, pref, max, "a");
+    QGraphicsWidget *b = createItem(min, pref, max, "b");
+    QGraphicsWidget *c = createItem(min, pref, max, "c");
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+    // horizontal
+    setAnchor(l, l, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+    setAnchor(l, a, Qt::AnchorRight, b, Qt::AnchorLeft, 0);
+    setAnchor(l, b, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+    setAnchor(l, a, Qt::AnchorHorizontalCenter, c, Qt::AnchorLeft, 0);
+    setAnchor(l, c, Qt::AnchorRight, b, Qt::AnchorHorizontalCenter, 0);
+
+    // vertical
+    setAnchor(l, l, Qt::AnchorTop, a, Qt::AnchorTop, 0);
+    setAnchor(l, l, Qt::AnchorTop, b, Qt::AnchorTop, 0);
+    setAnchor(l, a, Qt::AnchorBottom, c, Qt::AnchorTop, 0);
+    setAnchor(l, b, Qt::AnchorBottom, c, Qt::AnchorTop, 0);
+    setAnchor(l, c, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    QCOMPARE(l->count(), 3);
+
+    QGraphicsWidget *p = new QGraphicsWidget(0, Qt::Window);
+    p->setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QCOMPARE(layoutMinimumSize, QSizeF(20, 20));
+
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QCOMPARE(layoutMaximumSize, QSizeF(200, 20));
+}
+
+void tst_QGraphicsAnchorLayout::simple_semifloat()
+{
+    // Useful for testing simplification between A_left and B_left.
+    // Unfortunately the only way to really test that now is to manually inspect the
+    // simplified graph.
+    QSizeF min(10, 10);
+    QSizeF pref(50, 10);
+    QSizeF max(100, 10);
+
+    QGraphicsWidget *A = createItem(min, pref, max, "A");
+    QGraphicsWidget *B = createItem(min, pref, max, "B");
+    QGraphicsWidget *a = createItem(min, pref, max, "a");
+    QGraphicsWidget *b = createItem(min, pref, max, "b");
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    // horizontal
+    setAnchor(l, l, Qt::AnchorLeft, A, Qt::AnchorLeft, 0);
+    setAnchor(l, A, Qt::AnchorRight, B, Qt::AnchorLeft, 0);
+    setAnchor(l, B, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+
+    setAnchor(l, A, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+    setAnchor(l, B, Qt::AnchorLeft, b, Qt::AnchorLeft, 0);
+
+    // vertical
+    setAnchor(l, l, Qt::AnchorTop, A, Qt::AnchorTop, 0);
+    setAnchor(l, l, Qt::AnchorTop, B, Qt::AnchorTop, 0);
+    setAnchor(l, A, Qt::AnchorBottom, a, Qt::AnchorTop, 0);
+    setAnchor(l, B, Qt::AnchorBottom, b, Qt::AnchorTop, 0);
+    setAnchor(l, a, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+    setAnchor(l, b, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    QCOMPARE(l->count(), 4);
+
+    QGraphicsWidget *p = new QGraphicsWidget(0, Qt::Window);
+    p->setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QCOMPARE(layoutMinimumSize, QSizeF(20, 20));
+
+    QCOMPARE(l->effectiveSizeHint(Qt::PreferredSize), QSizeF(100, 20));
+
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QCOMPARE(layoutMaximumSize, QSizeF(200, 20));
+}
+
+
 void tst_QGraphicsAnchorLayout::diagonal()
 {
     QSizeF min(10, 100);
@@ -905,5 +1004,69 @@ void tst_QGraphicsAnchorLayout::setSpacing()
 
 }
 
+void tst_QGraphicsAnchorLayout::hardComplexS60()
+{
+    // Test for "hard" complex case, taken from wiki
+    // https://cwiki.nokia.com/S60QTUI/AnchorLayoutComplexCases
+    QSizeF min(0, 10);
+    QSizeF pref(50, 10);
+    QSizeF max(100, 10);
+
+    QGraphicsWidget *a = createItem(min, pref, max, "a");
+    QGraphicsWidget *b = createItem(min, pref, max, "b");
+    QGraphicsWidget *c = createItem(min, pref, max, "c");
+    QGraphicsWidget *d = createItem(min, pref, max, "d");
+    QGraphicsWidget *e = createItem(min, pref, max, "e");
+    QGraphicsWidget *f = createItem(min, pref, max, "f");
+    QGraphicsWidget *g = createItem(min, pref, max, "g");
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    //<!-- Trunk -->
+    setAnchor(l, l, Qt::AnchorLeft, a, Qt::AnchorLeft, 10);
+    setAnchor(l, a, Qt::AnchorRight, b, Qt::AnchorLeft, 10);
+    setAnchor(l, b, Qt::AnchorRight, c, Qt::AnchorLeft, 10);
+    setAnchor(l, c, Qt::AnchorRight, d, Qt::AnchorLeft, 10);
+    setAnchor(l, d, Qt::AnchorRight, l, Qt::AnchorRight, 10);
+
+    //<!-- Above trunk -->
+    setAnchor(l, b, Qt::AnchorLeft, e, Qt::AnchorLeft, 10);
+    setAnchor(l, e, Qt::AnchorRight, d, Qt::AnchorLeft, 10);
+
+    //<!-- Below trunk -->
+    setAnchor(l, a, Qt::AnchorHorizontalCenter, g, Qt::AnchorLeft, 10);
+    setAnchor(l, g, Qt::AnchorRight, f, Qt::AnchorHorizontalCenter, 10);
+    setAnchor(l, c, Qt::AnchorLeft, f, Qt::AnchorLeft, 10);
+    setAnchor(l, f, Qt::AnchorRight, d, Qt::AnchorRight, 10);
+
+    //<!-- vertical is simpler -->
+    setAnchor(l, l, Qt::AnchorTop, e, Qt::AnchorTop, 0);
+    setAnchor(l, e, Qt::AnchorBottom, a, Qt::AnchorTop, 0);
+    setAnchor(l, e, Qt::AnchorBottom, b, Qt::AnchorTop, 0);
+    setAnchor(l, e, Qt::AnchorBottom, c, Qt::AnchorTop, 0);
+    setAnchor(l, e, Qt::AnchorBottom, d, Qt::AnchorTop, 0);
+    setAnchor(l, a, Qt::AnchorBottom, f, Qt::AnchorTop, 0);
+    setAnchor(l, a, Qt::AnchorBottom, b, Qt::AnchorBottom, 0);
+    setAnchor(l, a, Qt::AnchorBottom, c, Qt::AnchorBottom, 0);
+    setAnchor(l, a, Qt::AnchorBottom, d, Qt::AnchorBottom, 0);
+    setAnchor(l, f, Qt::AnchorBottom, g, Qt::AnchorTop, 0);
+    setAnchor(l, g, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    QCOMPARE(l->count(), 7);
+
+    QGraphicsWidget *p = new QGraphicsWidget(0, Qt::Window);
+    p->setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QCOMPARE(layoutMinimumSize, QSizeF(60, 40));
+    // expected preferred might be wrong, (haven't manually verified it)
+    QSizeF layoutPreferredSize = l->effectiveSizeHint(Qt::PreferredSize);
+    QCOMPARE(layoutPreferredSize, QSizeF(220, 40));
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QCOMPARE(layoutMaximumSize, QSizeF(240, 40));
+
+}
+
 QTEST_MAIN(tst_QGraphicsAnchorLayout)
 #include "tst_qgraphicsanchorlayout.moc"
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index aa1f2b8..408decc 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -1239,6 +1239,7 @@ void tst_QGraphicsItem::selected()
     QVERIFY(!item->isSelected());
 
     // Click inside and check that it's selected
+    QTest::mouseMove(view.viewport());
     QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(item->scenePos()));
     QCOMPARE(item->values.size(), 11);
     QCOMPARE(item->values.last(), true);
@@ -1246,7 +1247,6 @@ void tst_QGraphicsItem::selected()
 
     // Click outside and check that it's not selected
     QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(item->scenePos() + QPointF(item->boundingRect().width(), item->boundingRect().height())));
-
     QCOMPARE(item->values.size(), 12);
     QCOMPARE(item->values.last(), false);
     QVERIFY(!item->isSelected());
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index bdb6e98..fd9d2a1 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -3696,8 +3696,9 @@ void tst_QGraphicsView::task259503_scrollingArtifacts()
 
             if (itSTimeToTest)
             {
-                qDebug() << event->region();
-                qDebug() << updateRegion;
+//                qDebug() << event->region();
+//                qDebug() << updateRegion;
+                QEXPECT_FAIL("", "The event region doesn't include the original item position region. See task #259503.", Continue);
                 QCOMPARE(event->region(), updateRegion);
             }
         }
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index 65e6e56..03054f9 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -2529,6 +2529,7 @@ void tst_QGraphicsWidget::ensureClipping()
     RectItem *childitem = new RectItem(Qt::blue, clipWidget);
 
     QGraphicsView view(&scene);
+    view.setOptimizationFlag(QGraphicsView::IndirectPainting);
     view.show();
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&view);
diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp
index a325a33..65ca6e8 100644
--- a/tests/auto/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/qimagereader/tst_qimagereader.cpp
@@ -1249,7 +1249,7 @@ void tst_QImageReader::readCorruptImage()
 
 void tst_QImageReader::readCorruptBmp()
 {
-    QCOMPARE(QImage("tst7.bmp").convertToFormat(QImage::Format_ARGB32_Premultiplied), QImage("images/tst7.png").convertToFormat(QImage::Format_ARGB32_Premultiplied));
+    QCOMPARE(QImage(prefix + "tst7.bmp").convertToFormat(QImage::Format_ARGB32_Premultiplied), QImage(prefix + "tst7.png").convertToFormat(QImage::Format_ARGB32_Premultiplied));
 }
 
 void tst_QImageReader::supportsOption_data()
diff --git a/tests/auto/qlibrary/lib/mylib.c b/tests/auto/qlibrary/lib/mylib.c
index 5e98362..d7fce57 100644
--- a/tests/auto/qlibrary/lib/mylib.c
+++ b/tests/auto/qlibrary/lib/mylib.c
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include <qglobal.h>
 
 #if defined(Q_CC_MSVC) || defined(Q_CC_MSVC_NET) || defined(Q_CC_BOR) || defined(Q_OS_SYMBIAN)
diff --git a/tests/auto/qlibrary/lib2/mylib.c b/tests/auto/qlibrary/lib2/mylib.c
index 4046f1f..03afa59 100644
--- a/tests/auto/qlibrary/lib2/mylib.c
+++ b/tests/auto/qlibrary/lib2/mylib.c
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include <qglobal.h>
 
 #if defined(Q_CC_MSVC) || defined(Q_CC_MSVC_NET) || defined(Q_CC_BOR)|| defined(Q_OS_SYMBIAN)
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
index a8cef92..fdfbd8a 100644
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
@@ -107,8 +107,11 @@ private slots:
 
     void recycleServer();
 
+    void writeToClientAndDisconnect();
+
     void debug();
 
+
 #ifdef Q_OS_SYMBIAN
 private:
     void unlink(QString serverName);
@@ -870,6 +873,33 @@ void tst_QLocalSocket::recycleServer()
     QVERIFY(server.nextPendingConnection() != 0);
 }
 
+void tst_QLocalSocket::writeToClientAndDisconnect()
+{
+#ifdef Q_OS_SYMBIAN
+    unlink("writeAndDisconnectServer");
+#endif
+
+    QLocalServer server;
+    QLocalSocket client;
+
+    QVERIFY(server.listen("writeAndDisconnectServer"));
+    client.connectToServer("writeAndDisconnectServer");
+    QVERIFY(client.waitForConnected(200));
+    QVERIFY(server.waitForNewConnection(200));
+    QLocalSocket* clientSocket = server.nextPendingConnection();
+    QVERIFY(clientSocket);
+
+    char buffer[100];
+    memset(buffer, 0, sizeof(buffer));
+    QCOMPARE(clientSocket->write(buffer, sizeof(buffer)), (qint64)sizeof(buffer));
+    clientSocket->flush();
+    clientSocket->disconnectFromServer();
+    qApp->processEvents();  // give the socket the chance to receive data
+    QCOMPARE(client.read(buffer, sizeof(buffer)), (qint64)sizeof(buffer));
+    qApp->processEvents();  // give the socket the chance to close itself
+    QCOMPARE(client.state(), QLocalSocket::UnconnectedState);
+}
+
 void tst_QLocalSocket::debug()
 {
     // Make sure this compiles
diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp
index ffa5853..0049c8d 100644
--- a/tests/auto/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp
@@ -107,6 +107,7 @@ private slots:
     void setCursor();
     void addToolbarAfterShow();
     void centralWidgetSize();
+    void dockWidgetSize();
 };
 
 // Testing get/set functions
@@ -1677,6 +1678,24 @@ void tst_QMainWindow::centralWidgetSize()
     QCOMPARE(widget.size(), widget.sizeHint());
 }
 
+void tst_QMainWindow::dockWidgetSize()
+{
+    QMainWindow mainWindow;
+    mainWindow.menuBar()->addMenu("menu");
+
+    MyWidget widget;
+    mainWindow.setCentralWidget(&widget);
+
+    QDockWidget dock;
+    dock.setWidget(new MyWidget);
+    mainWindow.addDockWidget(Qt::TopDockWidgetArea, &dock);
+
+    mainWindow.show();
+    QTest::qWait(100);
+    QCOMPARE(widget.size(), widget.sizeHint());
+    QCOMPARE(dock.widget()->size(), dock.widget()->sizeHint());
+}
+
 
 QTEST_MAIN(tst_QMainWindow)
 #include "tst_qmainwindow.moc"
diff --git a/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp
index fd5ef3e..6a7e625 100644
--- a/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp
+++ b/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp
@@ -328,7 +328,7 @@ void tst_QMatrixNxN::setMatrix(QMatrix4x3& m, const qreal *values)
 // the internal data() array.
 void tst_QMatrixNxN::setMatrixDirect(QMatrix2x2& m, const qreal *values)
 {
-    float *data = m.data();
+    qreal *data = m.data();
     for (int row = 0; row < 2; ++row) {
         for (int col = 0; col < 2; ++col) {
             data[row + col * 2] = values[row * 2 + col];
@@ -337,7 +337,7 @@ void tst_QMatrixNxN::setMatrixDirect(QMatrix2x2& m, const qreal *values)
 }
 void tst_QMatrixNxN::setMatrixDirect(QMatrix3x3& m, const qreal *values)
 {
-    float *data = m.data();
+    qreal *data = m.data();
     for (int row = 0; row < 3; ++row) {
         for (int col = 0; col < 3; ++col) {
             data[row + col * 3] = values[row * 3 + col];
@@ -346,7 +346,7 @@ void tst_QMatrixNxN::setMatrixDirect(QMatrix3x3& m, const qreal *values)
 }
 void tst_QMatrixNxN::setMatrixDirect(QMatrix4x4& m, const qreal *values)
 {
-    float *data = m.data();
+    qreal *data = m.data();
     for (int row = 0; row < 4; ++row) {
         for (int col = 0; col < 4; ++col) {
             data[row + col * 4] = values[row * 4 + col];
@@ -355,7 +355,7 @@ void tst_QMatrixNxN::setMatrixDirect(QMatrix4x4& m, const qreal *values)
 }
 void tst_QMatrixNxN::setMatrixDirect(QMatrix4x3& m, const qreal *values)
 {
-    float *data = m.data();
+    qreal *data = m.data();
     for (int row = 0; row < 3; ++row) {
         for (int col = 0; col < 4; ++col) {
             data[row + col * 3] = values[row * 4 + col];
@@ -363,55 +363,42 @@ void tst_QMatrixNxN::setMatrixDirect(QMatrix4x3& m, const qreal *values)
     }
 }
 
-// qFuzzyCompare isn't always "fuzzy" enough to handle conversion
-// between float, double, and qreal.  So create "fuzzier" compares.
-static bool fuzzyCompare(float x, float y, qreal epsilon = 0.001)
+// QVector2/3/4D use float internally, which can sometimes lead
+// to precision issues when converting to and from qreal during
+// operations involving QMatrix4x4.  This fuzzy compare is slightly
+// "fuzzier" than the default qFuzzyCompare for qreal to compensate.
+static bool fuzzyCompare(qreal x, qreal y)
 {
-    float diff = x - y;
-    if (diff < 0.0f)
-        diff = -diff;
-    return (diff < epsilon);
+    return qFuzzyIsNull((float)(x - y));
 }
 
-static bool fuzzyCompare(const QVector3D &v1, const QVector3D &v2, qreal epsilon = 0.001)
+static bool fuzzyCompare(const QVector3D &v1, const QVector3D &v2)
 {
-    if (!fuzzyCompare(v1.x(), v2.x(), epsilon))
+    if (!fuzzyCompare(v1.x(), v2.x()))
         return false;
-    if (!fuzzyCompare(v1.y(), v2.y(), epsilon))
+    if (!fuzzyCompare(v1.y(), v2.y()))
         return false;
-    if (!fuzzyCompare(v1.z(), v2.z(), epsilon))
+    if (!fuzzyCompare(v1.z(), v2.z()))
         return false;
     return true;
 }
 
-static bool matrixFuzzyCompare(const QMatrix4x4 &m1, const QMatrix4x4 &m2)
-{
-    bool ret = true;
-    for (int i = 0; i < 4; i++) {
-        for (int j = 0; j < 4; j++) {
-            ret = ret && fuzzyCompare(m1(i, j), m2(i, j));
-        }
-    }
-
-    return ret;
-}
-
 // Determine if a matrix is the same as a specified array of values.
 // The values are assumed to be specified in row-major order.
 bool tst_QMatrixNxN::isSame(const QMatrix2x2& m, const qreal *values)
 {
-    const float *mv = m.constData();
+    const qreal *mv = m.constData();
     for (int row = 0; row < 2; ++row) {
         for (int col = 0; col < 2; ++col) {
             // Check the values using the operator() function.
-            if (!fuzzyCompare((float)(m(row, col)), (float)(values[row * 2 + col]))) {
+            if (!fuzzyCompare(m(row, col), values[row * 2 + col])) {
                 qDebug() << "floating-point failure at" << row << col << "actual =" << m(row, col) << "expected =" << values[row * 2 + col];
                 return false;
             }
 
             // Check the values using direct access, which verifies that the values
             // are stored internally in column-major order.
-            if (!fuzzyCompare((float)(mv[col * 2 + row]), (float)(values[row * 2 + col]))) {
+            if (!fuzzyCompare(mv[col * 2 + row], values[row * 2 + col])) {
                 qDebug() << "column floating-point failure at" << row << col << "actual =" << mv[col * 2 + row] << "expected =" << values[row * 2 + col];
                 return false;
             }
@@ -421,18 +408,18 @@ bool tst_QMatrixNxN::isSame(const QMatrix2x2& m, const qreal *values)
 }
 bool tst_QMatrixNxN::isSame(const QMatrix3x3& m, const qreal *values)
 {
-    const float *mv = m.constData();
+    const qreal *mv = m.constData();
     for (int row = 0; row < 3; ++row) {
         for (int col = 0; col < 3; ++col) {
             // Check the values using the operator() access function.
-            if (!fuzzyCompare((float)(m(row, col)), (float)(values[row * 3 + col]))) {
+            if (!fuzzyCompare(m(row, col), values[row * 3 + col])) {
                 qDebug() << "floating-point failure at" << row << col << "actual =" << m(row, col) << "expected =" << values[row * 3 + col];
                 return false;
             }
 
             // Check the values using direct access, which verifies that the values
             // are stored internally in column-major order.
-            if (!fuzzyCompare((float)(mv[col * 3 + row]), (float)(values[row * 3 + col]))) {
+            if (!fuzzyCompare(mv[col * 3 + row], values[row * 3 + col])) {
                 qDebug() << "column floating-point failure at" << row << col << "actual =" << mv[col * 3 + row] << "expected =" << values[row * 3 + col];
                 return false;
             }
@@ -442,18 +429,18 @@ bool tst_QMatrixNxN::isSame(const QMatrix3x3& m, const qreal *values)
 }
 bool tst_QMatrixNxN::isSame(const QMatrix4x4& m, const qreal *values)
 {
-    const float *mv = m.constData();
+    const qreal *mv = m.constData();
     for (int row = 0; row < 4; ++row) {
         for (int col = 0; col < 4; ++col) {
             // Check the values using the operator() access function.
-            if (!fuzzyCompare((float)(m(row, col)), (float)(values[row * 4 + col]))) {
+            if (!fuzzyCompare(m(row, col), values[row * 4 + col])) {
                 qDebug() << "floating-point failure at" << row << col << "actual =" << m(row, col) << "expected =" << values[row * 4 + col];
                 return false;
             }
 
             // Check the values using direct access, which verifies that the values
             // are stored internally in column-major order.
-            if (!fuzzyCompare((float)(mv[col * 4 + row]), (float)(values[row * 4 + col]))) {
+            if (!fuzzyCompare(mv[col * 4 + row], values[row * 4 + col])) {
                 qDebug() << "column floating-point failure at" << row << col << "actual =" << mv[col * 4 + row] << "expected =" << values[row * 4 + col];
                 return false;
             }
@@ -463,18 +450,18 @@ bool tst_QMatrixNxN::isSame(const QMatrix4x4& m, const qreal *values)
 }
 bool tst_QMatrixNxN::isSame(const QMatrix4x3& m, const qreal *values)
 {
-    const float *mv = m.constData();
+    const qreal *mv = m.constData();
     for (int row = 0; row < 3; ++row) {
         for (int col = 0; col < 4; ++col) {
             // Check the values using the operator() access function.
-            if (!fuzzyCompare((float)(m(row, col)), (float)(values[row * 4 + col]))) {
+            if (!fuzzyCompare(m(row, col), values[row * 4 + col])) {
                 qDebug() << "floating-point failure at" << row << col << "actual =" << m(row, col) << "expected =" << values[row * 4 + col];
                 return false;
             }
 
             // Check the values using direct access, which verifies that the values
             // are stored internally in column-major order.
-            if (!fuzzyCompare((float)(mv[col * 3 + row]), (float)(values[row * 4 + col]))) {
+            if (!fuzzyCompare(mv[col * 3 + row], values[row * 4 + col])) {
                 qDebug() << "column floating-point failure at" << row << col << "actual =" << mv[col * 3 + row] << "expected =" << values[row * 4 + col];
                 return false;
             }
@@ -533,7 +520,7 @@ void tst_QMatrixNxN::create2x2()
     qreal vals[4];
     m6.toValueArray(vals);
     for (int index = 0; index < 4; ++index)
-        QCOMPARE((float)(vals[index]), (float)(uniqueValues2[index]));
+        QCOMPARE(vals[index], uniqueValues2[index]);
 }
 
 // Test the creation of QMatrix3x3 objects in various ways:
@@ -568,7 +555,7 @@ void tst_QMatrixNxN::create3x3()
     qreal vals[9];
     m6.toValueArray(vals);
     for (int index = 0; index < 9; ++index)
-        QCOMPARE((float)(vals[index]), (float)(uniqueValues3[index]));
+        QCOMPARE(vals[index], uniqueValues3[index]);
 }
 
 // Test the creation of QMatrix4x4 objects in various ways:
@@ -603,7 +590,7 @@ void tst_QMatrixNxN::create4x4()
     qreal vals[16];
     m6.toValueArray(vals);
     for (int index = 0; index < 16; ++index)
-        QCOMPARE((float)(vals[index]), (float)(uniqueValues4[index]));
+        QCOMPARE(vals[index], uniqueValues4[index]);
 
     QMatrix4x4 m8
         (uniqueValues4[0], uniqueValues4[1], uniqueValues4[2], uniqueValues4[3],
@@ -645,7 +632,7 @@ void tst_QMatrixNxN::create4x3()
     qreal vals[12];
     m6.toValueArray(vals);
     for (int index = 0; index < 12; ++index)
-        QCOMPARE((float)(vals[index]), (float)(uniqueValues4x3[index]));
+        QCOMPARE(vals[index], uniqueValues4x3[index]);
 }
 
 // Test isIdentity() for 2x2 matrices.
@@ -1303,7 +1290,7 @@ void tst_QMatrixNxN::multiply4x3()
     QMatrix4x3 m1((const qreal *)m1Values);
     QMatrix3x4 m2((const qreal *)m2Values);
 
-    QGenericMatrix<3, 3, qreal, float> m4;
+    QGenericMatrix<3, 3, qreal> m4;
     m4 = m1 * m2;
     qreal values[9];
     m4.toValueArray(values);
@@ -1882,7 +1869,7 @@ void tst_QMatrixNxN::inverted4x4()
     Matrix4 m1alt;
     memcpy(m1alt.v, (const qreal *)m1Values, sizeof(m1alt.v));
 
-    QCOMPARE((float)(m1.determinant()), (float)(m4Determinant(m1alt)));
+    QCOMPARE(m1.determinant(), m4Determinant(m1alt));
 
     QMatrix4x4 m2;
     bool inv;
@@ -1917,7 +1904,7 @@ void tst_QMatrixNxN::inverted4x4()
 void tst_QMatrixNxN::orthonormalInverse4x4()
 {
     QMatrix4x4 m1;
-    QVERIFY(matrixFuzzyCompare(m1.inverted(), m1));
+    QVERIFY(qFuzzyCompare(m1.inverted(), m1));
 
     QMatrix4x4 m2;
     m2.rotate(45.0, 1.0, 0.0, 0.0);
@@ -1930,14 +1917,14 @@ void tst_QMatrixNxN::orthonormalInverse4x4()
     QMatrix4x4 m3 = m2;
     m3.inferSpecialType();
     bool invertible;
-    QVERIFY(matrixFuzzyCompare(m2.inverted(&invertible), m3.inverted()));
+    QVERIFY(qFuzzyCompare(m2.inverted(&invertible), m3.inverted()));
     QVERIFY(invertible);
 
     QMatrix4x4 m4;
     m4.rotate(45.0, 0.0, 1.0, 0.0);
     QMatrix4x4 m5 = m4;
     m5.inferSpecialType();
-    QVERIFY(matrixFuzzyCompare(m4.inverted(), m5.inverted()));
+    QVERIFY(qFuzzyCompare(m4.inverted(), m5.inverted()));
 
     QMatrix4x4 m6;
     m1.rotate(88, 0.0, 0.0, 1.0);
@@ -1945,7 +1932,7 @@ void tst_QMatrixNxN::orthonormalInverse4x4()
     m1.rotate(25, 1.0, 0.0, 0.0);
     QMatrix4x4 m7 = m6;
     m7.inferSpecialType();
-    QVERIFY(matrixFuzzyCompare(m6.inverted(), m7.inverted()));
+    QVERIFY(qFuzzyCompare(m6.inverted(), m7.inverted()));
 }
 
 // Test the generation and use of 4x4 scale matrices.
@@ -2345,7 +2332,7 @@ void tst_QMatrixNxN::rotate4x4()
     QMatrix4x4 m3(uniqueValues4);
     QMatrix4x4 m4(m3);
     m4.rotate(angle, x, y, z);
-    QVERIFY(matrixFuzzyCompare(m4, m3 * m1));
+    QVERIFY(qFuzzyCompare(m4, m3 * m1));
 
     // Null vectors don't make sense for quaternion rotations.
     if (x != 0 || y != 0 || z != 0) {
@@ -2417,8 +2404,8 @@ void tst_QMatrixNxN::rotate4x4()
 
     QPointF p3(2.0f, 3.0f);
     QPointF p4 = m1 * p3;
-    QVERIFY(fuzzyCompare((float)(p4.x()), p1x));
-    QVERIFY(fuzzyCompare((float)(p4.y()), p1y));
+    QVERIFY(fuzzyCompare(p4.x(), p1x));
+    QVERIFY(fuzzyCompare(p4.y(), p1y));
 
     if (x != 0 || y != 0 || z != 0) {
         QQuaternion q = QQuaternion::fromAxisAndAngle(QVector3D(x, y, z), angle);
@@ -2911,14 +2898,12 @@ void tst_QMatrixNxN::extractAxisRotation()
 
     m.extractAxisRotation(extractedAngle, extractedAxis);
  
-    qreal epsilon = 0.001;
- 
     if (angle > 180) {
-        QVERIFY(fuzzyCompare(360.0f - angle, extractedAngle, epsilon));
-        QVERIFY(fuzzyCompare(extractedAxis, -origAxis, epsilon));
+        QVERIFY(fuzzyCompare(360.0f - angle, extractedAngle));
+        QVERIFY(fuzzyCompare(extractedAxis, -origAxis));
     } else {
-        QVERIFY(fuzzyCompare(angle, extractedAngle, epsilon));
-        QVERIFY(fuzzyCompare(extractedAxis, origAxis, epsilon));
+        QVERIFY(fuzzyCompare(angle, extractedAngle));
+        QVERIFY(fuzzyCompare(extractedAxis, origAxis));
     }
 }
 
@@ -2959,11 +2944,9 @@ void tst_QMatrixNxN::extractTranslation()
 
     QVector3D vec = rotation.extractTranslation();
 
-    qreal epsilon = 0.001;
-   
-    QVERIFY(fuzzyCompare(vec.x(), x, epsilon));
-    QVERIFY(fuzzyCompare(vec.y(), y, epsilon));
-    QVERIFY(fuzzyCompare(vec.z(), z, epsilon));
+    QVERIFY(fuzzyCompare(vec.x(), x));
+    QVERIFY(fuzzyCompare(vec.y(), y));
+    QVERIFY(fuzzyCompare(vec.z(), z));
 
     QMatrix4x4 lookAt;
     QVector3D eye(1.5f, -2.5f, 2.5f);
@@ -2973,9 +2956,9 @@ void tst_QMatrixNxN::extractTranslation()
 
    QVector3D extEye = lookAt.extractTranslation();
 
-   QVERIFY(fuzzyCompare(eye.x(), -extEye.x(), epsilon));
-   QVERIFY(fuzzyCompare(eye.y(), -extEye.y(), epsilon));
-   QVERIFY(fuzzyCompare(eye.z(), -extEye.z(), epsilon));
+   QVERIFY(fuzzyCompare(eye.x(), -extEye.x()));
+   QVERIFY(fuzzyCompare(eye.y(), -extEye.y()));
+   QVERIFY(fuzzyCompare(eye.z(), -extEye.z()));
 }
 
 // Copy of "flagBits" in qmatrix4x4.h.
@@ -2990,7 +2973,7 @@ enum {
 // Structure that allows direct access to "flagBits" for testing.
 struct Matrix4x4
 {
-    float m[4][4];
+    qreal m[4][4];
     int flagBits;
 };
 
@@ -3134,8 +3117,8 @@ void tst_QMatrixNxN::convertQMatrix()
 
     QMatrix4x4 m6(m5);
     QPointF p6 = m6 * QPointF(100.0, 150.0);
-    QVERIFY(fuzzyCompare(p5.x(), p6.x(), 0.005));
-    QVERIFY(fuzzyCompare(p5.y(), p6.y(), 0.005));
+    QVERIFY(fuzzyCompare(p5.x(), p6.x()));
+    QVERIFY(fuzzyCompare(p5.y(), p6.y()));
 
     QMatrix m7 = m6.toAffine();
     QVERIFY(fuzzyCompare(m5.m11(), m7.m11()));
@@ -3181,8 +3164,8 @@ void tst_QMatrixNxN::convertQTransform()
 
     QMatrix4x4 m6(m5);
     QPointF p6 = m6 * QPointF(100.0, 150.0);
-    QVERIFY(fuzzyCompare(p5.x(), p6.x(), 0.005));
-    QVERIFY(fuzzyCompare(p5.y(), p6.y(), 0.005));
+    QVERIFY(fuzzyCompare(p5.x(), p6.x()));
+    QVERIFY(fuzzyCompare(p5.y(), p6.y()));
 
     QTransform m7 = m6.toTransform();
     QVERIFY(fuzzyCompare(m5.m11(), m7.m11()));
diff --git a/tests/auto/qpluginloader/lib/mylib.c b/tests/auto/qpluginloader/lib/mylib.c
index 1366b7c..2892013 100644
--- a/tests/auto/qpluginloader/lib/mylib.c
+++ b/tests/auto/qpluginloader/lib/mylib.c
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include <qglobal.h>
 
 #if defined(Q_CC_MSVC) || defined(Q_CC_MSVC_NET) || defined(Q_CC_BOR)
diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp
index 89be43f..aa64f13 100644
--- a/tests/auto/qprinter/tst_qprinter.cpp
+++ b/tests/auto/qprinter/tst_qprinter.cpp
@@ -105,6 +105,8 @@ private slots:
     void testCustomPageSizes();
     void printDialogCompleter();
 
+    void testActualNumCopies();
+
 private:
 };
 
@@ -959,5 +961,12 @@ void tst_QPrinter::printDialogCompleter()
 #endif
 }
 
+void tst_QPrinter::testActualNumCopies()
+{
+    QPrinter p;
+    p.setNumCopies(15);
+    QCOMPARE(p.actualNumCopies(), 15);
+}
+
 QTEST_MAIN(tst_QPrinter)
 #include "tst_qprinter.moc"
diff --git a/tests/auto/qquaternion/tst_qquaternion.cpp b/tests/auto/qquaternion/tst_qquaternion.cpp
index 24427c3..e3c4cd6 100644
--- a/tests/auto/qquaternion/tst_qquaternion.cpp
+++ b/tests/auto/qquaternion/tst_qquaternion.cpp
@@ -98,14 +98,11 @@ private slots:
     void metaTypes();
 };
 
-// qFuzzyCompare isn't always "fuzzy" enough to handle conversion
-// between float, double, and qreal.  So create "fuzzier" compares.
-static bool fuzzyCompare(float x, float y)
-{
-    float diff = x - y;
-    if (diff < 0.0f)
-        diff = -diff;
-    return (diff < 0.001);
+// QVector3D uses float internally, which can lead to some precision
+// issues when using it with the qreal-based QQuaternion.
+static bool fuzzyCompare(qreal x, qreal y)
+{
+    return qFuzzyIsNull(float(x - y));
 }
 
 // Test the creation of QQuaternion objects in various ways:
@@ -250,8 +247,8 @@ void tst_QQuaternion::length()
     QFETCH(qreal, len);
 
     QQuaternion v(w, x, y, z);
-    QCOMPARE((float)(v.length()), (float)len);
-    QCOMPARE((float)(v.lengthSquared()), (float)(x * x + y * y + z * z + w * w));
+    QCOMPARE(v.length(), len);
+    QCOMPARE(v.lengthSquared(), x * x + y * y + z * z + w * w);
 }
 
 // Test the unit vector conversion for quaternions.
@@ -273,11 +270,11 @@ void tst_QQuaternion::normalized()
     if (v.isNull())
         QVERIFY(u.isNull());
     else
-        QCOMPARE((float)(u.length()), (float)1.0f);
-    QCOMPARE((float)(u.x() * len), (float)(v.x()));
-    QCOMPARE((float)(u.y() * len), (float)(v.y()));
-    QCOMPARE((float)(u.z() * len), (float)(v.z()));
-    QCOMPARE((float)(u.scalar() * len), (float)(v.scalar()));
+        QCOMPARE(u.length(), qreal(1.0f));
+    QCOMPARE(u.x() * len, v.x());
+    QCOMPARE(u.y() * len, v.y());
+    QCOMPARE(u.z() * len, v.z());
+    QCOMPARE(u.scalar() * len, v.scalar());
 }
 
 // Test the unit vector conversion for quaternions.
@@ -299,7 +296,7 @@ void tst_QQuaternion::normalize()
     if (isNull)
         QVERIFY(v.isNull());
     else
-        QCOMPARE((float)(v.length()), (float)1.0f);
+        QCOMPARE(v.length(), qreal(1.0f));
 }
 
 // Test the comparison operators for quaternions.
diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
index 68f0620..8fe6839 100644
--- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
+++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
@@ -155,7 +155,7 @@ struct ScriptEngineEvent
           lineNumber(lineNumber)
         { }
 
-    ScriptEngineEvent(Type type, qint64 scriptId = -1)
+    ScriptEngineEvent(Type type, qint64 scriptId = -777)
         : type(type), scriptId(scriptId)
         { }
 
@@ -1593,8 +1593,6 @@ void tst_QScriptEngineAgent::exceptionThrowAndCatch()
     {
         spy->clear();
         eng.evaluate("try { throw new Error('ciao'); } catch (e) { }");
-        if (qt_script_isJITEnabled())
-            QEXPECT_FAIL("", "Some events are missing when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 2);
 
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::ExceptionThrow);
@@ -1606,6 +1604,8 @@ void tst_QScriptEngineAgent::exceptionThrowAndCatch()
 
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::ExceptionCatch);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "Exception value is not passed in exceptionCatch event when JIT is enabled", Continue);
         QVERIFY(spy->at(1).value.strictlyEquals(spy->at(0).value));
     }
 }
@@ -1728,8 +1728,6 @@ void tst_QScriptEngineAgent::eventOrder_throwAndCatch()
     {
         spy->clear();
         eng.evaluate("try { throw new Error('ciao') } catch (e) { void(e); }");
-        if (qt_script_isJITEnabled())
-            QEXPECT_FAIL("", "One event is missing when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 12);
         // load
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::ScriptLoad);
@@ -1751,6 +1749,8 @@ void tst_QScriptEngineAgent::eventOrder_throwAndCatch()
         QVERIFY(spy->at(7).hasExceptionHandler);
         // catch
         QCOMPARE(spy->at(8).type, ScriptEngineEvent::ExceptionCatch);
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "Exception value is not passed in exceptionCatch event when JIT is enabled", Continue);
         QVERIFY(spy->at(8).value.isError());
         // void(e)
         QCOMPARE(spy->at(9).type, ScriptEngineEvent::PositionChange);
@@ -1914,8 +1914,6 @@ void tst_QScriptEngineAgent::eventOrder_throwCatchFinally()
     {
         spy->clear();
         eng.evaluate("try { throw 1; } catch(e) { i = e; } finally { i = 2; }");
-        if (qt_script_isJITEnabled())
-            QEXPECT_FAIL("", "One event is missing when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 9);
 
         // load
@@ -2100,6 +2098,7 @@ void tst_QScriptEngineAgent::syntaxError()
 
         i = 2;
         QCOMPARE(spy->at(i).type, ScriptEngineEvent::ContextPush);
+        QEXPECT_FAIL("","The test is broken, contextPush event do not provide scriptId", Continue);
         QVERIFY(spy->at(i).scriptId == -1);
         i = 3;
         QCOMPARE(spy->at(i).type, ScriptEngineEvent::FunctionEntry);
@@ -2109,6 +2108,7 @@ void tst_QScriptEngineAgent::syntaxError()
         QVERIFY(spy->at(i).scriptId == -1);
         i = 5;
         QCOMPARE(spy->at(i).type, ScriptEngineEvent::ContextPop);
+        QEXPECT_FAIL("","The test is broken, contextPop event do not provide scriptId", Continue);
         QVERIFY(spy->at(i).scriptId == -1);
         i = 6;
         QCOMPARE(spy->at(i).type, ScriptEngineEvent::ExceptionThrow);
diff --git a/tests/auto/qscriptstring/tst_qscriptstring.cpp b/tests/auto/qscriptstring/tst_qscriptstring.cpp
index 91dcf40..87956f8 100644
--- a/tests/auto/qscriptstring/tst_qscriptstring.cpp
+++ b/tests/auto/qscriptstring/tst_qscriptstring.cpp
@@ -126,11 +126,15 @@ void tst_QScriptString::test()
         QCOMPARE(twoInterned.toString(), two);
         QVERIFY(oneInterned != twoInterned);
         QVERIFY(!(oneInterned == twoInterned));
+        QScriptString copy1(oneInterned);
+        QScriptString copy2 = oneInterned;
 
         delete eng2;
 
         QVERIFY(!oneInterned.isValid());
         QVERIFY(!twoInterned.isValid());
+        QVERIFY(!copy1.isValid());
+        QVERIFY(!copy2.isValid());
     }
 }
 
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index e9a0670..f85ebc5 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -189,6 +189,8 @@ private slots:
     void oci_xmltypeSupport();
     void oci_fieldLength_data() { generic_data("QOCI"); }
     void oci_fieldLength();
+    void oci_synonymstest_data() { generic_data("QOCI"); }
+    void oci_synonymstest();
 
     void sqlite_bindAndFetchUInt_data() { generic_data("QSQLITE"); }
     void sqlite_bindAndFetchUInt();
@@ -365,6 +367,12 @@ void tst_QSqlDatabase::dropTestTables(QSqlDatabase db)
         tableNames <<  db.driver()->escapeIdentifier(qTableName("qtest") + " test", QSqlDriver::TableName);
 
     tst_Databases::safeDropTables(db, tableNames);
+
+    if (db.driverName().startsWith("QOCI")) {
+        q.exec("drop user "+qTableName("CREATOR")+" cascade");
+        q.exec("drop user "+qTableName("APPUSER")+" cascade");
+
+    }
 }
 
 void tst_QSqlDatabase::populateTestTables(QSqlDatabase db)
@@ -513,10 +521,6 @@ void tst_QSqlDatabase::tables()
     QVERIFY(tables.contains(qTableName("qtest"), Qt::CaseInsensitive));
     QVERIFY(!tables.contains("sql_features", Qt::CaseInsensitive)); //check for postgres 7.4 internal tables
     if (views) {
-        if (db.driverName().startsWith("QMYSQL"))
-            // MySQL doesn't differentiate between tables and views when calling QSqlDatabase::tables()
-            // May be fixable by doing a select on informational_schema.tables instead of using the client library api
-            QEXPECT_FAIL("", "MySQL driver thinks that views are tables", Continue);
         QVERIFY(!tables.contains(qTableName("qtest_view"), Qt::CaseInsensitive));
     }
     if (tempTables)
@@ -524,10 +528,6 @@ void tst_QSqlDatabase::tables()
 
     tables = db.tables(QSql::Views);
     if (views) {
-        if (db.driverName().startsWith("QMYSQL"))
-            // MySQL doesn't give back anything when calling QSqlDatabase::tables() with QSql::Views
-            // May be fixable by doing a select on informational_schema.views instead of using the client library api
-            QEXPECT_FAIL("", "MySQL driver thinks that views are tables", Continue);
         if(!tables.contains(qTableName("qtest_view"), Qt::CaseInsensitive))
             qDebug() << "failed to find" << qTableName("qtest_view") << "in" << tables;
         QVERIFY(tables.contains(qTableName("qtest_view"), Qt::CaseInsensitive));
@@ -2170,6 +2170,36 @@ void tst_QSqlDatabase::oci_fieldLength()
     QCOMPARE(q.record().field(1).length(), 40);
 }
 
+void tst_QSqlDatabase::oci_synonymstest()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+
+    QSqlQuery q(db);
+    QString creator(qTableName("CREATOR")), appuser(qTableName("APPUSER")), table1(qTableName("TABLE1"));
+//     QVERIFY_SQL(q, exec("drop public synonym "+table1));
+    QVERIFY_SQL(q, exec(QLatin1String("create user "+creator+" identified by "+creator+" default tablespace users temporary tablespace temp")));
+    QVERIFY_SQL(q, exec(QLatin1String("grant CONNECT to "+creator)));
+    QVERIFY_SQL(q, exec(QLatin1String("grant RESOURCE to "+creator)));
+    QSqlDatabase db2=db.cloneDatabase(db, QLatin1String("oci_synonymstest"));
+    db2.close();
+    QVERIFY_SQL(db2, open(creator,creator));
+    QSqlQuery q2(db2);
+    QVERIFY_SQL(q2, exec("create table "+table1+"(id int primary key)"));
+    QVERIFY_SQL(q, exec(QLatin1String("create user "+appuser+" identified by "+appuser+" default tablespace users temporary tablespace temp")));
+    QVERIFY_SQL(q, exec(QLatin1String("grant CREATE ANY SYNONYM to "+appuser)));
+    QVERIFY_SQL(q, exec(QLatin1String("grant CONNECT to "+appuser)));
+    QVERIFY_SQL(q2, exec(QLatin1String("grant select, insert, update, delete on "+table1+" to "+appuser)));
+    QSqlDatabase db3=db.cloneDatabase(db, QLatin1String("oci_synonymstest2"));
+    db3.close();
+    QVERIFY_SQL(db3, open(appuser,appuser));
+    QSqlQuery q3(db3);
+    QVERIFY_SQL(q3, exec("create synonym "+appuser+'.'+qTableName("synonyms")+" for "+creator+'.'+table1));
+    QVERIFY_SQL(db3, tables().filter(qTableName("synonyms"), Qt::CaseInsensitive).count() >= 1);
+}
+
+
 // This test isn't really necessary as SQL_GUID / uniqueidentifier is
 // already tested in recordSQLServer().
 void tst_QSqlDatabase::odbc_uniqueidentifier()
diff --git a/tests/auto/qsslcertificate/certificates/gencertificates.sh b/tests/auto/qsslcertificate/certificates/gencertificates.sh
index 2c0bdea..ad0e61e 100755
--- a/tests/auto/qsslcertificate/certificates/gencertificates.sh
+++ b/tests/auto/qsslcertificate/certificates/gencertificates.sh
@@ -1,4 +1,44 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script generates digital certificates of different types.
 
diff --git a/tests/auto/qsslkey/keys/genkeys.sh b/tests/auto/qsslkey/keys/genkeys.sh
index ee36a6c..5ca4bf6 100755
--- a/tests/auto/qsslkey/keys/genkeys.sh
+++ b/tests/auto/qsslkey/keys/genkeys.sh
@@ -1,4 +1,44 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script generates cryptographic keys of different types.
 
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 86fb9f4..7a6783c 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -592,7 +592,7 @@ void tst_QSslSocket::connectToHostEncrypted()
 
     QSslSocketPtr socket = newSocket();
     this->socket = socket;
-    QVERIFY(socket->addCaCertificates(QLatin1String("certs/qt-test-server-cacert.pem")));
+    QVERIFY(socket->addCaCertificates(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem")));
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
     connect(socket, SIGNAL(sslErrors(QList<QSslError>)),
             this, SLOT(untrustedWorkaroundSlot(QList<QSslError>)));
diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 4c8f689..499d4e0 100644
--- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -828,7 +828,8 @@ void tst_QStyleSheetStyle::hoverColors()
     widgets << new QLabel("<b>TESTING</b>");
 
     foreach (QWidget *widget, widgets) {
-        QDialog frame;
+        //without Qt::X11BypassWindowManagerHint the window manager may move the window after we moved the cursor
+        QDialog frame(0, Qt::X11BypassWindowManagerHint);
         QLayout* layout = new QGridLayout;
 
         QLineEdit* dummy = new QLineEdit;
@@ -845,6 +846,7 @@ void tst_QStyleSheetStyle::hoverColors()
 #endif
         QApplication::setActiveWindow(&frame);
         QTest::qWait(60);
+        //move the mouse inside the widget, it should be colored
         QTest::mouseMove ( widget, QPoint(5,5));
         QTest::qWait(60);
 
@@ -857,6 +859,32 @@ void tst_QStyleSheetStyle::hoverColors()
         QVERIFY2(testForColors(image, QColor(0xff, 0x00, 0x84)),
                  (QString::fromLatin1(widget->metaObject()->className())
                   + " did not contain text color #ff0084").toLocal8Bit().constData());
+
+        //move the mouse outside the widget, it should NOT be colored
+        QTest::mouseMove ( dummy, QPoint(5,5));
+        QTest::qWait(60);
+
+        frame.render(&image);
+
+        QVERIFY2(!testForColors(image, QColor(0xe8, 0xff, 0x66)),
+                  (QString::fromLatin1(widget->metaObject()->className())
+                  + " did contain background color #e8ff66").toLocal8Bit().constData());
+        QVERIFY2(!testForColors(image, QColor(0xff, 0x00, 0x84)),
+                 (QString::fromLatin1(widget->metaObject()->className())
+                  + " did contain text color #ff0084").toLocal8Bit().constData());
+
+        //move the mouse again inside the widget, it should be colored
+        QTest::mouseMove (widget, QPoint(5,5));
+        QTest::qWait(60);
+
+        frame.render(&image);
+
+        QVERIFY2(testForColors(image, QColor(0xe8, 0xff, 0x66)),
+                 (QString::fromLatin1(widget->metaObject()->className())
+                 + " did not contain background color #e8ff66").toLocal8Bit().constData());
+        QVERIFY2(testForColors(image, QColor(0xff, 0x00, 0x84)),
+                (QString::fromLatin1(widget->metaObject()->className())
+                + " did not contain text color #ff0084").toLocal8Bit().constData());
     }
 
 }
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp
index 39ab4c6..6fe2963 100644
--- a/tests/auto/qtableview/tst_qtableview.cpp
+++ b/tests/auto/qtableview/tst_qtableview.cpp
@@ -2487,6 +2487,11 @@ void tst_QTableView::indexAt()
     QtTestTableView view;
 
     view.show();
+
+    //some styles change the scroll mode in their polish
+    view.setHorizontalScrollMode(QAbstractItemView::ScrollPerItem);
+    view.setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
+
     view.setModel(&model);
     view.setSpan(row, column, rowSpan, columnSpan);
     view.hideRow(hiddenRow);
@@ -3143,6 +3148,10 @@ void tst_QTableView::task240266_veryBigColumn()
     table.show();
     QTest::qWait(100);
 
+    //some styles change the scroll mode in their polish
+    table.setHorizontalScrollMode(QAbstractItemView::ScrollPerItem);
+    table.setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
+
     QScrollBar *scroll = table.horizontalScrollBar();
     QCOMPARE(scroll->minimum(), 0);
     QCOMPARE(scroll->maximum(), model.columnCount() - 1);
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index 38bd600..3bf7d42 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -436,6 +436,9 @@ void tst_QTcpSocket::setSocketDescriptor()
     QCOMPARE(socket->state(), QTcpSocket::HostLookupState);
     QCOMPARE(socket->socketDescriptor(), (int)sock);
     QVERIFY(socket->waitForConnected(10000));
+    // skip this, it has been broken for years, see task 260735
+    // if somebody complains, consider fixing it, but it might break existing applications.
+    QEXPECT_FAIL("", "bug has been around for years, will not fix without need", Continue);
     QCOMPARE(socket->socketDescriptor(), (int)sock);
     delete socket;
 #ifdef Q_OS_WIN
@@ -1792,14 +1795,8 @@ void tst_QTcpSocket::readyReadSignalsAfterWaitForReadyRead()
     QString s = socket->readLine();
 #ifdef TEST_QNETWORK_PROXY
     QNetworkProxy::ProxyType proxyType = QNetworkProxy::applicationProxy().type();
-    if(proxyType == QNetworkProxy::NoProxy) {
-        QCOMPARE(s.toLatin1().constData(), "* OK [CAPABILITY IMAP4REV1] aspiriniks Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
-    } else {
-        QCOMPARE(s.toLatin1().constData(), "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] aspiriniks Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
-    }
-#else
-    QCOMPARE(s.toLatin1().constData(), QtNetworkSettings::expectedReplyIMAP().constData());
 #endif
+    QCOMPARE(s.toLatin1().constData(), QtNetworkSettings::expectedReplyIMAP().constData());
     QCOMPARE(socket->bytesAvailable(), qint64(0));
 
     QCoreApplication::instance()->processEvents();
diff --git a/tests/auto/qtokenautomaton/generateTokenizers.sh b/tests/auto/qtokenautomaton/generateTokenizers.sh
index 1fce40e..c7c824f 100755
--- a/tests/auto/qtokenautomaton/generateTokenizers.sh
+++ b/tests/auto/qtokenautomaton/generateTokenizers.sh
@@ -1,4 +1,45 @@
 #!/bin/bash
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 tokenizers=`find tokenizers/* -type d`
 for tokenizer in $tokenizers; do
     pushd $tokenizer
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index ef43c3a..6709807 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -233,6 +233,7 @@ private slots:
     void task239271_addRowsWithFirstColumnHidden();
     void task254234_proxySort();
     void task248022_changeSelection();
+    void task245654_changeModelAndExpandAll();
 };
 
 class QtTestModel: public QAbstractItemModel
@@ -3463,6 +3464,35 @@ void tst_QTreeView::task248022_changeSelection()
     QCOMPARE(view.selectionModel()->selectedIndexes().count(), list.count());
 }
 
+void tst_QTreeView::task245654_changeModelAndExpandAll()
+{
+    QTreeView view;
+    QStandardItemModel *model = new QStandardItemModel;
+    QStandardItem *top = new QStandardItem("top");
+    QStandardItem *sub = new QStandardItem("sub");
+    top->appendRow(sub);
+    model->appendRow(top);
+    view.setModel(model);
+    view.expandAll();
+    QApplication::processEvents();
+    QVERIFY(view.isExpanded(top->index()));
+
+    //now let's try to delete the model
+    //then repopulate and expand again
+    delete model;
+    model = new QStandardItemModel;
+    top = new QStandardItem("top");
+    sub = new QStandardItem("sub");
+    top->appendRow(sub);
+    model->appendRow(top);
+    view.setModel(model);
+    view.expandAll();
+    QApplication::processEvents();
+    QVERIFY(view.isExpanded(top->index()));
+
+}
+
+
 
 QTEST_MAIN(tst_QTreeView)
 #include "tst_qtreeview.moc"
diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp
index 4e750f8..7db74ff 100644
--- a/tests/auto/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp
@@ -126,6 +126,8 @@ private slots:
     void insertExpandedItemsWithSorting();
     void changeDataWithSorting_data();
     void changeDataWithSorting();
+    void changeDataWithStableSorting_data();
+    void changeDataWithStableSorting();
 
     void sortedIndexOfChild_data();
     void sortedIndexOfChild();
@@ -2419,6 +2421,184 @@ void tst_QTreeWidget::changeDataWithSorting()
     QCOMPARE(layoutChangedSpy.count(), reorderingExpected ? 1 : 0);
 }
 
+void tst_QTreeWidget::changeDataWithStableSorting_data()
+{
+    QTest::addColumn<int>("sortOrder");
+    QTest::addColumn<QStringList>("initialItems");
+    QTest::addColumn<int>("itemIndex");
+    QTest::addColumn<QString>("newValue");
+    QTest::addColumn<QStringList>("expectedItems");
+    QTest::addColumn<IntList>("expectedRows");
+    QTest::addColumn<bool>("reorderingExpected");
+    QTest::addColumn<bool>("forceChange");
+
+    QTest::newRow("change a to c in (a, c, c, c, e)")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << 0 << "c"
+        << (QStringList() << "c" << "c" << "c" << "c" << "e")
+        << (IntList() << 0 << 1 << 2 << 3 << 4)
+        << false
+        << false;
+    QTest::newRow("change e to c in (a, c, c, c, e)")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << 4 << "c"
+        << (QStringList() << "a" << "c" << "c" << "c" << "c")
+        << (IntList() << 0 << 1 << 2 << 3 << 4)
+        << false
+        << false;
+    QTest::newRow("change 1st c to c in (a, c, c, c, e)")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << 1 << "c"
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << (IntList() << 0 << 1 << 2 << 3 << 4)
+        << false
+        << true;
+    QTest::newRow("change 2nd c to c in (a, c, c, c, e)")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << 2 << "c"
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << (IntList() << 0 << 1 << 2 << 3 << 4)
+        << false
+        << true;
+    QTest::newRow("change 3rd c to c in (a, c, c, c, e)")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << 3 << "c"
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << (IntList() << 0 << 1 << 2 << 3 << 4)
+        << false
+        << true;
+    QTest::newRow("change 1st c to c in (e, c, c, c, a)")
+        << static_cast<int>(Qt::DescendingOrder)
+        << (QStringList() << "e" << "c" << "c" << "c" << "a")
+        << 1 << "c"
+        << (QStringList() << "e" << "c" << "c" << "c" << "a")
+        << (IntList() << 0 << 1 << 2 << 3 << 4)
+        << false
+        << true;
+    QTest::newRow("change 2nd c to c in (e, c, c, c, a)")
+        << static_cast<int>(Qt::DescendingOrder)
+        << (QStringList() << "e" << "c" << "c" << "c" << "a")
+        << 2 << "c"
+        << (QStringList() << "e" << "c" << "c" << "c" << "a")
+        << (IntList() << 0 << 1 << 2 << 3 << 4)
+        << false
+        << true;
+    QTest::newRow("change 3rd c to c in (e, c, c, c, a)")
+        << static_cast<int>(Qt::DescendingOrder)
+        << (QStringList() << "e" << "c" << "c" << "c" << "a")
+        << 3 << "c"
+        << (QStringList() << "e" << "c" << "c" << "c" << "a")
+        << (IntList() << 0 << 1 << 2 << 3 << 4)
+        << false
+        << true;
+    QTest::newRow("change 1st c to b in (a, c, c, c, e)")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << 1 << "b"
+        << (QStringList() << "a" << "b" << "c" << "c" << "e")
+        << (IntList() << 0 << 1 << 2 << 3 << 4)
+        << false
+        << false;
+    QTest::newRow("change 2nd c to b in (a, c, c, c, e)")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << 2 << "b"
+        << (QStringList() << "a" << "b" << "c" << "c" << "e")
+        << (IntList() << 0 << 2 << 1 << 3 << 4)
+        << true
+        << false;
+    QTest::newRow("change 3rd c to b in (a, c, c, c, e)")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << 3 << "b"
+        << (QStringList() << "a" << "b" << "c" << "c" << "e")
+        << (IntList() << 0 << 2 << 3 << 1 << 4)
+        << true
+        << false;
+    QTest::newRow("change 1st c to d in (a, c, c, c, e)")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << 1 << "d"
+        << (QStringList() << "a" << "c" << "c" << "d" << "e")
+        << (IntList() << 0 << 3 << 1 << 2 << 4)
+        << true
+        << false;
+    QTest::newRow("change 2nd c to d in (a, c, c, c, e)")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << 2 << "d"
+        << (QStringList() << "a" << "c" << "c" << "d" << "e")
+        << (IntList() << 0 << 1 << 3 << 2 << 4)
+        << true
+        << false;
+    QTest::newRow("change 3rd c to d in (a, c, c, c, e)")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QStringList() << "a" << "c" << "c" << "c" << "e")
+        << 3 << "d"
+        << (QStringList() << "a" << "c" << "c" << "d" << "e")
+        << (IntList() << 0 << 1 << 2 << 3 << 4)
+        << false
+        << false;
+}
+
+void tst_QTreeWidget::changeDataWithStableSorting()
+{
+    QFETCH(int, sortOrder);
+    QFETCH(QStringList, initialItems);
+    QFETCH(int, itemIndex);
+    QFETCH(QString, newValue);
+    QFETCH(QStringList, expectedItems);
+    QFETCH(IntList, expectedRows);
+    QFETCH(bool, reorderingExpected);
+    QFETCH(bool, forceChange);
+
+    class StableItem : public QTreeWidgetItem
+    {
+    public:
+        StableItem(const QStringList &strings) : QTreeWidgetItem(strings, QTreeWidgetItem::UserType) {}
+        void forceChangeData() {
+            emitDataChanged();
+        }
+    };
+
+    QTreeWidget w;
+    w.setSortingEnabled(true);
+    w.sortItems(0, static_cast<Qt::SortOrder>(sortOrder));
+    for (int i = 0; i < initialItems.count(); ++i)
+        w.addTopLevelItem(new StableItem(QStringList() << initialItems.at(i)));
+
+    QAbstractItemModel *model = w.model();
+    QList<QPersistentModelIndex> persistent;
+    for (int j = 0; j < model->rowCount(QModelIndex()); ++j)
+        persistent << model->index(j, 0, QModelIndex());
+
+    QSignalSpy dataChangedSpy(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)));
+    QSignalSpy layoutChangedSpy(model, SIGNAL(layoutChanged()));
+
+    StableItem *item = static_cast<StableItem *>(w.topLevelItem(itemIndex));
+    item->setText(0, newValue);
+    if (forceChange)
+        item->forceChangeData();
+    for (int i = 0; i < expectedItems.count(); ++i) {
+        QCOMPARE(w.topLevelItem(i)->text(0), expectedItems.at(i));
+        for (int j = 0; j < persistent.count(); ++j) {
+            if (persistent.at(j).row() == i) // the same toplevel row
+                QCOMPARE(persistent.at(j).internalPointer(), (void *)w.topLevelItem(i));
+        }
+    }
+
+    for (int k = 0; k < persistent.count(); ++k)
+        QCOMPARE(persistent.at(k).row(), expectedRows.at(k));
+
+    QCOMPARE(dataChangedSpy.count(), 1);
+    QCOMPARE(layoutChangedSpy.count(), reorderingExpected ? 1 : 0);
+}
+
 void tst_QTreeWidget::itemOperatorLessThan()
 {
     QTreeWidget tw;
diff --git a/tests/auto/qurl/idna-test.c b/tests/auto/qurl/idna-test.c
index 2c24118..6bc6381 100644
--- a/tests/auto/qurl/idna-test.c
+++ b/tests/auto/qurl/idna-test.c
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 struct idna
 {
     char *name;
diff --git a/tests/auto/qvectornd/tst_qvectornd.cpp b/tests/auto/qvectornd/tst_qvectornd.cpp
index 243b172..75c2eb5 100644
--- a/tests/auto/qvectornd/tst_qvectornd.cpp
+++ b/tests/auto/qvectornd/tst_qvectornd.cpp
@@ -144,14 +144,13 @@ private slots:
     void metaTypes();
 };
 
-// qFuzzyCompare isn't always "fuzzy" enough to handle conversion
-// between float, double, and qreal.  So create "fuzzier" compares.
-static bool fuzzyCompare(float x, float y)
+// QVector2/3/4D use float internally, which can sometimes lead
+// to precision issues when converting to and from qreal.
+// This fuzzy compare is slightly "fuzzier" than the default
+// qFuzzyCompare for qreal to compensate.
+static bool fuzzyCompare(qreal x, qreal y)
 {
-    float diff = x - y;
-    if (diff < 0.0f)
-        diff = -diff;
-    return (diff < 0.001);
+    return qFuzzyIsNull((float)(x - y));
 }
 
 // Test the creation of QVector2D objects in various ways:
@@ -577,8 +576,8 @@ void tst_QVector::length2()
     QFETCH(qreal, len);
 
     QVector2D v(x, y);
-    QCOMPARE((float)(v.length()), (float)len);
-    QCOMPARE((float)(v.lengthSquared()), (float)(x * x + y * y));
+    QCOMPARE(v.length(), len);
+    QCOMPARE(v.lengthSquared(), x * x + y * y);
 }
 
 // Test vector length computation for 3D vectors.
@@ -606,8 +605,8 @@ void tst_QVector::length3()
     QFETCH(qreal, len);
 
     QVector3D v(x, y, z);
-    QCOMPARE((float)(v.length()), (float)len);
-    QCOMPARE((float)(v.lengthSquared()), (float)(x * x + y * y + z * z));
+    QCOMPARE(v.length(), len);
+    QCOMPARE(v.lengthSquared(), x * x + y * y + z * z);
 }
 
 // Test vector length computation for 4D vectors.
@@ -639,8 +638,8 @@ void tst_QVector::length4()
     QFETCH(qreal, len);
 
     QVector4D v(x, y, z, w);
-    QCOMPARE((float)(v.length()), (float)len);
-    QCOMPARE((float)(v.lengthSquared()), (float)(x * x + y * y + z * z + w * w));
+    QCOMPARE(v.length(), len);
+    QCOMPARE(v.lengthSquared(), x * x + y * y + z * z + w * w);
 }
 
 // Test the unit vector conversion for 2D vectors.
@@ -660,9 +659,9 @@ void tst_QVector::normalized2()
     if (v.isNull())
         QVERIFY(u.isNull());
     else
-        QCOMPARE((float)(u.length()), (float)1.0f);
-    QCOMPARE((float)(u.x() * len), (float)(v.x()));
-    QCOMPARE((float)(u.y() * len), (float)(v.y()));
+        QVERIFY(fuzzyCompare(u.length(), qreal(1.0f)));
+    QVERIFY(fuzzyCompare(u.x() * len, v.x()));
+    QVERIFY(fuzzyCompare(u.y() * len, v.y()));
 }
 
 // Test the unit vector conversion for 3D vectors.
@@ -683,10 +682,10 @@ void tst_QVector::normalized3()
     if (v.isNull())
         QVERIFY(u.isNull());
     else
-        QCOMPARE((float)(u.length()), (float)1.0f);
-    QCOMPARE((float)(u.x() * len), (float)(v.x()));
-    QCOMPARE((float)(u.y() * len), (float)(v.y()));
-    QCOMPARE((float)(u.z() * len), (float)(v.z()));
+        QVERIFY(fuzzyCompare(u.length(), qreal(1.0f)));
+    QVERIFY(fuzzyCompare(u.x() * len, v.x()));
+    QVERIFY(fuzzyCompare(u.y() * len, v.y()));
+    QVERIFY(fuzzyCompare(u.z() * len, v.z()));
 }
 
 // Test the unit vector conversion for 4D vectors.
@@ -708,11 +707,11 @@ void tst_QVector::normalized4()
     if (v.isNull())
         QVERIFY(u.isNull());
     else
-        QCOMPARE((float)(u.length()), (float)1.0f);
-    QCOMPARE((float)(u.x() * len), (float)(v.x()));
-    QCOMPARE((float)(u.y() * len), (float)(v.y()));
-    QCOMPARE((float)(u.z() * len), (float)(v.z()));
-    QCOMPARE((float)(u.w() * len), (float)(v.w()));
+        QVERIFY(fuzzyCompare(u.length(), qreal(1.0f)));
+    QVERIFY(fuzzyCompare(u.x() * len, v.x()));
+    QVERIFY(fuzzyCompare(u.y() * len, v.y()));
+    QVERIFY(fuzzyCompare(u.z() * len, v.z()));
+    QVERIFY(fuzzyCompare(u.w() * len, v.w()));
 }
 
 // Test the unit vector conversion for 2D vectors.
@@ -732,7 +731,7 @@ void tst_QVector::normalize2()
     if (isNull)
         QVERIFY(v.isNull());
     else
-        QCOMPARE((float)(v.length()), (float)1.0f);
+        QVERIFY(fuzzyCompare(v.length(), qreal(1.0f)));
 }
 
 // Test the unit vector conversion for 3D vectors.
@@ -753,7 +752,7 @@ void tst_QVector::normalize3()
     if (isNull)
         QVERIFY(v.isNull());
     else
-        QCOMPARE((float)(v.length()), (float)1.0f);
+        QVERIFY(fuzzyCompare(v.length(), qreal(1.0f)));
 }
 
 // Test the unit vector conversion for 4D vectors.
@@ -775,7 +774,7 @@ void tst_QVector::normalize4()
     if (isNull)
         QVERIFY(v.isNull());
     else
-        QCOMPARE((float)(v.length()), (float)1.0f);
+        QVERIFY(fuzzyCompare(v.length(), qreal(1.0f)));
 }
 
 // Test the comparison operators for 2D vectors.
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index f638efd..b3df69d 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -5347,6 +5347,8 @@ void tst_QWidget::moveChild()
     QFETCH(QPoint, offset);
 
     ColorWidget parent;
+    // prevent custom styles
+    parent.setStyle(new QWindowsStyle);
     ColorWidget child(&parent, Qt::blue);
 
 #ifndef Q_OS_WINCE
@@ -5397,6 +5399,8 @@ void tst_QWidget::moveChild()
 void tst_QWidget::showAndMoveChild()
 {
     QWidget parent(0, Qt::FramelessWindowHint);
+    // prevent custom styles
+    parent.setStyle(new QWindowsStyle);
     parent.resize(300, 300);
     parent.setPalette(Qt::red);
     parent.show();
@@ -6467,6 +6471,8 @@ void tst_QWidget::render()
     {
         QWidget window;
         window.resize(100, 100);
+        // prevent custom styles
+        window.setStyle(new QWindowsStyle);
         window.show();
 #ifdef Q_WS_X11
         qt_x11_wait_for_window_manager(&window);
@@ -6484,6 +6490,8 @@ void tst_QWidget::render()
         widget.resize(200, 200);
         widget.setAutoFillBackground(true);
         widget.setPalette(Qt::red);
+        // prevent custom styles
+        widget.setStyle(new QWindowsStyle);
         widget.show();
 #ifdef Q_WS_X11
         qt_x11_wait_for_window_manager(&widget);
@@ -6739,6 +6747,8 @@ void tst_QWidget::renderInvisible()
 void tst_QWidget::renderWithPainter()
 {
     QWidget widget;
+    // prevent custom styles
+    widget.setStyle(new QWindowsStyle);
     widget.show();
     widget.resize(70, 50);
     widget.setAutoFillBackground(true);
diff --git a/tests/auto/qwidget/tst_qwidget_mac_helpers.mm b/tests/auto/qwidget/tst_qwidget_mac_helpers.mm
index 8a437df..95bad23 100644
--- a/tests/auto/qwidget/tst_qwidget_mac_helpers.mm
+++ b/tests/auto/qwidget/tst_qwidget_mac_helpers.mm
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include "tst_qwidget_mac_helpers.h"
 #include <private/qt_mac_p.h>
 #include <private/qt_cocoa_helpers_mac_p.h>
diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
index 4009174..9d59c62 100644
--- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
+++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
@@ -43,6 +43,7 @@
 #include <QtTest/QtTest>
 #include <QPainter>
 #include <QPalette>
+#include <QWindowsStyle>
 
 #ifndef Q_WS_MAC
 
@@ -151,6 +152,8 @@ void tst_QWindowSurface::flushOutsidePaintEvent()
 #endif
     ColorWidget w(0, Qt::red);
     w.setGeometry(10, 100, 50, 50);
+    // prevent custom styles from messing up the background
+    w.setStyle(new QWindowsStyle);
     w.show();
 
     QApplication::processEvents();
@@ -223,6 +226,9 @@ void tst_QWindowSurface::grabWidget()
     pal.setColor(QPalette::Window, QColor(Qt::red));
     babyWidget.setPalette(pal);
 
+    // prevent custom styles from messing up the background
+    parentWidget.setStyle(new QWindowsStyle);
+
     babyWidget.show();
     childWidget.show();
     parentWidget.show();
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index d9b5215..a2c40a8 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -1305,7 +1305,7 @@ void tst_QXmlQuery::basicQtToXQueryTypeCheck() const
     // TODO Do with different QDateTime time specs
     query.bindVariable(QLatin1String("fromQDateTime"), QXmlItem(QDateTime(QDate(2001, 9, 10), QTime(1, 2, 3))));
     query.bindVariable(QLatin1String("fromDouble"), QXmlItem(double(3)));
-//    query.bindVariable(QLatin1String("fromFloat"), QXmlItem(float(4)));
+    query.bindVariable(QLatin1String("fromFloat"), QXmlItem(float(4)));
     query.bindVariable(QLatin1String("integer"), QXmlItem(5));
     query.bindVariable(QLatin1String("fromQString"), QXmlItem(QString::fromLatin1("A QString")));
     query.bindVariable(QLatin1String("fromQChar"), QXmlItem(QChar::fromLatin1('C')));
diff --git a/tests/auto/qxmlsimplereader/generate_ref_files.sh b/tests/auto/qxmlsimplereader/generate_ref_files.sh
index d9e7cef..c9b6f88 100755
--- a/tests/auto/qxmlsimplereader/generate_ref_files.sh
+++ b/tests/auto/qxmlsimplereader/generate_ref_files.sh
@@ -1,3 +1,43 @@
-#! /bin/bash
+#!/bin/bash
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 for k in `find xmldocs -name \*.xml`; do echo $k...; ./parser/parser $k; done
diff --git a/tests/auto/qxmlstream/setupSuite.sh b/tests/auto/qxmlstream/setupSuite.sh
index 56d7bf3..42e76bc 100755
--- a/tests/auto/qxmlstream/setupSuite.sh
+++ b/tests/auto/qxmlstream/setupSuite.sh
@@ -1,4 +1,45 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 # 
 # Hello!
 #
diff --git a/tests/auto/test.pl b/tests/auto/test.pl
index a9e3da8..ffd09b9 100755
--- a/tests/auto/test.pl
+++ b/tests/auto/test.pl
@@ -1,4 +1,45 @@
 #!/usr/bin/env perl
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 use strict;
 use Cwd;
 
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h b/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
index efbeb97..ecbfd30 100644
--- a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
+++ b/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'Dialog_with_Buttons_Bottom.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -46,7 +46,6 @@ public:
     void retranslateUi(QDialog *Dialog)
     {
         Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Dialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h b/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h
index 0f23ee3..aa42d5c 100644
--- a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h
+++ b/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'Dialog_with_Buttons_Right.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -46,7 +46,6 @@ public:
     void retranslateUi(QDialog *Dialog)
     {
         Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Dialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h b/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h
index ff88063..7d876e1 100644
--- a/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h
+++ b/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'Dialog_without_Buttons.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -37,7 +37,6 @@ public:
     void retranslateUi(QDialog *Dialog)
     {
         Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Dialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/Main_Window.ui.h b/tests/auto/uic/baseline/Main_Window.ui.h
index 4fbc750..b54e4a6 100644
--- a/tests/auto/uic/baseline/Main_Window.ui.h
+++ b/tests/auto/uic/baseline/Main_Window.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'Main_Window.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -52,7 +52,6 @@ public:
     void retranslateUi(QMainWindow *MainWindow)
     {
         MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(MainWindow);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/Widget.ui.h b/tests/auto/uic/baseline/Widget.ui.h
index e49646e..362d283 100644
--- a/tests/auto/uic/baseline/Widget.ui.h
+++ b/tests/auto/uic/baseline/Widget.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'Widget.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -68,7 +68,6 @@ public:
 "Last line.", 0, QApplication::UnicodeUTF8));
         groupBox->setTitle(QApplication::translate("Form", "A Group Box", 0, QApplication::UnicodeUTF8));
         pushButton->setText(QApplication::translate("Form", "PushButton", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Form);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/addlinkdialog.ui.h b/tests/auto/uic/baseline/addlinkdialog.ui.h
index 1b174ad..230bc5d 100644
--- a/tests/auto/uic/baseline/addlinkdialog.ui.h
+++ b/tests/auto/uic/baseline/addlinkdialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'addlinkdialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -104,7 +104,6 @@ public:
         AddLinkDialog->setWindowTitle(QApplication::translate("AddLinkDialog", "Insert Link", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("AddLinkDialog", "Title:", 0, QApplication::UnicodeUTF8));
         label_2->setText(QApplication::translate("AddLinkDialog", "URL:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(AddLinkDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/addtorrentform.ui.h b/tests/auto/uic/baseline/addtorrentform.ui.h
index a454da9..c075e8a 100644
--- a/tests/auto/uic/baseline/addtorrentform.ui.h
+++ b/tests/auto/uic/baseline/addtorrentform.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'addtorrentform.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -228,7 +228,6 @@ public:
         sizeLabel->setText(QApplication::translate("AddTorrentFile", "0", 0, QApplication::UnicodeUTF8));
         okButton->setText(QApplication::translate("AddTorrentFile", "&OK", 0, QApplication::UnicodeUTF8));
         cancelButton->setText(QApplication::translate("AddTorrentFile", "&Cancel", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(AddTorrentFile);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/authenticationdialog.ui.h b/tests/auto/uic/baseline/authenticationdialog.ui.h
index dd27f5c..9f35586 100644
--- a/tests/auto/uic/baseline/authenticationdialog.ui.h
+++ b/tests/auto/uic/baseline/authenticationdialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'authenticationdialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -113,7 +113,6 @@ public:
         label_3->setText(QApplication::translate("Dialog", "Password:", 0, QApplication::UnicodeUTF8));
         label_4->setText(QApplication::translate("Dialog", "Site:", 0, QApplication::UnicodeUTF8));
         siteDescription->setText(QApplication::translate("Dialog", "%1 at %2", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Dialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/backside.ui.h b/tests/auto/uic/baseline/backside.ui.h
index 1660846..0fd710a 100644
--- a/tests/auto/uic/baseline/backside.ui.h
+++ b/tests/auto/uic/baseline/backside.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'backside.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -183,7 +183,6 @@ public:
         ___qtreewidgetitem11->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", 0, QApplication::UnicodeUTF8));
         treeWidget->setSortingEnabled(__sortingEnabled);
 
-        Q_UNUSED(BackSide);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/batchtranslation.ui.h b/tests/auto/uic/baseline/batchtranslation.ui.h
index 26315c4..6b0051f 100644
--- a/tests/auto/uic/baseline/batchtranslation.ui.h
+++ b/tests/auto/uic/baseline/batchtranslation.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'batchtranslation.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -240,7 +240,6 @@ public:
         label->setText(QApplication::translate("databaseTranslationDialog", "The batch translator will search through the selected phrasebooks in the order given above.", 0, QApplication::UnicodeUTF8));
         runButton->setText(QApplication::translate("databaseTranslationDialog", "&Run", 0, QApplication::UnicodeUTF8));
         cancelButton->setText(QApplication::translate("databaseTranslationDialog", "&Cancel", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(databaseTranslationDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/bookmarkdialog.ui.h b/tests/auto/uic/baseline/bookmarkdialog.ui.h
index 0c7764f..098614c 100644
--- a/tests/auto/uic/baseline/bookmarkdialog.ui.h
+++ b/tests/auto/uic/baseline/bookmarkdialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'bookmarkdialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -158,7 +158,6 @@ public:
         QTreeWidgetItem *___qtreewidgetitem = bookmarkWidget->headerItem();
         ___qtreewidgetitem->setText(0, QApplication::translate("BookmarkDialog", "1", 0, QApplication::UnicodeUTF8));
         newFolderButton->setText(QApplication::translate("BookmarkDialog", "New Folder", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(BookmarkDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/bookwindow.ui.h b/tests/auto/uic/baseline/bookwindow.ui.h
index 92639ec..e6c9280 100644
--- a/tests/auto/uic/baseline/bookwindow.ui.h
+++ b/tests/auto/uic/baseline/bookwindow.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'bookwindow.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -169,7 +169,6 @@ public:
         label_4->setText(QApplication::translate("BookWindow", "<b>Year:</b>", 0, QApplication::UnicodeUTF8));
         yearEdit->setPrefix(QString());
         label->setText(QApplication::translate("BookWindow", "<b>Rating:</b>", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(BookWindow);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/browserwidget.ui.h b/tests/auto/uic/baseline/browserwidget.ui.h
index 1a3a282..556d672 100644
--- a/tests/auto/uic/baseline/browserwidget.ui.h
+++ b/tests/auto/uic/baseline/browserwidget.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'browserwidget.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -169,7 +169,6 @@ public:
         groupBox->setTitle(QApplication::translate("Browser", "SQL Query", 0, QApplication::UnicodeUTF8));
         clearButton->setText(QApplication::translate("Browser", "&Clear", 0, QApplication::UnicodeUTF8));
         submitButton->setText(QApplication::translate("Browser", "&Submit", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Browser);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/calculator.ui.h b/tests/auto/uic/baseline/calculator.ui.h
index ace5f44..b2cf236 100644
--- a/tests/auto/uic/baseline/calculator.ui.h
+++ b/tests/auto/uic/baseline/calculator.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'calculator.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -188,7 +188,6 @@ public:
         powerButton->setText(QApplication::translate("Calculator", "x^2", 0, QApplication::UnicodeUTF8));
         reciprocalButton->setText(QApplication::translate("Calculator", "1/x", 0, QApplication::UnicodeUTF8));
         equalButton->setText(QApplication::translate("Calculator", "=", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Calculator);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/calculatorform.ui.h b/tests/auto/uic/baseline/calculatorform.ui.h
index 2a369c7..f2cf253 100644
--- a/tests/auto/uic/baseline/calculatorform.ui.h
+++ b/tests/auto/uic/baseline/calculatorform.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'calculatorform.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -181,7 +181,6 @@ public:
         label_3_2->setText(QApplication::translate("CalculatorForm", "=", 0, QApplication::UnicodeUTF8));
         label_2_2_2->setText(QApplication::translate("CalculatorForm", "Output", 0, QApplication::UnicodeUTF8));
         outputWidget->setText(QApplication::translate("CalculatorForm", "0", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(CalculatorForm);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/certificateinfo.ui.h b/tests/auto/uic/baseline/certificateinfo.ui.h
index 6d13787..53d54c4 100644
--- a/tests/auto/uic/baseline/certificateinfo.ui.h
+++ b/tests/auto/uic/baseline/certificateinfo.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'certificateinfo.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -97,7 +97,6 @@ public:
         CertificateInfo->setWindowTitle(QApplication::translate("CertificateInfo", "Display Certificate Information", 0, QApplication::UnicodeUTF8));
         groupBox->setTitle(QApplication::translate("CertificateInfo", "Certification Path", 0, QApplication::UnicodeUTF8));
         groupBox_2->setTitle(QApplication::translate("CertificateInfo", "Certificate Information", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(CertificateInfo);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/chatdialog.ui.h b/tests/auto/uic/baseline/chatdialog.ui.h
index ba1b99f..4152d36 100644
--- a/tests/auto/uic/baseline/chatdialog.ui.h
+++ b/tests/auto/uic/baseline/chatdialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'chatdialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -103,7 +103,6 @@ public:
     {
         ChatDialog->setWindowTitle(QApplication::translate("ChatDialog", "Chat", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("ChatDialog", "Message:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(ChatDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/chatmainwindow.ui.h b/tests/auto/uic/baseline/chatmainwindow.ui.h
index d4d4996..932f1dd 100644
--- a/tests/auto/uic/baseline/chatmainwindow.ui.h
+++ b/tests/auto/uic/baseline/chatmainwindow.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'chatmainwindow.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
diff --git a/tests/auto/uic/baseline/chatsetnickname.ui.h b/tests/auto/uic/baseline/chatsetnickname.ui.h
index 4b081b6..9a52aa5 100644
--- a/tests/auto/uic/baseline/chatsetnickname.ui.h
+++ b/tests/auto/uic/baseline/chatsetnickname.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'chatsetnickname.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -120,7 +120,6 @@ public:
         label->setText(QApplication::translate("NicknameDialog", "New nickname:", 0, QApplication::UnicodeUTF8));
         okButton->setText(QApplication::translate("NicknameDialog", "OK", 0, QApplication::UnicodeUTF8));
         cancelButton->setText(QApplication::translate("NicknameDialog", "Cancel", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(NicknameDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/config.ui.h b/tests/auto/uic/baseline/config.ui.h
index 17383f7..87a115b 100644
--- a/tests/auto/uic/baseline/config.ui.h
+++ b/tests/auto/uic/baseline/config.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'config.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -760,7 +760,6 @@ public:
         PushButton3->setText(QApplication::translate("Config", "Set all to 1.0", 0, QApplication::UnicodeUTF8));
         buttonOk->setText(QApplication::translate("Config", "&OK", 0, QApplication::UnicodeUTF8));
         buttonCancel->setText(QApplication::translate("Config", "&Cancel", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Config);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/connectdialog.ui.h b/tests/auto/uic/baseline/connectdialog.ui.h
index 880653e..ceafddc 100644
--- a/tests/auto/uic/baseline/connectdialog.ui.h
+++ b/tests/auto/uic/baseline/connectdialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'connectdialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:12 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -136,7 +136,6 @@ public:
         slotGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", 0, QApplication::UnicodeUTF8));
         editSlotsButton->setText(QApplication::translate("ConnectDialog", "Edit...", 0, QApplication::UnicodeUTF8));
         showAllCheckBox->setText(QApplication::translate("ConnectDialog", "Show signals and slots inherited from QWidget", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(ConnectDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/controller.ui.h b/tests/auto/uic/baseline/controller.ui.h
index 609c32c..583a353 100644
--- a/tests/auto/uic/baseline/controller.ui.h
+++ b/tests/auto/uic/baseline/controller.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'controller.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -85,7 +85,6 @@ public:
         accelerate->setText(QApplication::translate("Controller", "Accelerate", 0, QApplication::UnicodeUTF8));
         right->setText(QApplication::translate("Controller", "Right", 0, QApplication::UnicodeUTF8));
         left->setText(QApplication::translate("Controller", "Left", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Controller);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/cookies.ui.h b/tests/auto/uic/baseline/cookies.ui.h
index 5e0bf88..83946bb 100644
--- a/tests/auto/uic/baseline/cookies.ui.h
+++ b/tests/auto/uic/baseline/cookies.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'cookies.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -97,7 +97,6 @@ public:
         CookiesDialog->setWindowTitle(QApplication::translate("CookiesDialog", "Cookies", 0, QApplication::UnicodeUTF8));
         removeButton->setText(QApplication::translate("CookiesDialog", "&Remove", 0, QApplication::UnicodeUTF8));
         removeAllButton->setText(QApplication::translate("CookiesDialog", "Remove &All Cookies", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(CookiesDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/cookiesexceptions.ui.h b/tests/auto/uic/baseline/cookiesexceptions.ui.h
index 9eaf01c..2f4a7fb 100644
--- a/tests/auto/uic/baseline/cookiesexceptions.ui.h
+++ b/tests/auto/uic/baseline/cookiesexceptions.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'cookiesexceptions.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -170,7 +170,6 @@ public:
         ExceptionsGroupBox->setTitle(QApplication::translate("CookiesExceptionsDialog", "Exceptions", 0, QApplication::UnicodeUTF8));
         removeButton->setText(QApplication::translate("CookiesExceptionsDialog", "&Remove", 0, QApplication::UnicodeUTF8));
         removeAllButton->setText(QApplication::translate("CookiesExceptionsDialog", "Remove &All", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(CookiesExceptionsDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/default.ui.h b/tests/auto/uic/baseline/default.ui.h
index 093e7b4..4c6b489 100644
--- a/tests/auto/uic/baseline/default.ui.h
+++ b/tests/auto/uic/baseline/default.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'default.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
diff --git a/tests/auto/uic/baseline/dialog.ui.h b/tests/auto/uic/baseline/dialog.ui.h
index 95fa40b..cd92679 100644
--- a/tests/auto/uic/baseline/dialog.ui.h
+++ b/tests/auto/uic/baseline/dialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'dialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -66,7 +66,6 @@ public:
         loadFromFileButton->setText(QApplication::translate("Dialog", "Load Image From File...", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("Dialog", "Launch two of these dialogs.  In the first, press the top button and load an image from a file.  In the second, press the bottom button and display the loaded image from shared memory.", 0, QApplication::UnicodeUTF8));
         loadFromSharedMemoryButton->setText(QApplication::translate("Dialog", "Display Image From Shared Memory", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Dialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/downloaditem.ui.h b/tests/auto/uic/baseline/downloaditem.ui.h
index c211fa0..d856e20 100644
--- a/tests/auto/uic/baseline/downloaditem.ui.h
+++ b/tests/auto/uic/baseline/downloaditem.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'downloaditem.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -135,7 +135,6 @@ public:
         tryAgainButton->setText(QApplication::translate("DownloadItem", "Try Again", 0, QApplication::UnicodeUTF8));
         stopButton->setText(QApplication::translate("DownloadItem", "Stop", 0, QApplication::UnicodeUTF8));
         openButton->setText(QApplication::translate("DownloadItem", "Open", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(DownloadItem);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/downloads.ui.h b/tests/auto/uic/baseline/downloads.ui.h
index f5028c8..dd960d2 100644
--- a/tests/auto/uic/baseline/downloads.ui.h
+++ b/tests/auto/uic/baseline/downloads.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'downloads.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -85,7 +85,6 @@ public:
         DownloadDialog->setWindowTitle(QApplication::translate("DownloadDialog", "Downloads", 0, QApplication::UnicodeUTF8));
         cleanupButton->setText(QApplication::translate("DownloadDialog", "Clean up", 0, QApplication::UnicodeUTF8));
         itemCount->setText(QApplication::translate("DownloadDialog", "0 Items", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(DownloadDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/embeddeddialog.ui.h b/tests/auto/uic/baseline/embeddeddialog.ui.h
index 050f0ab..a6cfbb1 100644
--- a/tests/auto/uic/baseline/embeddeddialog.ui.h
+++ b/tests/auto/uic/baseline/embeddeddialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'embeddeddialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -109,7 +109,6 @@ public:
         label_2->setText(QApplication::translate("embeddedDialog", "Select Font:", 0, QApplication::UnicodeUTF8));
         label_3->setText(QApplication::translate("embeddedDialog", "Style:", 0, QApplication::UnicodeUTF8));
         label_4->setText(QApplication::translate("embeddedDialog", "Layout spacing:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(embeddedDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/filespage.ui.h b/tests/auto/uic/baseline/filespage.ui.h
index 3b4c156..12d8554 100644
--- a/tests/auto/uic/baseline/filespage.ui.h
+++ b/tests/auto/uic/baseline/filespage.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'filespage.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -88,7 +88,6 @@ public:
         fileLabel->setText(QApplication::translate("FilesPage", "Files:", 0, QApplication::UnicodeUTF8));
         removeButton->setText(QApplication::translate("FilesPage", "Remove", 0, QApplication::UnicodeUTF8));
         removeAllButton->setText(QApplication::translate("FilesPage", "Remove All", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(FilesPage);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/filternamedialog.ui.h b/tests/auto/uic/baseline/filternamedialog.ui.h
index 64713b4d..163a6d2 100644
--- a/tests/auto/uic/baseline/filternamedialog.ui.h
+++ b/tests/auto/uic/baseline/filternamedialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'filternamedialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -82,7 +82,6 @@ public:
     {
         FilterNameDialogClass->setWindowTitle(QApplication::translate("FilterNameDialogClass", "FilterNameDialog", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("FilterNameDialogClass", "Filter Name:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(FilterNameDialogClass);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/filterpage.ui.h b/tests/auto/uic/baseline/filterpage.ui.h
index 57beb6b..f3a2268 100644
--- a/tests/auto/uic/baseline/filterpage.ui.h
+++ b/tests/auto/uic/baseline/filterpage.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'filterpage.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -114,7 +114,6 @@ public:
         ___qtreewidgetitem->setText(0, QApplication::translate("FilterPage", "1", 0, QApplication::UnicodeUTF8));
         addButton->setText(QApplication::translate("FilterPage", "Add", 0, QApplication::UnicodeUTF8));
         removeButton->setText(QApplication::translate("FilterPage", "Remove", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(FilterPage);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/finddialog.ui.h b/tests/auto/uic/baseline/finddialog.ui.h
index 2c82b2f..56f810b 100644
--- a/tests/auto/uic/baseline/finddialog.ui.h
+++ b/tests/auto/uic/baseline/finddialog.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'finddialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -242,7 +242,6 @@ public:
         cancel->setWhatsThis(QApplication::translate("FindDialog", "Click here to close this window.", 0, QApplication::UnicodeUTF8));
 #endif // QT_NO_WHATSTHIS
         cancel->setText(QApplication::translate("FindDialog", "Cancel", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(FindDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/form.ui.h b/tests/auto/uic/baseline/form.ui.h
index 4edbc42..da2cecb 100644
--- a/tests/auto/uic/baseline/form.ui.h
+++ b/tests/auto/uic/baseline/form.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'form.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -130,7 +130,6 @@ public:
         WorldTimeForm->setWindowTitle(QApplication::translate("WorldTimeForm", "World Time Clock", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("WorldTimeForm", "Current time:", 0, QApplication::UnicodeUTF8));
         label_2->setText(QApplication::translate("WorldTimeForm", "Set time zone:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(WorldTimeForm);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/formwindowsettings.ui.h b/tests/auto/uic/baseline/formwindowsettings.ui.h
index 8836e6f..a35bd21 100644
--- a/tests/auto/uic/baseline/formwindowsettings.ui.h
+++ b/tests/auto/uic/baseline/formwindowsettings.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'formwindowsettings.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -299,7 +299,6 @@ public:
         includeHintsGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Include Hints", 0, QApplication::UnicodeUTF8));
         pixmapFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Pixmap Function", 0, QApplication::UnicodeUTF8));
         gridPanel->setTitle(QApplication::translate("FormWindowSettings", "Grid", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(FormWindowSettings);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/generalpage.ui.h b/tests/auto/uic/baseline/generalpage.ui.h
index ed72265..ecad723 100644
--- a/tests/auto/uic/baseline/generalpage.ui.h
+++ b/tests/auto/uic/baseline/generalpage.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'generalpage.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -80,7 +80,6 @@ public:
         GeneralPage->setWindowTitle(QApplication::translate("GeneralPage", "Form", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("GeneralPage", "Namespace:", 0, QApplication::UnicodeUTF8));
         label_2->setText(QApplication::translate("GeneralPage", "Virtual Folder:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(GeneralPage);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/gridpanel.ui.h b/tests/auto/uic/baseline/gridpanel.ui.h
index b722753..e60e22d 100644
--- a/tests/auto/uic/baseline/gridpanel.ui.h
+++ b/tests/auto/uic/baseline/gridpanel.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'gridpanel.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -144,7 +144,6 @@ public:
         m_resetButton->setText(QApplication::translate("qdesigner_internal::GridPanel", "Reset", 0, QApplication::UnicodeUTF8));
         label_2->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &Y", 0, QApplication::UnicodeUTF8));
         m_snapYCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(qdesigner_internal__GridPanel);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/helpdialog.ui.h b/tests/auto/uic/baseline/helpdialog.ui.h
index c53c08c..2b2cb45 100644
--- a/tests/auto/uic/baseline/helpdialog.ui.h
+++ b/tests/auto/uic/baseline/helpdialog.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'helpdialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -383,7 +383,6 @@ public:
         searchButton->setText(QApplication::translate("HelpDialog", "&Search", 0, QApplication::UnicodeUTF8));
         tabWidget->setTabText(tabWidget->indexOf(searchPage), QApplication::translate("HelpDialog", "&Search", 0, QApplication::UnicodeUTF8));
         labelPrepare->setText(QApplication::translate("HelpDialog", "Preparing...", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(HelpDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/history.ui.h b/tests/auto/uic/baseline/history.ui.h
index f151e53..8787279 100644
--- a/tests/auto/uic/baseline/history.ui.h
+++ b/tests/auto/uic/baseline/history.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'history.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -97,7 +97,6 @@ public:
         HistoryDialog->setWindowTitle(QApplication::translate("HistoryDialog", "History", 0, QApplication::UnicodeUTF8));
         removeButton->setText(QApplication::translate("HistoryDialog", "&Remove", 0, QApplication::UnicodeUTF8));
         removeAllButton->setText(QApplication::translate("HistoryDialog", "Remove &All", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(HistoryDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/identifierpage.ui.h b/tests/auto/uic/baseline/identifierpage.ui.h
index e60c277..d7e9cee 100644
--- a/tests/auto/uic/baseline/identifierpage.ui.h
+++ b/tests/auto/uic/baseline/identifierpage.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'identifierpage.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -97,7 +97,6 @@ public:
         identifierCheckBox->setText(QApplication::translate("IdentifierPage", "Create identifiers", 0, QApplication::UnicodeUTF8));
         globalButton->setText(QApplication::translate("IdentifierPage", "Global prefix:", 0, QApplication::UnicodeUTF8));
         fileNameButton->setText(QApplication::translate("IdentifierPage", "Inherit prefix from file names", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(IdentifierPage);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/imagedialog.ui.h b/tests/auto/uic/baseline/imagedialog.ui.h
index a22a85e..8011a22 100644
--- a/tests/auto/uic/baseline/imagedialog.ui.h
+++ b/tests/auto/uic/baseline/imagedialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'imagedialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -208,7 +208,6 @@ public:
         colorDepthLabel->setText(QApplication::translate("ImageDialog", "Color depth:", 0, QApplication::UnicodeUTF8));
         okButton->setText(QApplication::translate("ImageDialog", "OK", 0, QApplication::UnicodeUTF8));
         cancelButton->setText(QApplication::translate("ImageDialog", "Cancel", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(dialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/inputpage.ui.h b/tests/auto/uic/baseline/inputpage.ui.h
index 938eacb..0ca3cce 100644
--- a/tests/auto/uic/baseline/inputpage.ui.h
+++ b/tests/auto/uic/baseline/inputpage.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'inputpage.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -88,7 +88,6 @@ public:
         InputPage->setWindowTitle(QApplication::translate("InputPage", "Form", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("InputPage", "File name:", 0, QApplication::UnicodeUTF8));
         browseButton->setText(QApplication::translate("InputPage", "...", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(InputPage);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/installdialog.ui.h b/tests/auto/uic/baseline/installdialog.ui.h
index 1a7166d..9228e08 100644
--- a/tests/auto/uic/baseline/installdialog.ui.h
+++ b/tests/auto/uic/baseline/installdialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'installdialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -131,7 +131,6 @@ public:
         closeButton->setText(QApplication::translate("InstallDialog", "Close", 0, QApplication::UnicodeUTF8));
         label_4->setText(QApplication::translate("InstallDialog", "Installation Path:", 0, QApplication::UnicodeUTF8));
         browseButton->setText(QApplication::translate("InstallDialog", "...", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(InstallDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/languagesdialog.ui.h b/tests/auto/uic/baseline/languagesdialog.ui.h
index ffdc9c0..5062775 100644
--- a/tests/auto/uic/baseline/languagesdialog.ui.h
+++ b/tests/auto/uic/baseline/languagesdialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'languagesdialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -143,7 +143,6 @@ public:
 #endif // QT_NO_TOOLTIP
         openFileButton->setText(QApplication::translate("LanguagesDialog", "...", 0, QApplication::UnicodeUTF8));
         okButton->setText(QApplication::translate("LanguagesDialog", "OK", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(LanguagesDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui.h b/tests/auto/uic/baseline/listwidgeteditor.ui.h
index de4ee75..6600d41 100644
--- a/tests/auto/uic/baseline/listwidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/listwidgeteditor.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'listwidgeteditor.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -211,7 +211,6 @@ public:
 #endif // QT_NO_TOOLTIP
         moveItemDownButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "D", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Icon", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(qdesigner_internal__ListWidgetEditor);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/mainwindow.ui.h b/tests/auto/uic/baseline/mainwindow.ui.h
index 6a84b18..ae0a45d 100644
--- a/tests/auto/uic/baseline/mainwindow.ui.h
+++ b/tests/auto/uic/baseline/mainwindow.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'mainwindow.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:13 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
diff --git a/tests/auto/uic/baseline/mainwindowbase.ui.h b/tests/auto/uic/baseline/mainwindowbase.ui.h
index 39dc5ef..82e5dc4 100644
--- a/tests/auto/uic/baseline/mainwindowbase.ui.h
+++ b/tests/auto/uic/baseline/mainwindowbase.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'mainwindowbase.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
diff --git a/tests/auto/uic/baseline/mydialog.ui.h b/tests/auto/uic/baseline/mydialog.ui.h
index d3da712..6114cc3 100644
--- a/tests/auto/uic/baseline/mydialog.ui.h
+++ b/tests/auto/uic/baseline/mydialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'mydialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -65,7 +65,6 @@ public:
         aLabel->setText(QApplication::translate("MyDialog", "Join the life in the fastlane; - PCH enable your project today! -", 0, QApplication::UnicodeUTF8));
         aButton->setText(QApplication::translate("MyDialog", "&Quit", 0, QApplication::UnicodeUTF8));
         aButton->setShortcut(QApplication::translate("MyDialog", "Alt+Q", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(MyDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/myform.ui.h b/tests/auto/uic/baseline/myform.ui.h
index 45ed883..99e1cda 100644
--- a/tests/auto/uic/baseline/myform.ui.h
+++ b/tests/auto/uic/baseline/myform.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'myform.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -135,7 +135,6 @@ public:
         radioButton_4->setText(QApplication::translate("Form", "PD&F", 0, QApplication::UnicodeUTF8));
         checkBox_3->setText(QApplication::translate("Form", "Include &metadata", 0, QApplication::UnicodeUTF8));
         checkBox_4->setText(QApplication::translate("Form", "Create inde&x", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Form);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/newactiondialog.ui.h b/tests/auto/uic/baseline/newactiondialog.ui.h
index 5bc0caa..cb95793 100644
--- a/tests/auto/uic/baseline/newactiondialog.ui.h
+++ b/tests/auto/uic/baseline/newactiondialog.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'newactiondialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -180,7 +180,6 @@ public:
         label->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Text:", 0, QApplication::UnicodeUTF8));
         label_3->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "Object &name:", 0, QApplication::UnicodeUTF8));
         label_2->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Icon:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(qdesigner_internal__NewActionDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h b/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h
index 4ee3d98..9aafed4 100644
--- a/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h
+++ b/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'newdynamicpropertydialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -115,7 +115,6 @@ public:
         qdesigner_internal__NewDynamicPropertyDialog->setWindowTitle(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Create Dynamic Property", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Property Name", 0, QApplication::UnicodeUTF8));
         label_2->setText(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Property Type", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(qdesigner_internal__NewDynamicPropertyDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/newform.ui.h b/tests/auto/uic/baseline/newform.ui.h
index c46634a..07ebebc 100644
--- a/tests/auto/uic/baseline/newform.ui.h
+++ b/tests/auto/uic/baseline/newform.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'newform.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -153,7 +153,6 @@ public:
         ___qtreewidgetitem->setText(0, QApplication::translate("NewForm", "0", 0, QApplication::UnicodeUTF8));
         lblPreview->setText(QApplication::translate("NewForm", "Choose a template for a preview", 0, QApplication::UnicodeUTF8));
         chkShowOnStartup->setText(QApplication::translate("NewForm", "Show this Dialog on Startup", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(NewForm);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/orderdialog.ui.h b/tests/auto/uic/baseline/orderdialog.ui.h
index 36c884a..4608d37 100644
--- a/tests/auto/uic/baseline/orderdialog.ui.h
+++ b/tests/auto/uic/baseline/orderdialog.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'orderdialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -155,7 +155,6 @@ public:
 #ifndef QT_NO_TOOLTIP
         downButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page down", 0, QApplication::UnicodeUTF8));
 #endif // QT_NO_TOOLTIP
-        Q_UNUSED(qdesigner_internal__OrderDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/outputpage.ui.h b/tests/auto/uic/baseline/outputpage.ui.h
index 9f071f0..b10101f 100644
--- a/tests/auto/uic/baseline/outputpage.ui.h
+++ b/tests/auto/uic/baseline/outputpage.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'outputpage.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -94,7 +94,6 @@ public:
         OutputPage->setWindowTitle(QApplication::translate("OutputPage", "Form", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("OutputPage", "Project file name:", 0, QApplication::UnicodeUTF8));
         label_2->setText(QApplication::translate("OutputPage", "Collection file name:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(OutputPage);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/pagefold.ui.h b/tests/auto/uic/baseline/pagefold.ui.h
index d713985..3efad22 100644
--- a/tests/auto/uic/baseline/pagefold.ui.h
+++ b/tests/auto/uic/baseline/pagefold.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'pagefold.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
diff --git a/tests/auto/uic/baseline/paletteeditor.ui.h b/tests/auto/uic/baseline/paletteeditor.ui.h
index 7e4d970..4bd2384 100644
--- a/tests/auto/uic/baseline/paletteeditor.ui.h
+++ b/tests/auto/uic/baseline/paletteeditor.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'paletteeditor.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -223,7 +223,6 @@ public:
         disabledRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Disabled", 0, QApplication::UnicodeUTF8));
         inactiveRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Inactive", 0, QApplication::UnicodeUTF8));
         activeRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Active", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(qdesigner_internal__PaletteEditor);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
index d9733d2..557e95c 100644
--- a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
+++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'paletteeditoradvancedbase.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -428,7 +428,6 @@ public:
 #ifndef QT_NO_WHATSTHIS
         buttonCancel->setProperty("whatsThis", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "Close dialog and discard all changes.", 0, QApplication::UnicodeUTF8)));
 #endif // QT_NO_WHATSTHIS
-        Q_UNUSED(PaletteEditorAdvancedBase);
     } // retranslateUi
 
 
diff --git a/tests/auto/uic/baseline/passworddialog.ui.h b/tests/auto/uic/baseline/passworddialog.ui.h
index 83beeac..1cf2efc 100644
--- a/tests/auto/uic/baseline/passworddialog.ui.h
+++ b/tests/auto/uic/baseline/passworddialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'passworddialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -107,7 +107,6 @@ public:
         introLabel->setText(QApplication::translate("PasswordDialog", "INTRO TEXT DUMMY", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("PasswordDialog", "Username:", 0, QApplication::UnicodeUTF8));
         lblPassword->setText(QApplication::translate("PasswordDialog", "Password:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(PasswordDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/pathpage.ui.h b/tests/auto/uic/baseline/pathpage.ui.h
index 7c39073..cc7a990 100644
--- a/tests/auto/uic/baseline/pathpage.ui.h
+++ b/tests/auto/uic/baseline/pathpage.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'pathpage.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -113,7 +113,6 @@ public:
         label->setText(QApplication::translate("PathPage", "Documentation source file paths:", 0, QApplication::UnicodeUTF8));
         addButton->setText(QApplication::translate("PathPage", "Add", 0, QApplication::UnicodeUTF8));
         removeButton->setText(QApplication::translate("PathPage", "Remove", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(PathPage);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/phrasebookbox.ui.h b/tests/auto/uic/baseline/phrasebookbox.ui.h
index 5ca3425..75438cf 100644
--- a/tests/auto/uic/baseline/phrasebookbox.ui.h
+++ b/tests/auto/uic/baseline/phrasebookbox.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'phrasebookbox.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -232,7 +232,6 @@ public:
         closeBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to close this window.", 0, QApplication::UnicodeUTF8));
 #endif // QT_NO_WHATSTHIS
         closeBut->setText(QApplication::translate("PhraseBookBox", "Close", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(PhraseBookBox);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/plugindialog.ui.h b/tests/auto/uic/baseline/plugindialog.ui.h
index c140fbc..8c69d7c 100644
--- a/tests/auto/uic/baseline/plugindialog.ui.h
+++ b/tests/auto/uic/baseline/plugindialog.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'plugindialog.ui'
 **
-** Created: Tue Aug 18 19:03:31 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -132,7 +132,6 @@ public:
         QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem();
         ___qtreewidgetitem->setText(0, QApplication::translate("PluginDialog", "1", 0, QApplication::UnicodeUTF8));
         message->setText(QApplication::translate("PluginDialog", "TextLabel", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(PluginDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/preferencesdialog.ui.h b/tests/auto/uic/baseline/preferencesdialog.ui.h
index 56c5926..33b7e68 100644
--- a/tests/auto/uic/baseline/preferencesdialog.ui.h
+++ b/tests/auto/uic/baseline/preferencesdialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'preferencesdialog.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -159,7 +159,6 @@ public:
         m_templatePathGroupBox->setTitle(QApplication::translate("PreferencesDialog", "Additional Template Paths", 0, QApplication::UnicodeUTF8));
         m_addTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", 0, QApplication::UnicodeUTF8));
         m_removeTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(PreferencesDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/previewconfigurationwidget.ui.h b/tests/auto/uic/baseline/previewconfigurationwidget.ui.h
index cc56b4c..951792d 100644
--- a/tests/auto/uic/baseline/previewconfigurationwidget.ui.h
+++ b/tests/auto/uic/baseline/previewconfigurationwidget.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'previewconfigurationwidget.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -120,7 +120,6 @@ public:
         m_appStyleSheetClearButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", 0, QApplication::UnicodeUTF8));
         m_skinLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Device skin", 0, QApplication::UnicodeUTF8));
         m_skinRemoveButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(PreviewConfigurationWidget);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/previewdialogbase.ui.h b/tests/auto/uic/baseline/previewdialogbase.ui.h
index 4bb2980..4fe4501 100644
--- a/tests/auto/uic/baseline/previewdialogbase.ui.h
+++ b/tests/auto/uic/baseline/previewdialogbase.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'previewdialogbase.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -178,7 +178,6 @@ public:
         label_2->setText(QApplication::translate("PreviewDialogBase", "&Orientation:", 0, QApplication::UnicodeUTF8));
         QTreeWidgetItem *___qtreewidgetitem = pageList->headerItem();
         ___qtreewidgetitem->setText(0, QApplication::translate("PreviewDialogBase", "1", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(PreviewDialogBase);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/previewwidget.ui.h b/tests/auto/uic/baseline/previewwidget.ui.h
index c49bd4a..1357435 100644
--- a/tests/auto/uic/baseline/previewwidget.ui.h
+++ b/tests/auto/uic/baseline/previewwidget.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'previewwidget.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -265,7 +265,6 @@ public:
         RadioButton1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton1", 0, QApplication::UnicodeUTF8));
         RadioButton2->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton2", 0, QApplication::UnicodeUTF8));
         RadioButton3->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton3", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(qdesigner_internal__PreviewWidget);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/previewwidgetbase.ui.h b/tests/auto/uic/baseline/previewwidgetbase.ui.h
index 4acf569..66e72bd 100644
--- a/tests/auto/uic/baseline/previewwidgetbase.ui.h
+++ b/tests/auto/uic/baseline/previewwidgetbase.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'previewwidgetbase.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -303,7 +303,6 @@ public:
 "<p>\n"
 "<a href=\"http://www.kde.org\">http://www.kde.org</a>\n"
 "</p>", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(PreviewWidgetBase);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/proxy.ui.h b/tests/auto/uic/baseline/proxy.ui.h
index 3542966..19822a8 100644
--- a/tests/auto/uic/baseline/proxy.ui.h
+++ b/tests/auto/uic/baseline/proxy.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'proxy.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -96,7 +96,6 @@ public:
         introLabel->setText(QApplication::translate("ProxyDialog", "Connect to proxy", 0, QApplication::UnicodeUTF8));
         usernameLabel->setText(QApplication::translate("ProxyDialog", "Username:", 0, QApplication::UnicodeUTF8));
         passwordLabel->setText(QApplication::translate("ProxyDialog", "Password:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(ProxyDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/qfiledialog.ui.h b/tests/auto/uic/baseline/qfiledialog.ui.h
index e04a3c3..91b000a 100644
--- a/tests/auto/uic/baseline/qfiledialog.ui.h
+++ b/tests/auto/uic/baseline/qfiledialog.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qfiledialog.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
diff --git a/tests/auto/uic/baseline/qpagesetupwidget.ui.h b/tests/auto/uic/baseline/qpagesetupwidget.ui.h
index 93f5eb4..6d0a3b4 100644
--- a/tests/auto/uic/baseline/qpagesetupwidget.ui.h
+++ b/tests/auto/uic/baseline/qpagesetupwidget.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qpagesetupwidget.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -306,7 +306,6 @@ public:
 #ifndef QT_NO_ACCESSIBILITY
         bottomMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "bottom margin", 0, QApplication::UnicodeUTF8));
 #endif // QT_NO_ACCESSIBILITY
-        Q_UNUSED(QPageSetupWidget);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/qprintpropertieswidget.ui.h b/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
index a2c2e1f..512fcec 100644
--- a/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
+++ b/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qprintpropertieswidget.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -85,7 +85,6 @@ public:
         QPrintPropertiesWidget->setWindowTitle(QApplication::translate("QPrintPropertiesWidget", "Form", 0, QApplication::UnicodeUTF8));
         tabs->setTabText(tabs->indexOf(tabPage), QApplication::translate("QPrintPropertiesWidget", "Page", 0, QApplication::UnicodeUTF8));
         tabs->setTabText(tabs->indexOf(cupsPropertiesPage), QApplication::translate("QPrintPropertiesWidget", "Advanced", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QPrintPropertiesWidget);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/qprintsettingsoutput.ui.h b/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
index bb00a36..13ee6ee 100644
--- a/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
+++ b/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qprintsettingsoutput.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -299,7 +299,6 @@ public:
         duplexLong->setText(QApplication::translate("QPrintSettingsOutput", "Long side", 0, QApplication::UnicodeUTF8));
         duplexShort->setText(QApplication::translate("QPrintSettingsOutput", "Short side", 0, QApplication::UnicodeUTF8));
         tabs->setTabText(tabs->indexOf(optionsTab), QApplication::translate("QPrintSettingsOutput", "Options", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QPrintSettingsOutput);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/qprintwidget.ui.h b/tests/auto/uic/baseline/qprintwidget.ui.h
index 2600268..4437935 100644
--- a/tests/auto/uic/baseline/qprintwidget.ui.h
+++ b/tests/auto/uic/baseline/qprintwidget.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qprintwidget.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -153,7 +153,6 @@ public:
         label_3->setText(QApplication::translate("QPrintWidget", "Type:", 0, QApplication::UnicodeUTF8));
         lOutput->setText(QApplication::translate("QPrintWidget", "Output &file:", 0, QApplication::UnicodeUTF8));
         fileBrowser->setText(QApplication::translate("QPrintWidget", "...", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QPrintWidget);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h b/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
index 37297bf..ed428fd 100644
--- a/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
+++ b/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qsqlconnectiondialog.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -220,7 +220,6 @@ public:
         dbCheckBox->setText(QApplication::translate("QSqlConnectionDialogUi", "Us&e predefined in-memory database", 0, QApplication::UnicodeUTF8));
         okButton->setText(QApplication::translate("QSqlConnectionDialogUi", "&OK", 0, QApplication::UnicodeUTF8));
         cancelButton->setText(QApplication::translate("QSqlConnectionDialogUi", "&Cancel", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QSqlConnectionDialogUi);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/qtgradientdialog.ui.h b/tests/auto/uic/baseline/qtgradientdialog.ui.h
index f37606a..df41f89 100644
--- a/tests/auto/uic/baseline/qtgradientdialog.ui.h
+++ b/tests/auto/uic/baseline/qtgradientdialog.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qtgradientdialog.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -107,7 +107,6 @@ public:
     void retranslateUi(QDialog *QtGradientDialog)
     {
         QtGradientDialog->setWindowTitle(QApplication::translate("QtGradientDialog", "Edit Gradient", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QtGradientDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui b/tests/auto/uic/baseline/qtgradienteditor.ui
index 5e80a2d..5968960 100644
--- a/tests/auto/uic/baseline/qtgradienteditor.ui
+++ b/tests/auto/uic/baseline/qtgradienteditor.ui
@@ -2,40 +2,41 @@
  <comment>*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://qt.nokia.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
 **
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
 **
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
  <class>QtGradientEditor</class>
diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui.h b/tests/auto/uic/baseline/qtgradienteditor.ui.h
index e1365e4..d0c13bf 100644
--- a/tests/auto/uic/baseline/qtgradienteditor.ui.h
+++ b/tests/auto/uic/baseline/qtgradienteditor.ui.h
@@ -2,40 +2,41 @@
 *********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://qt.nokia.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
 **
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
 **
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
 **
 *********************************************************************
 */
@@ -43,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qtgradienteditor.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -712,7 +713,6 @@ public:
         reflectButton->setToolTip(QApplication::translate("QtGradientEditor", "Reflect Spread", 0, QApplication::UnicodeUTF8));
 #endif // QT_NO_TOOLTIP
         reflectButton->setText(QApplication::translate("QtGradientEditor", "...", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QtGradientEditor);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/qtgradientview.ui.h b/tests/auto/uic/baseline/qtgradientview.ui.h
index d929d6f..6787c8d 100644
--- a/tests/auto/uic/baseline/qtgradientview.ui.h
+++ b/tests/auto/uic/baseline/qtgradientview.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qtgradientview.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -114,7 +114,6 @@ public:
         editButton->setText(QApplication::translate("QtGradientView", "Edit...", 0, QApplication::UnicodeUTF8));
         renameButton->setText(QApplication::translate("QtGradientView", "Rename", 0, QApplication::UnicodeUTF8));
         removeButton->setText(QApplication::translate("QtGradientView", "Remove", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QtGradientView);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
index e67fffe..23adf0e 100644
--- a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
+++ b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qtgradientviewdialog.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -107,7 +107,6 @@ public:
     void retranslateUi(QDialog *QtGradientViewDialog)
     {
         QtGradientViewDialog->setWindowTitle(QApplication::translate("QtGradientViewDialog", "Select Gradient", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QtGradientViewDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/qtresourceeditordialog.ui.h b/tests/auto/uic/baseline/qtresourceeditordialog.ui.h
index de52a62..d434af7 100644
--- a/tests/auto/uic/baseline/qtresourceeditordialog.ui.h
+++ b/tests/auto/uic/baseline/qtresourceeditordialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qtresourceeditordialog.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -163,7 +163,6 @@ public:
         removeResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove Resource or File", 0, QApplication::UnicodeUTF8));
 #endif // QT_NO_TOOLTIP
         removeResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "R", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QtResourceEditorDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/qttoolbardialog.ui.h b/tests/auto/uic/baseline/qttoolbardialog.ui.h
index 5651abc..35a40c3 100644
--- a/tests/auto/uic/baseline/qttoolbardialog.ui.h
+++ b/tests/auto/uic/baseline/qttoolbardialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qttoolbardialog.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -215,7 +215,6 @@ public:
 #endif // QT_NO_TOOLTIP
         downButton->setText(QApplication::translate("QtToolBarDialog", "Down", 0, QApplication::UnicodeUTF8));
         label_3->setText(QApplication::translate("QtToolBarDialog", "Current Toolbar Actions", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QtToolBarDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/querywidget.ui.h b/tests/auto/uic/baseline/querywidget.ui.h
index e078ed4..c628457 100644
--- a/tests/auto/uic/baseline/querywidget.ui.h
+++ b/tests/auto/uic/baseline/querywidget.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'querywidget.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -161,7 +161,6 @@ public:
         inputGroupBox->setTitle(QApplication::translate("QueryWidget", "Input Document", 0, QApplication::UnicodeUTF8));
         queryGroupBox->setTitle(QApplication::translate("QueryWidget", "Select your query:", 0, QApplication::UnicodeUTF8));
         outputGroupBox->setTitle(QApplication::translate("QueryWidget", "Output Document", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QueryWidget);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/remotecontrol.ui.h b/tests/auto/uic/baseline/remotecontrol.ui.h
index eb7adc9..b970fca 100644
--- a/tests/auto/uic/baseline/remotecontrol.ui.h
+++ b/tests/auto/uic/baseline/remotecontrol.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'remotecontrol.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
diff --git a/tests/auto/uic/baseline/saveformastemplate.ui.h b/tests/auto/uic/baseline/saveformastemplate.ui.h
index d098c78..08d5983 100644
--- a/tests/auto/uic/baseline/saveformastemplate.ui.h
+++ b/tests/auto/uic/baseline/saveformastemplate.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'saveformastemplate.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -152,7 +152,6 @@ public:
         label->setText(QApplication::translate("SaveFormAsTemplate", "&Name:", 0, QApplication::UnicodeUTF8));
         templateNameEdit->setText(QString());
         label_2->setText(QApplication::translate("SaveFormAsTemplate", "&Category:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(SaveFormAsTemplate);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/settings.ui.h b/tests/auto/uic/baseline/settings.ui.h
index 7df5c77..e09b7df 100644
--- a/tests/auto/uic/baseline/settings.ui.h
+++ b/tests/auto/uic/baseline/settings.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'settings.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -193,7 +193,6 @@ public:
         label_3->setText(QApplication::translate("Dialog", "-10 Sec", 0, QApplication::UnicodeUTF8));
         label_5->setText(QApplication::translate("Dialog", "0", 0, QApplication::UnicodeUTF8));
         label_4->setText(QApplication::translate("Dialog", "10 Sec", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Dialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/signalslotdialog.ui.h b/tests/auto/uic/baseline/signalslotdialog.ui.h
index f7e9820..7bbe74c 100644
--- a/tests/auto/uic/baseline/signalslotdialog.ui.h
+++ b/tests/auto/uic/baseline/signalslotdialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'signalslotdialog.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -156,7 +156,6 @@ public:
         removeSignalButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Delete", 0, QApplication::UnicodeUTF8));
 #endif // QT_NO_TOOLTIP
         removeSignalButton->setText(QApplication::translate("SignalSlotDialogClass", "...", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(SignalSlotDialogClass);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/sslclient.ui.h b/tests/auto/uic/baseline/sslclient.ui.h
index bf4014d..ef32462 100644
--- a/tests/auto/uic/baseline/sslclient.ui.h
+++ b/tests/auto/uic/baseline/sslclient.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'sslclient.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -171,7 +171,6 @@ public:
 "<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;\"></p></body></html>", 0, QApplication::UnicodeUTF8));
         sessionInputLabel->setText(QApplication::translate("Form", "Input:", 0, QApplication::UnicodeUTF8));
         sendButton->setText(QApplication::translate("Form", "&Send", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Form);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/sslerrors.ui.h b/tests/auto/uic/baseline/sslerrors.ui.h
index 3131a21..ef83595 100644
--- a/tests/auto/uic/baseline/sslerrors.ui.h
+++ b/tests/auto/uic/baseline/sslerrors.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'sslerrors.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -98,7 +98,6 @@ public:
         certificateChainButton->setText(QApplication::translate("SslErrors", "View Certificate Chain", 0, QApplication::UnicodeUTF8));
         pushButton->setText(QApplication::translate("SslErrors", "Ignore", 0, QApplication::UnicodeUTF8));
         pushButton_2->setText(QApplication::translate("SslErrors", "Cancel", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(SslErrors);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/statistics.ui.h b/tests/auto/uic/baseline/statistics.ui.h
index 9e0336b..baab39b 100644
--- a/tests/auto/uic/baseline/statistics.ui.h
+++ b/tests/auto/uic/baseline/statistics.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'statistics.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -209,7 +209,6 @@ public:
         textLabel6->setText(QApplication::translate("Statistics", "Characters (with spaces):", 0, QApplication::UnicodeUTF8));
         trCharsSpc->setText(QApplication::translate("Statistics", "0", 0, QApplication::UnicodeUTF8));
         untrCharsSpc->setText(QApplication::translate("Statistics", "0", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Statistics);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/stringlisteditor.ui.h b/tests/auto/uic/baseline/stringlisteditor.ui.h
index cbe3cd5..9d86eba 100644
--- a/tests/auto/uic/baseline/stringlisteditor.ui.h
+++ b/tests/auto/uic/baseline/stringlisteditor.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'stringlisteditor.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -250,7 +250,6 @@ public:
         downButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Down", 0, QApplication::UnicodeUTF8));
 #endif // QT_NO_TOOLTIP
         downButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Down", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(qdesigner_internal__Dialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/stylesheeteditor.ui.h b/tests/auto/uic/baseline/stylesheeteditor.ui.h
index 697fbe0..ea635a1 100644
--- a/tests/auto/uic/baseline/stylesheeteditor.ui.h
+++ b/tests/auto/uic/baseline/stylesheeteditor.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'stylesheeteditor.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:14 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -141,7 +141,6 @@ public:
         label_7->setText(QApplication::translate("StyleSheetEditor", "Style:", 0, QApplication::UnicodeUTF8));
         applyButton->setText(QApplication::translate("StyleSheetEditor", "&Apply", 0, QApplication::UnicodeUTF8));
         label_8->setText(QApplication::translate("StyleSheetEditor", "Style Sheet:", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(StyleSheetEditor);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui.h b/tests/auto/uic/baseline/tabbedbrowser.ui.h
index d188a2e..0062569 100644
--- a/tests/auto/uic/baseline/tabbedbrowser.ui.h
+++ b/tests/auto/uic/baseline/tabbedbrowser.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'tabbedbrowser.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -205,7 +205,6 @@ public:
         checkCase->setText(QApplication::translate("TabbedBrowser", "Case Sensitive", 0, QApplication::UnicodeUTF8));
         checkWholeWords->setText(QApplication::translate("TabbedBrowser", "Whole words", 0, QApplication::UnicodeUTF8));
         labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/trolltech/assistant/images/wrap.png\">&nbsp;Search wrapped", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(TabbedBrowser);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
index 6d79a34..5e7c8a0 100644
--- a/tests/auto/uic/baseline/tablewidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'tablewidgeteditor.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -375,7 +375,6 @@ public:
 #endif // QT_NO_TOOLTIP
         moveRowDownButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "D", 0, QApplication::UnicodeUTF8));
         label_2->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(qdesigner_internal__TableWidgetEditor);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/tetrixwindow.ui.h b/tests/auto/uic/baseline/tetrixwindow.ui.h
index b6b048b..cd2f2cf 100644
--- a/tests/auto/uic/baseline/tetrixwindow.ui.h
+++ b/tests/auto/uic/baseline/tetrixwindow.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'tetrixwindow.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -160,7 +160,6 @@ public:
         scoreLabel->setText(QApplication::translate("TetrixWindow", "SCORE", 0, QApplication::UnicodeUTF8));
         nextPieceLabel->setText(QString());
         quitButton->setText(QApplication::translate("TetrixWindow", "&Quit", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(TetrixWindow);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/textfinder.ui.h b/tests/auto/uic/baseline/textfinder.ui.h
index 62c2447..2b21412 100644
--- a/tests/auto/uic/baseline/textfinder.ui.h
+++ b/tests/auto/uic/baseline/textfinder.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'textfinder.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -100,7 +100,6 @@ public:
         Form->setWindowTitle(QApplication::translate("Form", "Find Text", 0, QApplication::UnicodeUTF8));
         searchLabel->setText(QApplication::translate("Form", "&Keyword:", 0, QApplication::UnicodeUTF8));
         findButton->setText(QApplication::translate("Form", "&Find", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(Form);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/topicchooser.ui.h b/tests/auto/uic/baseline/topicchooser.ui.h
index 9c4cdf0..04ceede 100644
--- a/tests/auto/uic/baseline/topicchooser.ui.h
+++ b/tests/auto/uic/baseline/topicchooser.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'topicchooser.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -106,7 +106,6 @@ public:
         label->setText(QApplication::translate("TopicChooser", "&Topics", 0, QApplication::UnicodeUTF8));
         buttonDisplay->setText(QApplication::translate("TopicChooser", "&Display", 0, QApplication::UnicodeUTF8));
         buttonCancel->setText(QApplication::translate("TopicChooser", "&Close", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(TopicChooser);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/translatedialog.ui.h b/tests/auto/uic/baseline/translatedialog.ui.h
index b4c1fb8..d8f340e 100644
--- a/tests/auto/uic/baseline/translatedialog.ui.h
+++ b/tests/auto/uic/baseline/translatedialog.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'translatedialog.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -248,7 +248,6 @@ public:
         cancel->setWhatsThis(QApplication::translate("TranslateDialog", "Click here to close this window.", 0, QApplication::UnicodeUTF8));
 #endif // QT_NO_WHATSTHIS
         cancel->setText(QApplication::translate("TranslateDialog", "Cancel", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(TranslateDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/translationsettings.ui.h b/tests/auto/uic/baseline/translationsettings.ui.h
index d0f5257..2105b09 100644
--- a/tests/auto/uic/baseline/translationsettings.ui.h
+++ b/tests/auto/uic/baseline/translationsettings.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'translationsettings.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -107,7 +107,6 @@ public:
         groupBox->setTitle(QApplication::translate("TranslationSettings", "Target language", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("TranslationSettings", "Language", 0, QApplication::UnicodeUTF8));
         lblCountry->setText(QApplication::translate("TranslationSettings", "Country/Region", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(TranslationSettings);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/treewidgeteditor.ui.h b/tests/auto/uic/baseline/treewidgeteditor.ui.h
index bb2f94e..635fef6 100644
--- a/tests/auto/uic/baseline/treewidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/treewidgeteditor.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'treewidgeteditor.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -349,7 +349,6 @@ public:
 #endif // QT_NO_TOOLTIP
         moveColumnDownButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "D", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Icon", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(qdesigner_internal__TreeWidgetEditor);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/trpreviewtool.ui.h b/tests/auto/uic/baseline/trpreviewtool.ui.h
index c3dd6db..0c7d58f 100644
--- a/tests/auto/uic/baseline/trpreviewtool.ui.h
+++ b/tests/auto/uic/baseline/trpreviewtool.ui.h
@@ -44,7 +44,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'trpreviewtool.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
diff --git a/tests/auto/uic/baseline/validators.ui.h b/tests/auto/uic/baseline/validators.ui.h
index c82cac5..27b5482 100644
--- a/tests/auto/uic/baseline/validators.ui.h
+++ b/tests/auto/uic/baseline/validators.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'validators.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -395,7 +395,6 @@ public:
         doubleLedWidget->setText(QString());
         label_8->setText(QApplication::translate("ValidatorsForm", "editingFinished()", 0, QApplication::UnicodeUTF8));
         pushButton->setText(QApplication::translate("ValidatorsForm", "Quit", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(ValidatorsForm);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic/baseline/wateringconfigdialog.ui.h b/tests/auto/uic/baseline/wateringconfigdialog.ui.h
index 0bac30d..9e586f0 100644
--- a/tests/auto/uic/baseline/wateringconfigdialog.ui.h
+++ b/tests/auto/uic/baseline/wateringconfigdialog.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'wateringconfigdialog.ui'
 **
-** Created: Tue Aug 18 19:03:32 2009
+** Created: Fri Sep 4 10:17:15 2009
 **      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -276,7 +276,6 @@ public:
         label_6->setText(QApplication::translate("WateringConfigDialog", "Filter:", 0, QApplication::UnicodeUTF8));
         filterCheckBox->setText(QString());
         helpLabel->setText(QApplication::translate("WateringConfigDialog", "<a href=\"test\">Show Details</a>", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(WateringConfigDialog);
     } // retranslateUi
 
 };
diff --git a/tests/auto/uic3/baseline/about.ui b/tests/auto/uic3/baseline/about.ui
index 235882c..efab747 100644
--- a/tests/auto/uic3/baseline/about.ui
+++ b/tests/auto/uic3/baseline/about.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/about.ui.4 b/tests/auto/uic3/baseline/about.ui.4
index c93082f..5bde9f3 100644
--- a/tests/auto/uic3/baseline/about.ui.4
+++ b/tests/auto/uic3/baseline/about.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/actioneditor.ui b/tests/auto/uic3/baseline/actioneditor.ui
index c1ce225..ae77770 100644
--- a/tests/auto/uic3/baseline/actioneditor.ui
+++ b/tests/auto/uic3/baseline/actioneditor.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/actioneditor.ui.4 b/tests/auto/uic3/baseline/actioneditor.ui.4
index 2a03695..93f13bb 100644
--- a/tests/auto/uic3/baseline/actioneditor.ui.4
+++ b/tests/auto/uic3/baseline/actioneditor.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/config.ui b/tests/auto/uic3/baseline/config.ui
index 85854f0..38041a4 100644
--- a/tests/auto/uic3/baseline/config.ui
+++ b/tests/auto/uic3/baseline/config.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/config.ui.4 b/tests/auto/uic3/baseline/config.ui.4
index 93f3a71..f13e82c 100644
--- a/tests/auto/uic3/baseline/config.ui.4
+++ b/tests/auto/uic3/baseline/config.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/configtoolboxdialog.ui b/tests/auto/uic3/baseline/configtoolboxdialog.ui
index b4bc26a..67246b9 100644
--- a/tests/auto/uic3/baseline/configtoolboxdialog.ui
+++ b/tests/auto/uic3/baseline/configtoolboxdialog.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/configtoolboxdialog.ui.4 b/tests/auto/uic3/baseline/configtoolboxdialog.ui.4
index 61d51b9..fe46a51 100644
--- a/tests/auto/uic3/baseline/configtoolboxdialog.ui.4
+++ b/tests/auto/uic3/baseline/configtoolboxdialog.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/connectiondialog.ui b/tests/auto/uic3/baseline/connectiondialog.ui
index 6c0ba01..3382bfb 100644
--- a/tests/auto/uic3/baseline/connectiondialog.ui
+++ b/tests/auto/uic3/baseline/connectiondialog.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/connectiondialog.ui.4 b/tests/auto/uic3/baseline/connectiondialog.ui.4
index b86d485..dd9c304 100644
--- a/tests/auto/uic3/baseline/connectiondialog.ui.4
+++ b/tests/auto/uic3/baseline/connectiondialog.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/createtemplate.ui b/tests/auto/uic3/baseline/createtemplate.ui
index a33aba1..2b737ae 100644
--- a/tests/auto/uic3/baseline/createtemplate.ui
+++ b/tests/auto/uic3/baseline/createtemplate.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/createtemplate.ui.4 b/tests/auto/uic3/baseline/createtemplate.ui.4
index dfff4a3..2fb4443 100644
--- a/tests/auto/uic3/baseline/createtemplate.ui.4
+++ b/tests/auto/uic3/baseline/createtemplate.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/customwidgeteditor.ui b/tests/auto/uic3/baseline/customwidgeteditor.ui
index aefec1e..560c81a 100644
--- a/tests/auto/uic3/baseline/customwidgeteditor.ui
+++ b/tests/auto/uic3/baseline/customwidgeteditor.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/customwidgeteditor.ui.4 b/tests/auto/uic3/baseline/customwidgeteditor.ui.4
index 0509247..5c740df 100644
--- a/tests/auto/uic3/baseline/customwidgeteditor.ui.4
+++ b/tests/auto/uic3/baseline/customwidgeteditor.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/dbconnection.ui b/tests/auto/uic3/baseline/dbconnection.ui
index 7de1d28..0065442 100644
--- a/tests/auto/uic3/baseline/dbconnection.ui
+++ b/tests/auto/uic3/baseline/dbconnection.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/dbconnection.ui.4 b/tests/auto/uic3/baseline/dbconnection.ui.4
index 4f845d4..14bdf4d 100644
--- a/tests/auto/uic3/baseline/dbconnection.ui.4
+++ b/tests/auto/uic3/baseline/dbconnection.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/dbconnectioneditor.ui b/tests/auto/uic3/baseline/dbconnectioneditor.ui
index 8bd907a..9a4a073 100644
--- a/tests/auto/uic3/baseline/dbconnectioneditor.ui
+++ b/tests/auto/uic3/baseline/dbconnectioneditor.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/dbconnectioneditor.ui.4 b/tests/auto/uic3/baseline/dbconnectioneditor.ui.4
index 99c15a9..fd4aff6 100644
--- a/tests/auto/uic3/baseline/dbconnectioneditor.ui.4
+++ b/tests/auto/uic3/baseline/dbconnectioneditor.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/dbconnections.ui b/tests/auto/uic3/baseline/dbconnections.ui
index 2a79f37..2d081b3 100644
--- a/tests/auto/uic3/baseline/dbconnections.ui
+++ b/tests/auto/uic3/baseline/dbconnections.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/dbconnections.ui.4 b/tests/auto/uic3/baseline/dbconnections.ui.4
index 8ac4069..0c9d487 100644
--- a/tests/auto/uic3/baseline/dbconnections.ui.4
+++ b/tests/auto/uic3/baseline/dbconnections.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/editfunctions.ui b/tests/auto/uic3/baseline/editfunctions.ui
index 1fa334f..4133c59 100644
--- a/tests/auto/uic3/baseline/editfunctions.ui
+++ b/tests/auto/uic3/baseline/editfunctions.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/editfunctions.ui.4 b/tests/auto/uic3/baseline/editfunctions.ui.4
index 09a9ed1..a8f83cc 100644
--- a/tests/auto/uic3/baseline/editfunctions.ui.4
+++ b/tests/auto/uic3/baseline/editfunctions.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/finddialog.ui b/tests/auto/uic3/baseline/finddialog.ui
index 41b3b7f..580a6e1 100644
--- a/tests/auto/uic3/baseline/finddialog.ui
+++ b/tests/auto/uic3/baseline/finddialog.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/finddialog.ui.4 b/tests/auto/uic3/baseline/finddialog.ui.4
index 6e663e4..6f0318f 100644
--- a/tests/auto/uic3/baseline/finddialog.ui.4
+++ b/tests/auto/uic3/baseline/finddialog.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/formsettings.ui b/tests/auto/uic3/baseline/formsettings.ui
index 903bcbc..f05fc04 100644
--- a/tests/auto/uic3/baseline/formsettings.ui
+++ b/tests/auto/uic3/baseline/formsettings.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/formsettings.ui.4 b/tests/auto/uic3/baseline/formsettings.ui.4
index 9c1baf0..6e121c7 100644
--- a/tests/auto/uic3/baseline/formsettings.ui.4
+++ b/tests/auto/uic3/baseline/formsettings.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/gotolinedialog.ui b/tests/auto/uic3/baseline/gotolinedialog.ui
index f6265be..1b744a3 100644
--- a/tests/auto/uic3/baseline/gotolinedialog.ui
+++ b/tests/auto/uic3/baseline/gotolinedialog.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/gotolinedialog.ui.4 b/tests/auto/uic3/baseline/gotolinedialog.ui.4
index 3837b90..21d2bd5 100644
--- a/tests/auto/uic3/baseline/gotolinedialog.ui.4
+++ b/tests/auto/uic3/baseline/gotolinedialog.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/helpdialog.ui b/tests/auto/uic3/baseline/helpdialog.ui
index 711de5d..b4281a4 100644
--- a/tests/auto/uic3/baseline/helpdialog.ui
+++ b/tests/auto/uic3/baseline/helpdialog.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/helpdialog.ui.4 b/tests/auto/uic3/baseline/helpdialog.ui.4
index 50adfb6..4fb35aa 100644
--- a/tests/auto/uic3/baseline/helpdialog.ui.4
+++ b/tests/auto/uic3/baseline/helpdialog.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/iconvieweditor.ui b/tests/auto/uic3/baseline/iconvieweditor.ui
index a558d19..0cc6e46 100644
--- a/tests/auto/uic3/baseline/iconvieweditor.ui
+++ b/tests/auto/uic3/baseline/iconvieweditor.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/iconvieweditor.ui.4 b/tests/auto/uic3/baseline/iconvieweditor.ui.4
index f8efc55..e0a129f 100644
--- a/tests/auto/uic3/baseline/iconvieweditor.ui.4
+++ b/tests/auto/uic3/baseline/iconvieweditor.ui.4
@@ -6,7 +6,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/listboxeditor.ui b/tests/auto/uic3/baseline/listboxeditor.ui
index b562f51..34bafea 100644
--- a/tests/auto/uic3/baseline/listboxeditor.ui
+++ b/tests/auto/uic3/baseline/listboxeditor.ui
@@ -5,7 +5,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/uic3/baseline/wizardeditor.ui b/tests/auto/uic3/baseline/wizardeditor.ui
index 2a32879..7dfd82f 100644
--- a/tests/auto/uic3/baseline/wizardeditor.ui
+++ b/tests/auto/uic3/baseline/wizardeditor.ui
@@ -1,35 +1,43 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>WizardEditorBase</class>
 <comment>*********************************************************************
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).  All rights reserved.
 **
-** This file is part of Qt Designer.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free
-** Software Foundation and appearing in the files LICENSE.GPL2
-** and LICENSE.GPL3 included in the packaging of this file.
-** Alternatively you may (at your option) use any later version
-** of the GNU General Public License if such license has been
-** publicly approved by Nokia Corporation and/or its subsidiary(-ies) (or its successors, if any)
-** and the KDE Free Qt Foundation.
+** This file is part of the test suite of the Qt Toolkit.
 **
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/.
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with
-** the Software.
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
-** herein.
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
 <widget class="QDialog">
diff --git a/tests/auto/uiloader/baseline/css_tab_border.ui b/tests/auto/uiloader/baseline/css_tab_border.ui
new file mode 100644
index 0000000..cefb9d8
--- /dev/null
+++ b/tests/auto/uiloader/baseline/css_tab_border.ui
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>379</width>
+    <height>277</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">#tabWidget QTabBar::tab {
+     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                 stop: 0 #E1E1E1, stop: 0.4 #DDDDDD,
+                                 stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
+     border: 2px solid #C4C4C3;
+     border-bottom-color: #C2C7CB; /* same as the pane color */
+     border-top-left-radius: 4px;
+     border-top-right-radius: 4px;
+     padding: 2px;
+ }
+
+#tabWidget_2 QTabBar::tab {
+     border: 3px solid red;
+ }
+
+#tabWidget_3 QTabBar::tab {
+     margin: 5px;
+ }
+
+
+</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>1</number>
+     </property>
+     <property name="tabsClosable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Tab 1</string>
+      </attribute>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>Tab 2</string>
+      </attribute>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTabWidget" name="tabWidget_2">
+     <property name="currentIndex">
+      <number>1</number>
+     </property>
+     <property name="tabsClosable">
+      <bool>false</bool>
+     </property>
+     <widget class="QWidget" name="tab_3">
+      <attribute name="title">
+       <string>Tab 1</string>
+      </attribute>
+     </widget>
+     <widget class="QWidget" name="tab_4">
+      <attribute name="title">
+       <string>Tab 2</string>
+      </attribute>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTabWidget" name="tabWidget_3">
+     <property name="currentIndex">
+      <number>1</number>
+     </property>
+     <property name="tabsClosable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="tab_5">
+      <attribute name="title">
+       <string>Tab 1</string>
+      </attribute>
+     </widget>
+     <widget class="QWidget" name="tab_6">
+      <attribute name="title">
+       <string>Tab 2</string>
+      </attribute>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh b/tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh
index 13b3d51..fba1c82 100755
--- a/tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh
+++ b/tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh
@@ -1,3 +1,44 @@
 #!/usr/bin/env bash
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 set p4Where `p4 where //depot/autotests/4.4/tests/auto/xmlpatternsxqts/XQTS/XQTSCatalog.xsd`
 xmllint --xinclude --noout --schema $4 DiagnosticsCatalog.xml
diff --git a/tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh b/tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh
index 28c22a8..7015f76 100755
--- a/tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh
+++ b/tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh
@@ -1,4 +1,44 @@
 #!/bin/bash
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script updates the suite from W3C's server.
 #
diff --git a/tests/auto/xmlpatternsxqts/summarizeBaseline.sh b/tests/auto/xmlpatternsxqts/summarizeBaseline.sh
index 6aeddf7..da24c76 100755
--- a/tests/auto/xmlpatternsxqts/summarizeBaseline.sh
+++ b/tests/auto/xmlpatternsxqts/summarizeBaseline.sh
@@ -1,4 +1,44 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 if [ $# -ne 1 ]; then
     echo "You need to pass in one argument: the file path to Baseline.xml which you want the summary for."
diff --git a/tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh b/tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh
index 11315bc..0df5a1a 100755
--- a/tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh
+++ b/tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh
@@ -1,3 +1,45 @@
+#!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 # This script updates the suite from W3C's CVS server.
 #
 # NOTE: the files checked out CANNOT be added to Qt's
diff --git a/tests/benchmarks/qfile/main.cpp b/tests/benchmarks/qfile/main.cpp
index 82e6562..376412c 100644
--- a/tests/benchmarks/qfile/main.cpp
+++ b/tests/benchmarks/qfile/main.cpp
@@ -3,11 +3,6 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-****************************************************************************/
-
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
@@ -43,6 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #include <QDebug>
 #include <QTemporaryFile>
 #include <QFSFileEngine>
diff --git a/tests/benchmarks/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/benchmarks/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index e419bae..986ceb6 100644
--- a/tests/benchmarks/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/benchmarks/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -3,14 +3,14 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtOpenGL module of the Qt Toolkit.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** contained in the Technology Preview License Agreement accompanying
+** this package.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ** package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp b/tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp
index b4c8202..c72bc27 100644
--- a/tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp
+++ b/tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp
@@ -171,9 +171,9 @@ void tst_QMatrix4x4::multiplyDirect()
 
     QMatrix4x4 m3;
 
-    const float *m1data = m1.constData();
-    const float *m2data = m2.constData();
-    float *m3data = m3.data();
+    const qreal *m1data = m1.constData();
+    const qreal *m2data = m2.constData();
+    qreal *m3data = m3.data();
 
     QBENCHMARK {
         for (int row = 0; row < 4; ++row) {
@@ -266,9 +266,9 @@ void tst_QMatrix4x4::mapVectorDirect()
 {
     QFETCH(QMatrix4x4, m1);
 
-    const float *m1data = m1.constData();
-    float v[4] = {10.5f, -2.0f, 3.0f, 1.0f};
-    float result[4];
+    const qreal *m1data = m1.constData();
+    qreal v[4] = {10.5f, -2.0f, 3.0f, 1.0f};
+    qreal result[4];
 
     QBENCHMARK {
         for (int row = 0; row < 4; ++row) {
diff --git a/tests/benchmarks/qscriptclass/qscriptclass.pro b/tests/benchmarks/qscriptclass/qscriptclass.pro
new file mode 100644
index 0000000..f0ffeb7
--- /dev/null
+++ b/tests/benchmarks/qscriptclass/qscriptclass.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_qscriptclass
+
+SOURCES += tst_qscriptclass.cpp
+
+QT += script
diff --git a/tests/benchmarks/qscriptclass/tst_qscriptclass.cpp b/tests/benchmarks/qscriptclass/tst_qscriptclass.cpp
new file mode 100644
index 0000000..7c2bd22
--- /dev/null
+++ b/tests/benchmarks/qscriptclass/tst_qscriptclass.cpp
@@ -0,0 +1,511 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QtScript>
+
+Q_DECLARE_METATYPE(QScriptContext*)
+Q_DECLARE_METATYPE(QScriptValue)
+Q_DECLARE_METATYPE(QScriptValueList)
+
+//TESTED_FILES=
+
+class TestClass : public QScriptClass
+{
+public:
+    struct CustomProperty {
+        QueryFlags qflags;
+        uint id;
+        QScriptValue::PropertyFlags pflags;
+        QScriptValue value;
+
+        CustomProperty(QueryFlags qf, uint i, QScriptValue::PropertyFlags pf,
+                       const QScriptValue &val)
+            : qflags(qf), id(i), pflags(pf), value(val) { }
+    };
+
+    enum CallableMode {
+        NotCallable,
+        CallableReturnsSum,
+        CallableReturnsArgument,
+        CallableReturnsInvalidVariant
+    };
+
+    TestClass(QScriptEngine *engine);
+    ~TestClass();
+
+    void addCustomProperty(const QScriptString &name, QueryFlags qflags,
+                           uint id, QScriptValue::PropertyFlags pflags,
+                           const QScriptValue &value);
+    void removeCustomProperty(const QScriptString &name);
+
+    QueryFlags queryProperty(const QScriptValue &object,
+                             const QScriptString &name,
+                             QueryFlags flags, uint *id);
+
+    QScriptValue property(const QScriptValue &object,
+                          const QScriptString &name, uint id);
+
+    void setProperty(QScriptValue &object, const QScriptString &name,
+                     uint id, const QScriptValue &value);
+
+    QScriptValue::PropertyFlags propertyFlags(
+        const QScriptValue &object, const QScriptString &name, uint id);
+
+    QScriptClassPropertyIterator *newIterator(const QScriptValue &object);
+
+    QScriptValue prototype() const;
+
+    QString name() const;
+
+    bool supportsExtension(Extension extension) const;
+    QVariant extension(Extension extension,
+                       const QVariant &argument = QVariant());
+
+    void setIterationEnabled(bool enable);
+    bool isIterationEnabled() const;
+
+    void setCallableMode(CallableMode mode);
+    CallableMode callableMode() const;
+
+    void setHasInstance(bool hasInstance);
+    bool hasInstance() const;
+
+private:
+    inline CustomProperty *findCustomProperty(const QScriptString &name);
+
+    QHash<QScriptString, CustomProperty*> customProperties;
+
+    QScriptValue m_prototype;
+    bool m_iterationEnabled;
+    CallableMode m_callableMode;
+    bool m_hasInstance;
+};
+
+class TestClassPropertyIterator : public QScriptClassPropertyIterator
+{
+public:
+    TestClassPropertyIterator(const QHash<QScriptString, TestClass::CustomProperty*> &props,
+                      const QScriptValue &object);
+    ~TestClassPropertyIterator();
+
+    bool hasNext() const;
+    void next();
+
+    bool hasPrevious() const;
+    void previous();
+
+    void toFront();
+    void toBack();
+
+    QScriptString name() const;
+    uint id() const;
+    QScriptValue::PropertyFlags flags() const;
+
+private:
+    int m_index;
+    int m_last;
+    QHash<QScriptString, TestClass::CustomProperty*> m_props;
+};
+
+TestClass::TestClass(QScriptEngine *engine)
+    : QScriptClass(engine), m_iterationEnabled(true),
+      m_callableMode(NotCallable), m_hasInstance(false)
+{
+    m_prototype = engine->newObject();
+}
+
+TestClass::~TestClass()
+{
+    qDeleteAll(customProperties);
+}
+
+TestClass::CustomProperty* TestClass::findCustomProperty(const QScriptString &name)
+{
+    QHash<QScriptString, CustomProperty*>::const_iterator it;
+    it = customProperties.constFind(name);
+    if (it == customProperties.constEnd())
+        return 0;
+    return it.value();
+
+}
+
+void TestClass::addCustomProperty(const QScriptString &name, QueryFlags qflags,
+                                  uint id, QScriptValue::PropertyFlags pflags,
+                                  const QScriptValue &value)
+{
+    customProperties.insert(name, new CustomProperty(qflags, id, pflags, value));
+}
+
+void TestClass::removeCustomProperty(const QScriptString &name)
+{
+    CustomProperty *prop = customProperties.take(name);
+    if (prop)
+        delete prop;
+}
+
+QScriptClass::QueryFlags TestClass::queryProperty(const QScriptValue &/*object*/,
+                                    const QScriptString &name,
+                                    QueryFlags flags, uint *id)
+{
+    CustomProperty *prop = findCustomProperty(name);
+    if (!prop)
+        return 0;
+    *id = prop->id;
+    return prop->qflags & flags;
+}
+
+QScriptValue TestClass::property(const QScriptValue &/*object*/,
+                                 const QScriptString &name, uint /*id*/)
+{
+    CustomProperty *prop = findCustomProperty(name);
+    if (!prop)
+        return QScriptValue();
+    return prop->value;
+}
+
+void TestClass::setProperty(QScriptValue &/*object*/, const QScriptString &name,
+                            uint /*id*/, const QScriptValue &value)
+{
+    CustomProperty *prop = findCustomProperty(name);
+    if (!prop)
+        return;
+    prop->value = value;
+}
+
+QScriptValue::PropertyFlags TestClass::propertyFlags(
+    const QScriptValue &/*object*/, const QScriptString &name, uint /*id*/)
+{
+    CustomProperty *prop = findCustomProperty(name);
+    if (!prop)
+        return 0;
+    return prop->pflags;
+}
+
+QScriptClassPropertyIterator *TestClass::newIterator(const QScriptValue &object)
+{
+    if (!m_iterationEnabled)
+        return 0;
+    return new TestClassPropertyIterator(customProperties, object);
+}
+
+QScriptValue TestClass::prototype() const
+{
+    return m_prototype;
+}
+
+QString TestClass::name() const
+{
+    return QLatin1String("TestClass");
+}
+
+bool TestClass::supportsExtension(Extension extension) const
+{
+    if (extension == Callable)
+        return (m_callableMode != NotCallable);
+    if (extension == HasInstance)
+        return m_hasInstance;
+    return false;
+}
+
+QVariant TestClass::extension(Extension extension,
+                              const QVariant &argument)
+{
+    if (extension == Callable) {
+        Q_ASSERT(m_callableMode != NotCallable);
+        QScriptContext *ctx = qvariant_cast<QScriptContext*>(argument);
+        if (m_callableMode == CallableReturnsSum) {
+            qsreal sum = 0;
+            for (int i = 0; i < ctx->argumentCount(); ++i)
+                sum += ctx->argument(i).toNumber();
+            QScriptValueIterator it(ctx->thisObject());
+            while (it.hasNext()) {
+                it.next();
+                sum += it.value().toNumber();
+            }
+            return sum;
+        } else if (m_callableMode == CallableReturnsArgument) {
+            return qVariantFromValue(ctx->argument(0));
+        } else if (m_callableMode == CallableReturnsInvalidVariant) {
+            return QVariant();
+        }
+    } else if (extension == HasInstance) {
+        Q_ASSERT(m_hasInstance);
+        QScriptValueList args = qvariant_cast<QScriptValueList>(argument);
+        QScriptValue obj = args.at(0);
+        QScriptValue value = args.at(1);
+        return value.property("foo").equals(obj.property("foo"));
+    }
+    return QVariant();
+}
+
+void TestClass::setIterationEnabled(bool enable)
+{
+    m_iterationEnabled = enable;
+}
+
+bool TestClass::isIterationEnabled() const
+{
+    return m_iterationEnabled;
+}
+
+void TestClass::setCallableMode(CallableMode mode)
+{
+    m_callableMode = mode;
+}
+
+TestClass::CallableMode TestClass::callableMode() const
+{
+    return m_callableMode;
+}
+
+void TestClass::setHasInstance(bool hasInstance)
+{
+    m_hasInstance = hasInstance;
+}
+
+bool TestClass::hasInstance() const
+{
+    return m_hasInstance;
+}
+
+TestClassPropertyIterator::TestClassPropertyIterator(const QHash<QScriptString, TestClass::CustomProperty*> &props,
+                                     const QScriptValue &object)
+    : QScriptClassPropertyIterator(object)
+{
+    m_props = props;
+    toFront();
+}
+
+TestClassPropertyIterator::~TestClassPropertyIterator()
+{
+}
+
+bool TestClassPropertyIterator::hasNext() const
+{
+    return m_index < m_props.size();
+}
+
+void TestClassPropertyIterator::next()
+{
+    m_last = m_index;
+    ++m_index;
+}
+
+bool TestClassPropertyIterator::hasPrevious() const
+{
+    return m_index > 0;
+}
+
+void TestClassPropertyIterator::previous()
+{
+    --m_index;
+    m_last = m_index;
+}
+
+void TestClassPropertyIterator::toFront()
+{
+    m_index = 0;
+    m_last = -1;
+}
+
+void TestClassPropertyIterator::toBack()
+{
+    m_index = m_props.size();
+    m_last = -1;
+}
+
+QScriptString TestClassPropertyIterator::name() const
+{
+    return m_props.keys().value(m_last);
+}
+
+uint TestClassPropertyIterator::id() const
+{
+    QScriptString key = m_props.keys().value(m_last);
+    if (!key.isValid())
+        return 0;
+    TestClass::CustomProperty *prop = m_props.value(key);
+    return prop->id;
+}
+
+QScriptValue::PropertyFlags TestClassPropertyIterator::flags() const
+{
+    QScriptString key = m_props.keys().value(m_last);
+    if (!key.isValid())
+        return 0;
+    TestClass::CustomProperty *prop = m_props.value(key);
+    return prop->pflags;
+}
+
+class tst_QScriptClass : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QScriptClass();
+    virtual ~tst_QScriptClass();
+
+public slots:
+    void init();
+    void cleanup();
+
+private slots:
+    void noSuchProperty();
+    void property();
+    void setProperty();
+    void propertyFlags();
+    void call();
+    void hasInstance();
+    void iterate();
+};
+
+tst_QScriptClass::tst_QScriptClass()
+{
+}
+
+tst_QScriptClass::~tst_QScriptClass()
+{
+}
+
+void tst_QScriptClass::init()
+{
+}
+
+void tst_QScriptClass::cleanup()
+{
+}
+
+void tst_QScriptClass::noSuchProperty()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    QScriptValue obj = eng.newObject(&cls);
+    QString propertyName = QString::fromLatin1("foo");
+    QBENCHMARK {
+        (void)obj.property(propertyName);
+    }
+}
+
+void tst_QScriptClass::property()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    QScriptString foo = eng.toStringHandle("foo");
+    cls.addCustomProperty(foo, QScriptClass::HandlesReadAccess, /*id=*/1, /*attributes=*/0, /*value=*/123);
+    QScriptValue obj = eng.newObject(&cls);
+    QBENCHMARK {
+        (void)obj.property(foo);
+    }
+}
+
+void tst_QScriptClass::setProperty()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    QScriptString foo = eng.toStringHandle("foo");
+    cls.addCustomProperty(foo, QScriptClass::HandlesWriteAccess, /*id=*/1, /*attributes=*/0, /*value=*/123);
+    QScriptValue obj = eng.newObject(&cls);
+    QScriptValue value(456);
+    QBENCHMARK {
+        obj.setProperty(foo, value);
+    }
+}
+
+void tst_QScriptClass::propertyFlags()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    QScriptString foo = eng.toStringHandle("foo");
+    cls.addCustomProperty(foo, QScriptClass::HandlesReadAccess, /*id=*/1, QScriptValue::ReadOnly, /*value=*/123);
+    QScriptValue obj = eng.newObject(&cls);
+    QBENCHMARK {
+        (void)obj.propertyFlags(foo);
+    }
+}
+
+void tst_QScriptClass::call()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    cls.setCallableMode(TestClass::CallableReturnsArgument);
+    QScriptValue obj = eng.newObject(&cls);
+    QScriptValue thisObject;
+    QScriptValueList args;
+    args.append(123);
+    QBENCHMARK {
+        (void)obj.call(thisObject, args);
+    }
+}
+
+void tst_QScriptClass::hasInstance()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    cls.setHasInstance(true);
+    QScriptValue obj = eng.newObject(&cls);
+    obj.setProperty("foo", 123);
+    QScriptValue plain = eng.newObject();
+    plain.setProperty("foo", obj.property("foo"));
+    QBENCHMARK {
+        (void)plain.instanceOf(obj);
+    }
+}
+
+void tst_QScriptClass::iterate()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    cls.setIterationEnabled(true);
+    cls.addCustomProperty(eng.toStringHandle("foo"), QScriptClass::HandlesReadAccess, /*id=*/1, /*attributes=*/0, /*value=*/123);
+    cls.addCustomProperty(eng.toStringHandle("bar"), QScriptClass::HandlesReadAccess, /*id=*/2, /*attributes=*/0, /*value=*/456);
+    QScriptValue obj = eng.newObject(&cls);
+    QBENCHMARK {
+        QScriptValueIterator it(obj);
+        while (it.hasNext()) {
+            it.next();
+            (void)it.scriptName();
+        }
+    }
+}
+
+QTEST_MAIN(tst_QScriptClass)
+#include "tst_qscriptclass.moc"
diff --git a/examples/effects/lighting/shadoweffect.cpp b/tests/manual/gestures/pinch/main.cpp
index 16e52fb..26f32ec 100644
--- a/examples/effects/lighting/shadoweffect.cpp
+++ b/tests/manual/gestures/pinch/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,38 +39,30 @@
 **
 ****************************************************************************/
 
-#include "shadoweffect.h"
+#include <QtGui>
+#include "pinchwidget.h"
 
-#include <math.h>
-
-ShadowEffect::ShadowEffect(QGraphicsItem *item, QGraphicsItem *source)
-    : QGraphicsDropShadowEffect()
-    , item(item), m_lightSource(source)
-{
-    setBlurRadius(8);
-    m_color = color();
-}
-
-void ShadowEffect::adjustForItem()
+class MainWindow : public QWidget
 {
-    QPointF delta = item->pos() - m_lightSource->pos();
-    setOffset(delta.toPoint() / 30);
-
-    qreal dx = delta.x();
-    qreal dy = delta.y();
-    qreal dd = sqrt(dx * dx + dy * dy);
-    m_color.setAlphaF(qBound(0.4, 1 - dd / 200.0, 0.7));
-    setColor(m_color);
-}
+public:
+    MainWindow();
+};
 
-QRectF ShadowEffect::boundingRectFor(const QRectF &rect) const
+MainWindow::MainWindow()
 {
-    const_cast<ShadowEffect *>(this)->adjustForItem();
-    return QGraphicsDropShadowEffect::boundingRectFor(rect);
+    QVBoxLayout *l = new QVBoxLayout(this);
+    QPushButton *btn = new QPushButton(QLatin1String("AcceptTouchEvents"));
+    l->addWidget(btn);
+    QImage image(":/images/qt-logo.png");
+    PinchWidget *w = new PinchWidget(image);
+    l->addWidget(w);
+    connect(btn, SIGNAL(clicked()), w, SLOT(acceptTouchEvents()));
 }
 
-void ShadowEffect::draw(QPainter *painter, QGraphicsEffectSource *source)
+int main(int argc, char *argv[])
 {
-    adjustForItem();
-    QGraphicsDropShadowEffect::draw(painter, source);
+    QApplication app(argc, argv);
+    MainWindow w;
+    w.show();
+    return app.exec();
 }
diff --git a/tests/manual/gestures/pinch/pinch.pro b/tests/manual/gestures/pinch/pinch.pro
new file mode 100644
index 0000000..d1f28cc
--- /dev/null
+++ b/tests/manual/gestures/pinch/pinch.pro
@@ -0,0 +1,4 @@
+SOURCES = main.cpp \
+    pinchwidget.cpp
+HEADERS += pinchwidget.h
+RESOURCES += pinch.qrc
diff --git a/tests/manual/gestures/pinch/pinch.qrc b/tests/manual/gestures/pinch/pinch.qrc
new file mode 100644
index 0000000..0be9ba1
--- /dev/null
+++ b/tests/manual/gestures/pinch/pinch.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/images" >
+        <file>qt-logo.png</file>
+    </qresource>
+</RCC>
diff --git a/tests/manual/gestures/pinch/pinchwidget.cpp b/tests/manual/gestures/pinch/pinchwidget.cpp
new file mode 100644
index 0000000..1a2fe47
--- /dev/null
+++ b/tests/manual/gestures/pinch/pinchwidget.cpp
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pinchwidget.h"
+
+#include <QPainter>
+#include <QImage>
+#include <QPixmap>
+#include <QPanGesture>
+#include <QPinchGesture>
+#include <QPushButton>
+
+PinchWidget::PinchWidget(const QImage &image, QWidget *parent)
+    : QWidget(parent)
+{
+    setMinimumSize(100,100);
+    this->image = image;
+    pan = new QPanGesture(this);
+    connect(pan, SIGNAL(triggered()), this, SLOT(onPanTriggered()));
+    connect(pan, SIGNAL(finished()), this, SLOT(onPanFinished()));
+    pinch = new QPinchGesture(this);
+    connect(pinch, SIGNAL(triggered()), this, SLOT(onPinchTriggered()));
+    connect(pinch, SIGNAL(finished()), this, SLOT(onPinchFinished()));
+}
+
+QSize PinchWidget::sizeHint() const
+{
+    return image.size()*1.5;
+}
+
+void PinchWidget::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    QTransform t = worldTransform * currentPanTransform * currentPinchTransform;
+    p.setTransform(t);
+    QPoint center = QPoint(width()/2, height()/2);
+    QPoint size = QPoint(image.width()/2, image.height()/2);
+    p.translate(center - size);
+    p.drawImage(QPoint(0,0), image);
+}
+
+void PinchWidget::acceptTouchEvents()
+{
+    setAttribute(Qt::WA_AcceptTouchEvents);
+    if (QWidget *w = qobject_cast<QPushButton*>(sender()))
+        w->setEnabled(false);
+}
+
+void PinchWidget::onPanTriggered()
+{
+    currentPanTransform = QTransform()
+        .translate(pan->totalOffset().width(),
+                   pan->totalOffset().height());
+    update();
+}
+
+void PinchWidget::onPanFinished()
+{
+    worldTransform *= currentPanTransform;
+    currentPanTransform.reset();
+    update();
+}
+
+void PinchWidget::onPinchTriggered()
+{
+    QPoint transformCenter = worldTransform.map(QPoint(width()/2, height()/2));
+    currentPinchTransform = QTransform()
+        .translate(transformCenter.x(), transformCenter.y())
+        .scale(pinch->totalScaleFactor(), pinch->totalScaleFactor())
+        .rotate(pinch->totalRotationAngle())
+        .translate(-transformCenter.x(), -transformCenter.y());
+    update();
+}
+
+void PinchWidget::onPinchFinished()
+{
+    worldTransform *= currentPinchTransform;
+    currentPinchTransform.reset();
+    update();
+}
diff --git a/tests/manual/gestures/pinch/pinchwidget.h b/tests/manual/gestures/pinch/pinchwidget.h
new file mode 100644
index 0000000..c99a6d5
--- /dev/null
+++ b/tests/manual/gestures/pinch/pinchwidget.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PINCHWIDGET_H
+#define PINCHWIDGET_H
+
+#include <QWidget>
+#include <QTransform>
+
+class QPanGesture;
+class QPinchGesture;
+
+class PinchWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    PinchWidget(const QImage &image, QWidget *parent = 0);
+
+private Q_SLOTS:
+    void acceptTouchEvents();
+    void onPanTriggered();
+    void onPanFinished();
+    void onPinchTriggered();
+    void onPinchFinished();
+
+private:
+    void paintEvent(QPaintEvent *);
+    QSize sizeHint() const;
+
+    QImage image;
+
+    QPanGesture *pan;
+    QPinchGesture *pinch;
+
+    QTransform worldTransform;
+    QTransform currentPanTransform;
+    QTransform currentPinchTransform;
+};
+
+#endif // PINCHWIDGET_H
diff --git a/tests/manual/gestures/pinch/qt-logo.png b/tests/manual/gestures/pinch/qt-logo.png
new file mode 100644
index 0000000..7d3e97e
--- /dev/null
+++ b/tests/manual/gestures/pinch/qt-logo.png
diff --git a/tests/manual/gestures/twopanwidgets/main.cpp b/tests/manual/gestures/twopanwidgets/main.cpp
new file mode 100644
index 0000000..3e73f93
--- /dev/null
+++ b/tests/manual/gestures/twopanwidgets/main.cpp
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+static const char text[] =
+        "Hello world! This is just a lot of text with to make sure scrollbar appear";
+
+class TextEdit : public QTextEdit
+{
+    Q_OBJECT
+public Q_SLOTS:
+    void acceptTouch()
+    {
+        viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
+        if (QWidget *w = qobject_cast<QPushButton*>(sender()))
+            w->setEnabled(false);
+    }
+};
+
+class PlainTextEdit : public QPlainTextEdit
+{
+    Q_OBJECT
+public Q_SLOTS:
+    void acceptTouch()
+    {
+        viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
+        if (QWidget *w = qobject_cast<QPushButton*>(sender()))
+            w->setEnabled(false);
+    }
+};
+
+class MainWindow : public QMainWindow
+{
+public:
+    MainWindow();
+};
+
+MainWindow::MainWindow()
+{
+    QTabWidget *tw = new QTabWidget;
+    setCentralWidget(tw);
+    {
+        QWidget *tab = new QWidget;
+        QGridLayout *layout = new QGridLayout(tab);
+        QTextEdit *edit1 = new TextEdit;
+        QTextEdit *edit2 = new TextEdit;
+        QString text1 = QString(text).replace(' ', '\n');
+        for (int i = 0; i < 5; ++i) text1 += text1;
+        QString text2 = QString(text);
+        for (int i = 0; i < 5; ++i) text2 += text2;
+        edit1->setPlainText(text1);
+        edit2->setPlainText(text2);
+        edit2->setWordWrapMode(QTextOption::NoWrap);
+        QPushButton *btn1 = new QPushButton(QLatin1String("AcceptTouchEvents"));
+        connect(btn1, SIGNAL(clicked()), edit1, SLOT(acceptTouch()));
+        QPushButton *btn2 = new QPushButton(QLatin1String("AcceptTouchEvents"));
+        connect(btn2, SIGNAL(clicked()), edit2, SLOT(acceptTouch()));
+        layout->addWidget(btn1, 0, 0);
+        layout->addWidget(btn2, 0, 1);
+        layout->addWidget(edit1, 1, 0);
+        layout->addWidget(edit2, 1, 1);
+        tw->addTab(tab, QLatin1String("QTextEdit"));
+    }
+    {
+        QWidget *tab = new QWidget;
+        QGridLayout *layout = new QGridLayout(tab);
+        QPlainTextEdit *edit1 = new PlainTextEdit;
+        QPlainTextEdit *edit2 = new PlainTextEdit;
+        QString text1 = QString(text).replace(' ', '\n');
+        for (int i = 0; i < 5; ++i) text1 += text1;
+        QString text2 = QString(text);
+        for (int i = 0; i < 5; ++i) text2 += text2;
+        edit1->setPlainText(text1);
+        edit2->setPlainText(text2);
+        edit2->setWordWrapMode(QTextOption::NoWrap);
+        QPushButton *btn1 = new QPushButton(QLatin1String("AcceptTouchEvents"));
+        connect(btn1, SIGNAL(clicked()), edit1, SLOT(acceptTouch()));
+        QPushButton *btn2 = new QPushButton(QLatin1String("AcceptTouchEvents"));
+        connect(btn2, SIGNAL(clicked()), edit2, SLOT(acceptTouch()));
+        layout->addWidget(btn1, 0, 0);
+        layout->addWidget(btn2, 0, 1);
+        layout->addWidget(edit1, 1, 0);
+        layout->addWidget(edit2, 1, 1);
+        tw->addTab(tab, QLatin1String("QPlainTextEdit"));
+    }
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.show();
+    return app.exec();
+}
+
+#include "main.moc"
diff --git a/tests/manual/gestures/twopanwidgets/twopanwidgets.pro b/tests/manual/gestures/twopanwidgets/twopanwidgets.pro
new file mode 100644
index 0000000..5254077
--- /dev/null
+++ b/tests/manual/gestures/twopanwidgets/twopanwidgets.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
\ No newline at end of file
diff --git a/tools/activeqt/testcon/scripts/perlscript.pl b/tools/activeqt/testcon/scripts/perlscript.pl
index 029bdc2..2802f65 100644
--- a/tools/activeqt/testcon/scripts/perlscript.pl
+++ b/tools/activeqt/testcon/scripts/perlscript.pl
@@ -1,3 +1,44 @@
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the ActiveQt module of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 sub QAxWidget2_Click {
 	$QAxWidget2->{'lineWidth'} = $QAxWidget2->{'lineWidth'} + 1;
 	$MainWindow->logMacro(0, "Hello from Perl: QAxWidget2_Click", 0, "");
diff --git a/tools/activeqt/testcon/scripts/pythonscript.py b/tools/activeqt/testcon/scripts/pythonscript.py
index 79bca87..d9cc67c 100644
--- a/tools/activeqt/testcon/scripts/pythonscript.py
+++ b/tools/activeqt/testcon/scripts/pythonscript.py
@@ -1,3 +1,45 @@
+#!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 def QAxWidget2_Click():
     QAxWidget2.lineWidth = QAxWidget2.lineWidth + 1;
     MainWindow.logMacro(0, "Hello from Python: QAxWidget2_Click", 0, "");
diff --git a/tools/assistant/compat/LICENSE.GPL b/tools/assistant/compat/LICENSE.GPL
deleted file mode 100644
index b6e1c33..0000000
--- a/tools/assistant/compat/LICENSE.GPL
+++ /dev/null
@@ -1,280 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, 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.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  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
-this service 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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) 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; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
-this License.
-
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. 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 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.
-
-		     END OF TERMS AND CONDITIONS
diff --git a/tools/assistant/compat/mainwindow.cpp b/tools/assistant/compat/mainwindow.cpp
index 325be8a..7993953 100644
--- a/tools/assistant/compat/mainwindow.cpp
+++ b/tools/assistant/compat/mainwindow.cpp
@@ -325,10 +325,7 @@ void MainWindow::about()
     box.setText(QString::fromLatin1("<center><img src=\":/trolltech/assistant/images/assistant-128.png\">"
                                     "<h3>%1</h3>"
                                     "<p>Version %2</p></center>"
-                                    "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
-                                    "<p>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
-                                    " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
-                                    " PARTICULAR PURPOSE.<p/>")
+                                    "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>")
                    .arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR)));
     box.setWindowTitle(tr("Qt Assistant"));
     box.setIcon(QMessageBox::NoIcon);
diff --git a/tools/assistant/compat/mainwindow.ui b/tools/assistant/compat/mainwindow.ui
index 6375adc..2978ba0 100644
--- a/tools/assistant/compat/mainwindow.ui
+++ b/tools/assistant/compat/mainwindow.ui
@@ -2,6 +2,7 @@
  <comment>*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
@@ -37,9 +38,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 *********************************************************************</comment>
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow" >
diff --git a/tools/assistant/tools/assistant/doc/assistant.qdoc b/tools/assistant/tools/assistant/doc/assistant.qdoc
index 0d13490..4cc21ec 100644
--- a/tools/assistant/tools/assistant/doc/assistant.qdoc
+++ b/tools/assistant/tools/assistant/doc/assistant.qdoc
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 /*!
     \page assistant.html
     \title Qt Assistant
diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf
index 9566e90..161d34f 100644
--- a/tools/assistant/tools/assistant/doc/assistant.qdocconf
+++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf
@@ -12,5 +12,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
               "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
               "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \
-              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.5.3</div></td>\n" \
+              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.0</div></td>\n" \
               "</tr></table></div></address>"
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index e45fb84..b754e60 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -856,10 +856,7 @@ void MainWindow::showAboutDialog()
         aboutDia.setText(QString::fromLatin1("<center>"
             "<h3>%1</h3>"
             "<p>Version %2</p></center>"
-            "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)"
-            ".</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
-            " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
-            " PARTICULAR PURPOSE.<p/>")
+            "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>")
             .arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR)),
             resources);
         QLatin1String path(":/trolltech/assistant/images/assistant-128.png");
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 5b30b4e..25a4cb4 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3638,10 +3638,14 @@ bool Configure::showLicense(QString orgLicenseFile)
         return true;
     }
 
+    bool haveGpl3 = false;
     QString licenseFile = orgLicenseFile;
     QString theLicense;
     if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") {
-        theLicense = "GNU General Public License (GPL) version 3 \nor the GNU Lesser General Public License (LGPL) version 2.1";
+        haveGpl3 = QFile::exists(orgLicenseFile + "/LICENSE.GPL3");
+        theLicense = "GNU Lesser General Public License (LGPL) version 2.1";
+        if (haveGpl3)
+            theLicense += "\nor the GNU General Public License (GPL) version 3";
     } else {
         // the first line of the license file tells us which license it is
         QFile file(licenseFile);
@@ -3658,7 +3662,8 @@ bool Configure::showLicense(QString orgLicenseFile)
              << "the " << theLicense << "." << endl
              << endl;
         if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") {
-            cout << "Type '3' to view the GNU General Public License version 3 (GPLv3)." << endl;
+            if (haveGpl3)
+                cout << "Type '3' to view the GNU General Public License version 3 (GPLv3)." << endl;
             cout << "Type 'L' to view the Lesser GNU General Public License version 2.1 (LGPLv2.1)." << endl;
         } else {
             cout << "Type '?' to view the " << theLicense << "." << endl;
diff --git a/tools/designer/src/designer/versiondialog.cpp b/tools/designer/src/designer/versiondialog.cpp
index 4b8e493..10430d8 100644
--- a/tools/designer/src/designer/versiondialog.cpp
+++ b/tools/designer/src/designer/versiondialog.cpp
@@ -174,9 +174,7 @@ VersionDialog::VersionDialog(QWidget *parent)
 
     lbl->setText(tr("%1"
                     "<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
-                    "<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
-                    " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
-                    " PARTICULAR PURPOSE.<br/> ").arg(version));
+                    ).arg(version));
 
     lbl->setWordWrap(true);
     lbl->setOpenExternalLinks(true);
diff --git a/tools/designer/src/lib/shared/qlayout_widget.cpp b/tools/designer/src/lib/shared/qlayout_widget.cpp
index a710e29..77876ca 100644
--- a/tools/designer/src/lib/shared/qlayout_widget.cpp
+++ b/tools/designer/src/lib/shared/qlayout_widget.cpp
@@ -37,9 +37,6 @@
 **
 ** $QT_END_LICENSE$
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
 ****************************************************************************/
 
 #include "qlayout_widget_p.h"
diff --git a/tools/designer/src/uitools/uitools.pro b/tools/designer/src/uitools/uitools.pro
index 34e4877..38b7add 100644
--- a/tools/designer/src/uitools/uitools.pro
+++ b/tools/designer/src/uitools/uitools.pro
@@ -39,3 +39,4 @@ unix {
    QMAKE_PKGCONFIG_REQUIRES += QtXml
 }
 
+symbian: TARGET.UID3 = 0x2001E628
diff --git a/tools/installer/batch/build.bat b/tools/installer/batch/build.bat
index 6031c40..d6272d5 100755
--- a/tools/installer/batch/build.bat
+++ b/tools/installer/batch/build.bat
@@ -37,9 +37,6 @@
 ::
 :: $QT_END_LICENSE$
 ::
-:: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 call :%1 %2
 goto END
diff --git a/tools/installer/batch/copy.bat b/tools/installer/batch/copy.bat
index cccb992..f6d6ba4 100755
--- a/tools/installer/batch/copy.bat
+++ b/tools/installer/batch/copy.bat
@@ -37,9 +37,6 @@
 ::
 :: $QT_END_LICENSE$
 ::
-:: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 call :%1 %2
 goto END
diff --git a/tools/installer/batch/delete.bat b/tools/installer/batch/delete.bat
index 843ce79..60efbb5 100755
--- a/tools/installer/batch/delete.bat
+++ b/tools/installer/batch/delete.bat
@@ -37,9 +37,6 @@
 ::
 :: $QT_END_LICENSE$
 ::
-:: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 call :%1 %2
 goto END
diff --git a/tools/installer/batch/env.bat b/tools/installer/batch/env.bat
index a7693fc..ee39537 100755
--- a/tools/installer/batch/env.bat
+++ b/tools/installer/batch/env.bat
@@ -37,9 +37,6 @@
 ::
 :: $QT_END_LICENSE$
 ::
-:: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 call :%1 %2
 goto END
diff --git a/tools/installer/batch/extract.bat b/tools/installer/batch/extract.bat
index 9c4dd2f..59f7f3b 100755
--- a/tools/installer/batch/extract.bat
+++ b/tools/installer/batch/extract.bat
@@ -37,9 +37,6 @@
 ::
 :: $QT_END_LICENSE$
 ::
-:: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 call :%1 %2
 goto END
diff --git a/tools/installer/batch/installer.bat b/tools/installer/batch/installer.bat
index 01e024e..83b120b 100755
--- a/tools/installer/batch/installer.bat
+++ b/tools/installer/batch/installer.bat
@@ -37,9 +37,6 @@
 ::
 :: $QT_END_LICENSE$
 ::
-:: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 call :%1 %2
 goto END
diff --git a/tools/installer/batch/log.bat b/tools/installer/batch/log.bat
index 3460377..abb6b36 100755
--- a/tools/installer/batch/log.bat
+++ b/tools/installer/batch/log.bat
@@ -37,9 +37,6 @@
 ::
 :: $QT_END_LICENSE$
 ::
-:: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 call :%1 %2
 goto END
diff --git a/tools/installer/batch/toupper.bat b/tools/installer/batch/toupper.bat
index da3339b..8b319ec 100755
--- a/tools/installer/batch/toupper.bat
+++ b/tools/installer/batch/toupper.bat
@@ -37,9 +37,6 @@
 ::
 :: $QT_END_LICENSE$
 ::
-:: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 set IWMAKE_RESULT=%1
 if [%IWMAKE_RESULT%]==[] goto :eof
diff --git a/tools/installer/config/config.default.sample b/tools/installer/config/config.default.sample
index 640db4b..fd71165 100644
--- a/tools/installer/config/config.default.sample
+++ b/tools/installer/config/config.default.sample
@@ -37,9 +37,6 @@
 ##
 ## $QT_END_LICENSE$
 ##
-## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-##
 #############################################################################
 
 # root directory
diff --git a/tools/installer/config/mingw-opensource.conf b/tools/installer/config/mingw-opensource.conf
index 78d372d..e182b5f 100644
--- a/tools/installer/config/mingw-opensource.conf
+++ b/tools/installer/config/mingw-opensource.conf
@@ -37,9 +37,6 @@
 ##
 ## $QT_END_LICENSE$
 ##
-## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-##
 #############################################################################
 #extracts the package to buildDir
 
diff --git a/tools/installer/iwmake.bat b/tools/installer/iwmake.bat
index 08e647f..a9f53d8 100755
--- a/tools/installer/iwmake.bat
+++ b/tools/installer/iwmake.bat
@@ -37,9 +37,6 @@
 ::
 :: $QT_END_LICENSE$
 ::
-:: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 rem @echo off
 call :init
diff --git a/tools/installer/nsis/confirmpage.ini b/tools/installer/nsis/confirmpage.ini
index 00df3ec..7ac30d6 100644
--- a/tools/installer/nsis/confirmpage.ini
+++ b/tools/installer/nsis/confirmpage.ini
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Ini file generated by the HM NIS Edit IO designer.
 [Settings]
diff --git a/tools/installer/nsis/gwdownload.ini b/tools/installer/nsis/gwdownload.ini
index 42351d1..35eef46 100644
--- a/tools/installer/nsis/gwdownload.ini
+++ b/tools/installer/nsis/gwdownload.ini
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Ini file generated by the HM NIS Edit IO designer.
 [Settings]
diff --git a/tools/installer/nsis/gwmirror.ini b/tools/installer/nsis/gwmirror.ini
index 2757177..85a7440 100644
--- a/tools/installer/nsis/gwmirror.ini
+++ b/tools/installer/nsis/gwmirror.ini
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Ini file generated by the HM NIS Edit IO designer.
 [Settings]
diff --git a/tools/installer/nsis/includes/global.nsh b/tools/installer/nsis/includes/global.nsh
index 7905040..6b32190 100644
--- a/tools/installer/nsis/includes/global.nsh
+++ b/tools/installer/nsis/includes/global.nsh
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 !include "StrFunc.nsh"
 !include "includes\list.nsh"
@@ -143,4 +140,4 @@ FunctionEnd
     call un.ConfirmOnDelete
   ClearErrors
   pop $0
-!macroend
\ No newline at end of file
+!macroend
diff --git a/tools/installer/nsis/includes/instdir.nsh b/tools/installer/nsis/includes/instdir.nsh
index 0a3bde7..037dc2a 100644
--- a/tools/installer/nsis/includes/instdir.nsh
+++ b/tools/installer/nsis/includes/instdir.nsh
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 !ifndef INSTDIR_1
   !macro INSTDIR_INITIALIZE
@@ -254,4 +251,4 @@
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "${INSTDIR_INI_FILE}"
 !macroend
 
-!endif ;ifndef INSTDIR_1
\ No newline at end of file
+!endif ;ifndef INSTDIR_1
diff --git a/tools/installer/nsis/includes/list.nsh b/tools/installer/nsis/includes/list.nsh
index cfaeb79..c232e8b 100644
--- a/tools/installer/nsis/includes/list.nsh
+++ b/tools/installer/nsis/includes/list.nsh
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 !ifndef LIST_INCLUDE
 !define LIST_INCLUDE
@@ -136,4 +133,4 @@ Function GetItemInList
   exch $0
 FunctionEnd
 
-!endif ;LIST_INCLUDE
\ No newline at end of file
+!endif ;LIST_INCLUDE
diff --git a/tools/installer/nsis/includes/qtcommon.nsh b/tools/installer/nsis/includes/qtcommon.nsh
index 986ca64..c0be566 100644
--- a/tools/installer/nsis/includes/qtcommon.nsh
+++ b/tools/installer/nsis/includes/qtcommon.nsh
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 !ifndef QTCOMMON_INCLUDE
 !define QTCOMMON_INCLUDE
diff --git a/tools/installer/nsis/includes/qtenv.nsh b/tools/installer/nsis/includes/qtenv.nsh
index 552cae9..42191f9 100644
--- a/tools/installer/nsis/includes/qtenv.nsh
+++ b/tools/installer/nsis/includes/qtenv.nsh
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 !ifndef QTENV_INCLUDE
 !define QTENV_INCLUDE
diff --git a/tools/installer/nsis/includes/system.nsh b/tools/installer/nsis/includes/system.nsh
index 8b0b4b9..5788eb8 100644
--- a/tools/installer/nsis/includes/system.nsh
+++ b/tools/installer/nsis/includes/system.nsh
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 !ifndef SYSTEM_INCLUDE
 !define SYSTEM_INCLUDE
@@ -269,4 +266,4 @@ FunctionEnd
 !insertmacro AdministratorRights ""
 !insertmacro AdministratorRights "un."
 
-!endif ;SYSTEM_INCLUDE
\ No newline at end of file
+!endif ;SYSTEM_INCLUDE
diff --git a/tools/installer/nsis/installer.nsi b/tools/installer/nsis/installer.nsi
index d870a57..de1cbe2 100644
--- a/tools/installer/nsis/installer.nsi
+++ b/tools/installer/nsis/installer.nsi
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Script generated by the HM NIS Edit Script Wizard.
 
diff --git a/tools/installer/nsis/modules/environment.nsh b/tools/installer/nsis/modules/environment.nsh
index bedf2d0..b661983 100644
--- a/tools/installer/nsis/modules/environment.nsh
+++ b/tools/installer/nsis/modules/environment.nsh
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 !ifdef MODULE_ENVIRONMENT
 !macro ENVIRONMENT_INITIALIZE
diff --git a/tools/installer/nsis/modules/mingw.nsh b/tools/installer/nsis/modules/mingw.nsh
index 3e40fe2..c3cc236 100644
--- a/tools/installer/nsis/modules/mingw.nsh
+++ b/tools/installer/nsis/modules/mingw.nsh
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 !ifdef MODULE_MINGW
 !macro MINGW_INITIALIZE
diff --git a/tools/installer/nsis/modules/opensource.nsh b/tools/installer/nsis/modules/opensource.nsh
index 26dcc1d..5638fb0 100644
--- a/tools/installer/nsis/modules/opensource.nsh
+++ b/tools/installer/nsis/modules/opensource.nsh
@@ -1,4 +1,3 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ;; Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,9 +36,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 !ifdef MODULE_OPENSOURCE
 !macro OPENSOURCE_INITIALIZE
diff --git a/tools/installer/nsis/modules/registeruiext.nsh b/tools/installer/nsis/modules/registeruiext.nsh
index b7a3ee6..2602187 100644
--- a/tools/installer/nsis/modules/registeruiext.nsh
+++ b/tools/installer/nsis/modules/registeruiext.nsh
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; UI Extension Module
 
diff --git a/tools/installer/nsis/opensource.ini b/tools/installer/nsis/opensource.ini
index 53f47af..27428c2 100644
--- a/tools/installer/nsis/opensource.ini
+++ b/tools/installer/nsis/opensource.ini
@@ -37,9 +37,6 @@
 ;;
 ;; $QT_END_LICENSE$
 ;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Ini file generated by the HM NIS Edit IO designer.
 [Settings]
diff --git a/tools/linguist/LICENSE.GPL b/tools/linguist/LICENSE.GPL
deleted file mode 100644
index b6e1c33..0000000
--- a/tools/linguist/LICENSE.GPL
+++ /dev/null
@@ -1,280 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, 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.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  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
-this service 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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) 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; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
-this License.
-
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. 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 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.
-
-		     END OF TERMS AND CONDITIONS
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index c0ec6a2..71a932d 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -1352,9 +1352,7 @@ void MainWindow::about()
                     "<p>Qt Linguist is a tool for adding translations to Qt "
                     "applications.</p>"
                     "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
-                    "</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
-                    " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
-                    " PARTICULAR PURPOSE.</p>").arg(version));
+                   ).arg(version));
 
     box.setWindowTitle(QApplication::translate("AboutDialog", "Qt Linguist"));
     box.setIcon(QMessageBox::NoIcon);
diff --git a/tools/linguist/lrelease/lrelease.1 b/tools/linguist/lrelease/lrelease.1
index 8f1a3ff..5390afe 100644
--- a/tools/linguist/lrelease/lrelease.1
+++ b/tools/linguist/lrelease/lrelease.1
@@ -2,9 +2,9 @@
 .\"
 .\" Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 .\" Contact: Nokia Corporation (qt-info@nokia.com)
-.\" 
+.\"
 .\" This file is part of the QtGui module of the Qt Toolkit.
-.\" 
+.\"
 .\" $QT_BEGIN_LICENSE:LGPL$
 .\" No Commercial Usage
 .\" This file contains pre-release code and may not be distributed.
diff --git a/tools/linguist/lupdate/qscript.g b/tools/linguist/lupdate/qscript.g
index 8785f9a..619301d 100644
--- a/tools/linguist/lupdate/qscript.g
+++ b/tools/linguist/lupdate/qscript.g
@@ -37,9 +37,6 @@
 --
 -- $QT_END_LICENSE$
 --
--- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
---
 ----------------------------------------------------------------------------
 
 --------------------------------------------------------------------------------
diff --git a/tools/porting/src/ast.cpp b/tools/porting/src/ast.cpp
index 118d52c..4a36e35 100644
--- a/tools/porting/src/ast.cpp
+++ b/tools/porting/src/ast.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/ast.h b/tools/porting/src/ast.h
index e71d2e0..85d7070 100644
--- a/tools/porting/src/ast.h
+++ b/tools/porting/src/ast.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/codemodel.cpp b/tools/porting/src/codemodel.cpp
index b9b82aa..be0682b 100644
--- a/tools/porting/src/codemodel.cpp
+++ b/tools/porting/src/codemodel.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/codemodel.h b/tools/porting/src/codemodel.h
index 62cb314..4807972 100644
--- a/tools/porting/src/codemodel.h
+++ b/tools/porting/src/codemodel.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/cpplexer.cpp b/tools/porting/src/cpplexer.cpp
index 4be00f6..79dcd9a 100644
--- a/tools/porting/src/cpplexer.cpp
+++ b/tools/porting/src/cpplexer.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/cpplexer.h b/tools/porting/src/cpplexer.h
index ed01b69..5c756c4 100644
--- a/tools/porting/src/cpplexer.h
+++ b/tools/porting/src/cpplexer.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/errors.cpp b/tools/porting/src/errors.cpp
index b8a3d8c..abd58e3 100644
--- a/tools/porting/src/errors.cpp
+++ b/tools/porting/src/errors.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/errors.h b/tools/porting/src/errors.h
index 46eeab7..e34e04d 100644
--- a/tools/porting/src/errors.h
+++ b/tools/porting/src/errors.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/parser.cpp b/tools/porting/src/parser.cpp
index 50325f8..83f0c4b 100644
--- a/tools/porting/src/parser.cpp
+++ b/tools/porting/src/parser.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/parser.h b/tools/porting/src/parser.h
index 1397886..330c9f5 100644
--- a/tools/porting/src/parser.h
+++ b/tools/porting/src/parser.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/rpp.cpp b/tools/porting/src/rpp.cpp
index 787ce2a..b6ec429 100644
--- a/tools/porting/src/rpp.cpp
+++ b/tools/porting/src/rpp.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/rpp.h b/tools/porting/src/rpp.h
index 2c10b51..863e2fc 100644
--- a/tools/porting/src/rpp.h
+++ b/tools/porting/src/rpp.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/rpplexer.cpp b/tools/porting/src/rpplexer.cpp
index e92ec9b..bbea068 100644
--- a/tools/porting/src/rpplexer.cpp
+++ b/tools/porting/src/rpplexer.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/rpplexer.h b/tools/porting/src/rpplexer.h
index 273df0c..e661fa0 100644
--- a/tools/porting/src/rpplexer.h
+++ b/tools/porting/src/rpplexer.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/rpptreeevaluator.cpp b/tools/porting/src/rpptreeevaluator.cpp
index 9d6e3db..d696f75 100644
--- a/tools/porting/src/rpptreeevaluator.cpp
+++ b/tools/porting/src/rpptreeevaluator.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/semantic.cpp b/tools/porting/src/semantic.cpp
index 296e614..efe2bc4 100644
--- a/tools/porting/src/semantic.cpp
+++ b/tools/porting/src/semantic.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/semantic.h b/tools/porting/src/semantic.h
index 8e16f2e..548faf6 100644
--- a/tools/porting/src/semantic.h
+++ b/tools/porting/src/semantic.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/smallobject.cpp b/tools/porting/src/smallobject.cpp
index eac82ef..c3b221f 100644
--- a/tools/porting/src/smallobject.cpp
+++ b/tools/porting/src/smallobject.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/smallobject.h b/tools/porting/src/smallobject.h
index adc4ae7..8b9f91f 100644
--- a/tools/porting/src/smallobject.h
+++ b/tools/porting/src/smallobject.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/tokenizer.cpp b/tools/porting/src/tokenizer.cpp
index 4cdf584..e971602 100644
--- a/tools/porting/src/tokenizer.cpp
+++ b/tools/porting/src/tokenizer.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/tokenizer.h b/tools/porting/src/tokenizer.h
index d98315a..1762c78 100644
--- a/tools/porting/src/tokenizer.h
+++ b/tools/porting/src/tokenizer.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/tokens.h b/tools/porting/src/tokens.h
index 960f1ce..02eab54 100644
--- a/tools/porting/src/tokens.h
+++ b/tools/porting/src/tokens.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/tokenstreamadapter.h b/tools/porting/src/tokenstreamadapter.h
index 110f814b..948db5a 100644
--- a/tools/porting/src/tokenstreamadapter.h
+++ b/tools/porting/src/tokenstreamadapter.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/treewalker.cpp b/tools/porting/src/treewalker.cpp
index 1593674..2d3d53c 100644
--- a/tools/porting/src/treewalker.cpp
+++ b/tools/porting/src/treewalker.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/porting/src/treewalker.h b/tools/porting/src/treewalker.h
index 3f75d7c..168d7b4 100644
--- a/tools/porting/src/treewalker.h
+++ b/tools/porting/src/treewalker.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
+** Copyright (C) 2001-2004 Roberto Raggi
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
diff --git a/tools/qconfig/LICENSE.GPL b/tools/qconfig/LICENSE.GPL
deleted file mode 100644
index b6e1c33..0000000
--- a/tools/qconfig/LICENSE.GPL
+++ /dev/null
@@ -1,280 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, 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.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  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
-this service 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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) 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; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
-this License.
-
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. 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 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.
-
-		     END OF TERMS AND CONDITIONS
diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp
index a408018..4612ceb 100644
--- a/tools/qconfig/main.cpp
+++ b/tools/qconfig/main.cpp
@@ -507,14 +507,6 @@ void Main::about()
 	"<p>Version 2.0</p>"
 	"<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
 	"<p></p>"
-	"<p>This program is licensed to you under the terms of the GNU General "
-	"Public License Version 2 as published by the Free Software Foundation. This "
-	"gives you legal permission to copy, distribute and/or modify this software "
-	"under certain conditions. For details, see the file 'LICENSE.GPL' that came with "
-	"this software distribution. If you did not get the file, send email to "
-	"qt-info@nokia.com.</p>\n\n<p>The program is provided AS IS with NO WARRANTY "
-	"OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS "
-	"FOR A PARTICULAR PURPOSE.</p>"
     );
 }
 
diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.cpp b/tools/qdbus/qdbusviewer/qdbusviewer.cpp
index 0f58e7c..04fbcb3 100644
--- a/tools/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/tools/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -444,10 +444,7 @@ void QDBusViewer::about()
     box.setText(QString::fromLatin1("<center><img src=\":/trolltech/qdbusviewer/images/qdbusviewer-128.png\">"
                 "<h3>%1</h3>"
                 "<p>Version %2</p></center>"
-                "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
-                "<p>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
-                " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
-                " PARTICULAR PURPOSE.<p/>")
+                "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>")
             .arg(tr("D-Bus Viewer")).arg(QLatin1String(QT_VERSION_STR)));
     box.setWindowTitle(tr("D-Bus Viewer"));
     box.exec();
diff --git a/tools/qtconfig/LICENSE.GPL b/tools/qtconfig/LICENSE.GPL
deleted file mode 100644
index b6e1c33..0000000
--- a/tools/qtconfig/LICENSE.GPL
+++ /dev/null
@@ -1,280 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, 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.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  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
-this service 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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) 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; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
-this License.
-
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. 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 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.
-
-		     END OF TERMS AND CONDITIONS
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index db713de..b1d6003 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -999,10 +999,7 @@ void MainWindow::helpAbout()
     QMessageBox box(this);
     box.setText(tr("<h3>%1</h3>"
                    "<br/>Version %2"
-                   "<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
-                   "<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
-                   " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
-                   " PARTICULAR PURPOSE.<br/> ")
+                   "<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).")
                    .arg(tr("Qt Configuration")).arg(QLatin1String(QT_VERSION_STR)));
     box.setWindowTitle(tr("Qt Configuration"));
     box.setIcon(QMessageBox::NoIcon);
diff --git a/tools/qttracereplay/main.cpp b/tools/qttracereplay/main.cpp
new file mode 100644
index 0000000..970531b
--- /dev/null
+++ b/tools/qttracereplay/main.cpp
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtDebug>
+
+#include <private/qpaintengineex_p.h>
+#include <private/qpaintbuffer_p.h>
+
+struct Frame
+{
+    QRegion updateRegion;
+    QPaintBuffer *buffer;
+};
+
+class ReplayWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    ReplayWidget(const QString &filename);
+
+    void paintEvent(QPaintEvent *event);
+
+public slots:
+    void updateRect();
+
+private:
+    QList<Frame> frames;
+    int currentFrame;
+    int currentIteration;
+    QTime timer;
+
+    QList<uint> iterationTimes;
+    QString filename;
+};
+
+void ReplayWidget::updateRect()
+{
+    update(frames.at(currentFrame).updateRegion);
+}
+
+void ReplayWidget::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+
+//    p.setClipRegion(frames.at(currentFrame).updateRegion);
+
+    frames.at(currentFrame).buffer->draw(&p);
+
+    ++currentFrame;
+    if (currentFrame >= frames.size()) {
+        currentFrame = 0;
+        ++currentIteration;
+
+        if (currentIteration == 3)
+            timer.start();
+        else if (currentIteration > 3) {
+            iterationTimes << timer.elapsed();
+            timer.restart();
+
+            if (iterationTimes.size() >= 3) {
+                qreal mean = 0;
+                qreal stddev = 0;
+                uint min = INT_MAX;
+
+                for (int i = 0; i < iterationTimes.size(); ++i) {
+                    mean += iterationTimes.at(i);
+                    min = qMin(min, iterationTimes.at(i));
+                }
+
+                mean /= qreal(iterationTimes.size());
+
+                for (int i = 0; i < iterationTimes.size(); ++i) {
+                    qreal delta = iterationTimes.at(i) - mean;
+                    stddev += delta * delta;
+                }
+
+                stddev = qSqrt(stddev / iterationTimes.size());
+
+                qSort(iterationTimes.begin(), iterationTimes.end());
+                qreal median = iterationTimes.at(iterationTimes.size() / 2);
+                if ((iterationTimes.size() % 1) == 1)
+                    median = (median + iterationTimes.at(iterationTimes.size() / 2 - 1)) * 0.5;
+
+                stddev = 100 * stddev / mean;
+
+                if (iterationTimes.size() >= 10 || stddev < 4) {
+                    printf("%s, iterations: %d, frames: %d, min(ms): %d, median(ms): %f, stddev: %f %%, max(fps): %f\n", qPrintable(filename),
+                            iterationTimes.size(), frames.size(), min, median, stddev, 1000. * frames.size() / min);
+                    deleteLater();
+                    return;
+                }
+            }
+        }
+    }
+
+    QTimer::singleShot(0, this, SLOT(updateRect()));
+}
+
+ReplayWidget::ReplayWidget(const QString &filename_)
+    : currentFrame(0)
+    , currentIteration(0)
+    , filename(filename_)
+{
+    setWindowTitle(filename);
+    QFile file(filename);
+
+    QRect bounds;
+    if (file.open(QIODevice::ReadOnly)) {
+        QDataStream in(&file);
+
+        while (true) {
+            int frameId;
+            in >> frameId;
+
+            if (in.status() != QDataStream::Ok)
+                break;
+
+            qulonglong windowId;
+            QRegion rgn;
+
+            in >> windowId;
+
+            Frame frame;
+            frame.buffer = new QPaintBuffer;
+
+            in >> bounds;
+
+            in >> frame.updateRegion;
+            in >> *frame.buffer;
+
+            frames << frame;
+        }
+    }
+
+    qDebug() << "Read" << frames.size() << "frames";
+
+    resize(bounds.size());
+
+    setAutoFillBackground(false);
+    setAttribute(Qt::WA_NoSystemBackground);
+
+    QTimer::singleShot(10, this, SLOT(updateRect()));
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    if (argc <= 1) {
+        printf("Usage: %s filename\n", argv[0]);
+        return 1;
+    }
+
+    ReplayWidget *widget = new ReplayWidget(argv[1]);
+    widget->show();
+
+    return app.exec();
+}
+#include "main.moc"
diff --git a/tools/qttracereplay/qttracereplay.pro b/tools/qttracereplay/qttracereplay.pro
new file mode 100644
index 0000000..766ed04
--- /dev/null
+++ b/tools/qttracereplay/qttracereplay.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+
+DESTDIR     = ../../bin
+
+DEPENDPATH += .
+INCLUDEPATH += . ../../src/3rdparty/harfbuzz/src
+TARGET = qttracereplay
+
+# Input
+SOURCES += main.cpp
+
+target.path=$$[QT_INSTALL_BINS]
+INSTALLS += target
diff --git a/tools/qvfb/LICENSE.GPL b/tools/qvfb/LICENSE.GPL
deleted file mode 100644
index b6e1c33..0000000
--- a/tools/qvfb/LICENSE.GPL
+++ /dev/null
@@ -1,280 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, 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.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  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
-this service 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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) 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; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
-this License.
-
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. 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 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.
-
-		     END OF TERMS AND CONDITIONS
diff --git a/tools/tools.pro b/tools/tools.pro
index a602892..4b36115 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -6,7 +6,8 @@ no-png {
      SUBDIRS += assistant \
 		pixeltool \
 		porting \
-                qtestlib
+                qtestlib \
+                qttracereplay
      contains(QT_EDITION, Console) {
          SUBDIRS += designer/src/uitools     # Linguist depends on this
      } else {
diff --git a/tools/xmlpatterns/qapplicationargument_p.h b/tools/xmlpatterns/qapplicationargument_p.h
index f51c9a4..400759f 100644
--- a/tools/xmlpatterns/qapplicationargument_p.h
+++ b/tools/xmlpatterns/qapplicationargument_p.h
@@ -2,7 +2,8 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** ** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tools/xmlpatterns/qapplicationargumentparser_p.h b/tools/xmlpatterns/qapplicationargumentparser_p.h
index e4e8076..729480c 100644
--- a/tools/xmlpatterns/qapplicationargumentparser_p.h
+++ b/tools/xmlpatterns/qapplicationargumentparser_p.h
@@ -2,7 +2,8 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
-** ** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tools/xmlpatternsvalidator/main.h b/tools/xmlpatternsvalidator/main.h
index a884f11..9c7a2d6 100644
--- a/tools/xmlpatternsvalidator/main.h
+++ b/tools/xmlpatternsvalidator/main.h
@@ -1,10 +1,11 @@
 /****************************************************************************
- **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (qt-info@nokia.com)
- **
- ** This file is part of the Patternist project on Qt Labs.  * **
- ** $QT_BEGIN_LICENSE:LGPL$
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Patternist project on Qt Labs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
@@ -35,11 +36,8 @@
 **
 **
 ** $QT_END_LICENSE$
- **
- ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- **
- ****************************************************************************/
+**
+****************************************************************************/
 
 //
 //  W A R N I N G
diff --git a/util/lexgen/css2-simplified.lexgen b/util/lexgen/css2-simplified.lexgen
index 3976632..53facb1 100644
--- a/util/lexgen/css2-simplified.lexgen
+++ b/util/lexgen/css2-simplified.lexgen
@@ -1,9 +1,9 @@
 [Options]
-case-insensitive
+case-sensitive
 classname = QCssScanner_Generated
 
 [Code Generator Options]
-MapToCode[a-z] = (ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256
+MapToCode[a-z] = (ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256
 TokenPrefix = QCss::
 FileHeader = ../moc/licenseheader.txt
 
diff --git a/util/local_database/cldr2qlocalexml.py b/util/local_database/cldr2qlocalexml.py
index e4446c4..1c3debb 100755
--- a/util/local_database/cldr2qlocalexml.py
+++ b/util/local_database/cldr2qlocalexml.py
@@ -1,4 +1,44 @@
-#! /usr/bin/python
+#!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 import os
 import sys
diff --git a/util/local_database/enumdata.py b/util/local_database/enumdata.py
index b0ab848..5c65ff3 100644
--- a/util/local_database/enumdata.py
+++ b/util/local_database/enumdata.py
@@ -1,3 +1,45 @@
+#!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 # langugae_list and country_list reflect the current values of enums in qlocale.h
 # If new xml language files are available in CLDR, these languages and countries
 # need to be *appended* to this list.
diff --git a/util/local_database/qlocalexml2cpp.py b/util/local_database/qlocalexml2cpp.py
index d625cfd..ce4ed43 100755
--- a/util/local_database/qlocalexml2cpp.py
+++ b/util/local_database/qlocalexml2cpp.py
@@ -1,4 +1,44 @@
-#! /usr/bin/python
+#!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 import sys
 import xml.dom.minidom
diff --git a/util/local_database/xpathlite.py b/util/local_database/xpathlite.py
index 6e4dd71..9cfd335 100644
--- a/util/local_database/xpathlite.py
+++ b/util/local_database/xpathlite.py
@@ -1,3 +1,45 @@
+#!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 import sys
 import os
 import xml.dom.minidom
diff --git a/util/qlalr/doc/src/qlalr.qdoc b/util/qlalr/doc/src/qlalr.qdoc
index 313c7a4..d95b065 100644
--- a/util/qlalr/doc/src/qlalr.qdoc
+++ b/util/qlalr/doc/src/qlalr.qdoc
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 /*!
     \page qlalr.html
     \title qlalr
diff --git a/util/qlalr/examples/dummy-xml/xml.g b/util/qlalr/examples/dummy-xml/xml.g
index 212c829..61017d5 100644
--- a/util/qlalr/examples/dummy-xml/xml.g
+++ b/util/qlalr/examples/dummy-xml/xml.g
@@ -1,3 +1,43 @@
+----------------------------------------------------------------------------
+--
+-- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+-- Contact: Nokia Corporation (qt-info@nokia.com)
+--
+-- This file is part of the QtCore module of the Qt Toolkit.
+--
+-- $QT_BEGIN_LICENSE:LGPL$
+-- No Commercial Usage
+-- This file contains pre-release code and may not be distributed.
+-- You may use this file in accordance with the terms and conditions
+-- contained in the Technology Preview License Agreement accompanying
+-- this package.
+--
+-- GNU Lesser General Public License Usage
+-- Alternatively, this file may be used under the terms of the GNU Lesser
+-- General Public License version 2.1 as published by the Free Software
+-- Foundation and appearing in the file LICENSE.LGPL included in the
+-- packaging of this file.  Please review the following information to
+-- ensure the GNU Lesser General Public License version 2.1 requirements
+-- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+--
+-- In addition, as a special exception, Nokia gives you certain
+-- additional rights.  These rights are described in the Nokia Qt LGPL
+-- Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+-- package.
+--
+-- If you have questions regarding the use of this file, please contact
+-- Nokia at qt-info@nokia.com.
+--
+--
+--
+--
+--
+--
+--
+--
+-- $QT_END_LICENSE$
+--
+----------------------------------------------------------------------------
 
 %parser XMLTable
 
diff --git a/util/qlalr/examples/glsl/build.sh b/util/qlalr/examples/glsl/build.sh
index 0316911..1b7517f 100644
--- a/util/qlalr/examples/glsl/build.sh
+++ b/util/qlalr/examples/glsl/build.sh
@@ -1,4 +1,44 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 ${FLEX-flex} -oglsl-lex.incl glsl-lex.l
 ${QLALR-qlalr} glsl.g
diff --git a/util/qlalr/examples/glsl/glsl-lex.l b/util/qlalr/examples/glsl/glsl-lex.l
index 1e07c3b..8e3334a 100644
--- a/util/qlalr/examples/glsl/glsl-lex.l
+++ b/util/qlalr/examples/glsl/glsl-lex.l
@@ -1,5 +1,46 @@
 
 %{
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QLALR tool of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include <cassert>
 #define YY_DECL int GLSLParser::nextToken()
 %}
diff --git a/util/qlalr/examples/glsl/glsl.g b/util/qlalr/examples/glsl/glsl.g
index 3f3a3ad..36461af 100644
--- a/util/qlalr/examples/glsl/glsl.g
+++ b/util/qlalr/examples/glsl/glsl.g
@@ -1,3 +1,43 @@
+----------------------------------------------------------------------------
+--
+-- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+-- Contact: Nokia Corporation (qt-info@nokia.com)
+--
+-- This file is part of the QtCore module of the Qt Toolkit.
+--
+-- $QT_BEGIN_LICENSE:LGPL$
+-- No Commercial Usage
+-- This file contains pre-release code and may not be distributed.
+-- You may use this file in accordance with the terms and conditions
+-- contained in the Technology Preview License Agreement accompanying
+-- this package.
+--
+-- GNU Lesser General Public License Usage
+-- Alternatively, this file may be used under the terms of the GNU Lesser
+-- General Public License version 2.1 as published by the Free Software
+-- Foundation and appearing in the file LICENSE.LGPL included in the
+-- packaging of this file.  Please review the following information to
+-- ensure the GNU Lesser General Public License version 2.1 requirements
+-- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+--
+-- In addition, as a special exception, Nokia gives you certain
+-- additional rights.  These rights are described in the Nokia Qt LGPL
+-- Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+-- package.
+--
+-- If you have questions regarding the use of this file, please contact
+-- Nokia at qt-info@nokia.com.
+--
+--
+--
+--
+--
+--
+--
+--
+-- $QT_END_LICENSE$
+--
+----------------------------------------------------------------------------
 
 %parser GLSLParserTable
 %merged_output glsl.cpp
diff --git a/util/qlalr/examples/lambda/lambda.g b/util/qlalr/examples/lambda/lambda.g
index 2fb9594..f4a86b9 100644
--- a/util/qlalr/examples/lambda/lambda.g
+++ b/util/qlalr/examples/lambda/lambda.g
@@ -1,3 +1,43 @@
+----------------------------------------------------------------------------
+--
+-- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+-- Contact: Nokia Corporation (qt-info@nokia.com)
+--
+-- This file is part of the QtCore module of the Qt Toolkit.
+--
+-- $QT_BEGIN_LICENSE:LGPL$
+-- No Commercial Usage
+-- This file contains pre-release code and may not be distributed.
+-- You may use this file in accordance with the terms and conditions
+-- contained in the Technology Preview License Agreement accompanying
+-- this package.
+--
+-- GNU Lesser General Public License Usage
+-- Alternatively, this file may be used under the terms of the GNU Lesser
+-- General Public License version 2.1 as published by the Free Software
+-- Foundation and appearing in the file LICENSE.LGPL included in the
+-- packaging of this file.  Please review the following information to
+-- ensure the GNU Lesser General Public License version 2.1 requirements
+-- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+--
+-- In addition, as a special exception, Nokia gives you certain
+-- additional rights.  These rights are described in the Nokia Qt LGPL
+-- Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+-- package.
+--
+-- If you have questions regarding the use of this file, please contact
+-- Nokia at qt-info@nokia.com.
+--
+--
+--
+--
+--
+--
+--
+--
+-- $QT_END_LICENSE$
+--
+----------------------------------------------------------------------------
 
 -- lambda calculus
 
diff --git a/util/qlalr/examples/qparser/calc.g b/util/qlalr/examples/qparser/calc.g
index 24371d4..f3a9d71 100644
--- a/util/qlalr/examples/qparser/calc.g
+++ b/util/qlalr/examples/qparser/calc.g
@@ -1,3 +1,43 @@
+----------------------------------------------------------------------------
+--
+-- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+-- Contact: Nokia Corporation (qt-info@nokia.com)
+--
+-- This file is part of the QtCore module of the Qt Toolkit.
+--
+-- $QT_BEGIN_LICENSE:LGPL$
+-- No Commercial Usage
+-- This file contains pre-release code and may not be distributed.
+-- You may use this file in accordance with the terms and conditions
+-- contained in the Technology Preview License Agreement accompanying
+-- this package.
+--
+-- GNU Lesser General Public License Usage
+-- Alternatively, this file may be used under the terms of the GNU Lesser
+-- General Public License version 2.1 as published by the Free Software
+-- Foundation and appearing in the file LICENSE.LGPL included in the
+-- packaging of this file.  Please review the following information to
+-- ensure the GNU Lesser General Public License version 2.1 requirements
+-- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+--
+-- In addition, as a special exception, Nokia gives you certain
+-- additional rights.  These rights are described in the Nokia Qt LGPL
+-- Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+-- package.
+--
+-- If you have questions regarding the use of this file, please contact
+-- Nokia at qt-info@nokia.com.
+--
+--
+--
+--
+--
+--
+--
+--
+-- $QT_END_LICENSE$
+--
+----------------------------------------------------------------------------
 
 %parser calc_grammar
 %decl calc_parser.h
diff --git a/util/qlalr/examples/qparser/calc.l b/util/qlalr/examples/qparser/calc.l
index 95181d5..eed04ab 100644
--- a/util/qlalr/examples/qparser/calc.l
+++ b/util/qlalr/examples/qparser/calc.l
@@ -2,6 +2,47 @@
 %option noyywrap
 
 %{
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QLALR tool of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include "calc_parser.h"
 #include <cstdlib>
 
diff --git a/util/qlalr/lalr.g b/util/qlalr/lalr.g
index bef3063..b20272b 100644
--- a/util/qlalr/lalr.g
+++ b/util/qlalr/lalr.g
@@ -37,9 +37,6 @@
 --
 -- $QT_END_LICENSE$
 --
--- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
---
 -----------------------------------------------------------------------------
 
 
diff --git a/util/qtscriptparser/make-parser.sh b/util/qtscriptparser/make-parser.sh
index 6620e64..232cac6 100644
--- a/util/qtscriptparser/make-parser.sh
+++ b/util/qtscriptparser/make-parser.sh
@@ -1,4 +1,44 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 me=$(dirname $0)
 mkdir -p $me/out
diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h
index 9e5ddf1..a5699da 100755
--- a/util/scripts/make_qfeatures_dot_h
+++ b/util/scripts/make_qfeatures_dot_h
@@ -1,4 +1,45 @@
 #!/usr/bin/perl
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 #
 # Usage:  make_qfeatures_dot_h
 #
@@ -94,8 +135,8 @@ print OUT
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** contained in the Technology Preview License Agreement accompanying
+** this package.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -106,20 +147,20 @@ print OUT
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ** package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info\@nokia.com.
+**
+**
+**
+**
+**
+**
+**
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
 ** \$QT_END_LICENSE\$
 **
 ****************************************************************************/
diff --git a/util/unicode/writingSystems.sh b/util/unicode/writingSystems.sh
index 0fdc7a3..521f647 100755
--- a/util/unicode/writingSystems.sh
+++ b/util/unicode/writingSystems.sh
@@ -1,4 +1,45 @@
 #!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain
+## additional rights.  These rights are described in the Nokia Qt LGPL
+## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+## package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 #
 # This script generates the QFontDatabase::WritingSystem enum.  It
 # uses the Unicode 4.0 Scripts.txt data file as the source, with the