Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: I10a73c7f3011e8d9ee40d9b19be3a7d463515bda

11 files changed, 296 insertions, 131 deletions

diff --git a/doc/src/images/qt5_everywhere_demo.jpg b/doc/src/images/qt5_everywhere_demo.jpg
index dd17f700..2d27f2e6 100644
--- a/doc/src/images/qt5_everywhere_demo.jpg
+++ b/doc/src/images/qt5_everywhere_demo.jpg
diff --git a/doc/src/images/qtpositioning_weatherinfo_ex.jpg b/doc/src/images/qtpositioning_weatherinfo_ex.jpg
index d065bf9d..24c5cfba 100644
--- a/doc/src/images/qtpositioning_weatherinfo_ex.jpg
+++ b/doc/src/images/qtpositioning_weatherinfo_ex.jpg
diff --git a/doc/src/images/qtquickcontrols-example-gallery-android.png b/doc/src/images/qtquickcontrols-example-gallery-android.png
new file mode 100644
index 00000000..11ba2cc0
--- /dev/null
+++ b/doc/src/images/qtquickcontrols-example-gallery-android.png
diff --git a/doc/src/images/qtquickcontrols-example-gallery-osx.png b/doc/src/images/qtquickcontrols-example-gallery-osx.png
new file mode 100644
index 00000000..492dc36e
--- /dev/null
+++ b/doc/src/images/qtquickcontrols-example-gallery-osx.png
diff --git a/doc/src/images/qtquickcontrols-example-gallery.jpg b/doc/src/images/qtquickcontrols-example-gallery.jpg
deleted file mode 100644
index 979a3caf..00000000
--- a/doc/src/images/qtquickcontrols-example-gallery.jpg
+++ /dev/null
diff --git a/doc/src/images/qtsensors_accelbubble_ex.jpg b/doc/src/images/qtsensors_accelbubble_ex.jpg
index a512cfa1..576ddee0 100644
--- a/doc/src/images/qtsensors_accelbubble_ex.jpg
+++ b/doc/src/images/qtsensors_accelbubble_ex.jpg
diff --git a/doc/src/images/qtwebengine_quicknanobrowser.jpg b/doc/src/images/qtwebengine_quicknanobrowser.jpg
new file mode 100644
index 00000000..d4907a9d
--- /dev/null
+++ b/doc/src/images/qtwebengine_quicknanobrowser.jpg
diff --git a/doc/src/images/quick_controls_touch_ex.jpg b/doc/src/images/quick_controls_touch_ex.jpg
deleted file mode 100644
index fb334b65..00000000
--- a/doc/src/images/quick_controls_touch_ex.jpg
+++ /dev/null
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index d670b89c..b86d8556 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -169,6 +169,66 @@
 
     See \c qtbase/src/3rdparty/harfbuzz/COPYING for license details.
 
+    \section1 JasPer (libjasper) version 2.0
+
+    \e {JasPer is a collection of software (i.e., a library and application
+    programs) for the coding and manipulation of images.}
+
+    \badcode
+    JasPer License Version 2.0
+
+    Copyright (c) 2001-2006 Michael David Adams
+    Copyright (c) 1999-2000 Image Power, Inc.
+    Copyright (c) 1999-2000 The University of British Columbia
+
+    All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person (the
+    "User") obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without restriction,
+    including without limitation the rights to use, copy, modify, merge,
+    publish, distribute, and/or sell copies of the Software, and to permit
+    persons to whom the Software is furnished to do so, subject to the
+    following conditions:
+
+    1.  The above copyright notices and this permission notice (which
+    includes the disclaimer below) shall be included in all copies or
+    substantial portions of the Software.
+
+    2.  The name of a copyright holder shall not be used to endorse or
+    promote products derived from the Software without specific prior
+    written permission.
+
+    THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+    LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
+    THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
+    "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+    PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
+    EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+    INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+    FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+    NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+    WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
+    PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
+    THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
+    EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
+    BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
+    PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
+    GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
+    ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
+    IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
+    SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
+    AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
+    SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
+    THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
+    PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
+    RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
+    EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
+    \endcode
+
+    See \c qtimageformats/src/3rdparty/jasper/LICENSE.
+
     \section1 JPEG Software (libjpeg) version 8c
 
     \e{This package contains C software to implement JPEG image compression and
@@ -252,6 +312,34 @@
     information about the terms and conditions under which the code is
     supplied.
 
+    \section1 Mesa 3D Graphics Library
+
+    \e {Mesa is a 3-D graphics library with an API which is very similar to that
+    of OpenGL}.
+
+    \badcode
+    Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+    BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    \endcode
+
+    See \l {http://www.mesa3d.org/license.html} for details.
+
     \section1 MNG Library (libmng) version 1.0.10
 
     \e{The libmng library supports decoding, displaying, encoding, and various
@@ -1613,7 +1701,7 @@
     \section1 Poly2tri
     \e{Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library.}
 
-    \code
+    \badcode
     Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
     http://code.google.com/p/poly2tri/
 
@@ -1783,4 +1871,46 @@
     \list
         \li From \c {qtwayland/src/3rdparty/protocol/wayland.xml}
     \endlist
+
+    \section1 WebP (libwebp) version 0.4.0
+
+    \e {WebP is a new image format that provides lossless and lossy
+    compression for images on the web.}
+    -- quoted from \l{https://developers.google.com/speed/webp}.
+
+    \hr
+
+    Copyright (c) 2010, Google Inc. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in
+        the documentation and/or other materials provided with the
+        distribution.
+
+      * Neither the name of Google nor the names of its contributors may
+        be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    \hr
+
+    See \c qtimageformats/src/3rdparty/libwebp/COPYING for license details.
 */
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index bcf22cb9..a38a6bdd 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -138,13 +138,14 @@
          \li implements the MD4 message-digest algorithm. \li BSD \li
     \row \li \l{MD5 (md5.cpp and md5.h)}{MD5}
          \li implements the MD5 message-digest algorithm. \li BSD \li
+    \row \li \l {Mesa 3D Graphics Library}{Mesa llvmpipe}
+         \li Mesa llvmpipe software rasterizer backend (\c opengl32sw.dll) for Windows builds. \li MIT \li \l {Qt for Windows}
     \row \li \l{SHA-1 (sha1.cpp)}{SHA-1}
          \li implements the SHA-1 encryption algorithm. \li BSD \li
     \row \li \l{SHA-3, originally known as Keccak}{SHA-3}
          \li implements the SHA-3 encryption algorithm. \li BSD \li
     \row \li \l{Data Compression Library (zlib) version 1.2.5}{zlib}
          \li zlib is a general purpose data compression library. \li BSD-style \li
-    \row \li \li \li \li
 
     \row \li {1,12} Qt Gui
     \row \li \l{QKeyMapper class on X11 platforms}{QKeyMapper}
@@ -284,16 +285,20 @@
     \row \li {1,6} Qt Image Formats
 
     \row \li {4,1} \b{Third-party Licenses}
+    \row \li \l{JasPer (libjasper) version 2.0}{JasPer}
+         \li A collection of software for the coding and manipulation of images. \li BSD-style \li
     \row \li \l{TIFF Software Distribution (libtiff) version 3.9.2}{TIFF}
          \li libtiff is a set of C functions (a library) that support the manipulation of TIFF image files. \li BSD \li
     \row \li \l{MNG Library (libmng) version 1.0.10}{MNG}
          \li Support decoding and displaying of MNG format image files. \li BSD-style \li
+    \row \li \l{WebP (libwebp) version 0.4.0}{WebP}
+         \li Support decoding and displaying of WebP format image files. \li BSD-style \li
     \row \li \li \li \li
     \row \li \li \li \li
 
     \row \li {1,4} Qt SQL
 
-    \row \li \l{SQLite (sqlite) version 3.7.17.0}{SQLite}
+    \row \li \l{SQLite (sqlite) version 3.8.5.0}{SQLite}
          \li A C library that implements a self-contained, embeddable, zero-configuration SQL database engine. \li BSD-style \li
     \row \li \li \li \li
     \row \li \li \li \li
@@ -358,10 +363,6 @@
 
     See also: \l{Licenses for Fonts Used in Qt for Embedded Linux}
 
-    \hr
-
-    \generatelist legalese
-
     \section1 Native Style for Android
 
     \legalese
@@ -638,7 +639,7 @@
 
     \section1 ANGLE
 
-    Copyright (C) 2002-2010 The ANGLE Project Authors.
+    Copyright (C) 2002-2013 The ANGLE Project Authors.
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -672,56 +673,9 @@
     POSSIBILITY OF SUCH DAMAGE.
 
     \list
-    \li ANGLE library in qtbase/src/testlib/3rdparty/angle
+    \li ANGLE library in qtbase/src/3rdparty/angle
     \endlist
 
-    \hr
-
-    Copyright (c) 2002, NVIDIA Corporation.
-
-    NVIDIA Corporation("NVIDIA") supplies this software to you in
-    consideration of your agreement to the following terms, and your use,
-    installation, modification or redistribution of this NVIDIA software
-    constitutes acceptance of these terms.  If you do not agree with these
-    terms, please do not use, install, modify or redistribute this NVIDIA
-    software.
-
-    In consideration of your agreement to abide by the following terms, and
-    subject to these terms, NVIDIA grants you a personal, non-exclusive
-    license, under NVIDIA's copyrights in this original NVIDIA software (the
-    "NVIDIA Software"), to use, reproduce, modify and redistribute the
-    NVIDIA Software, with or without modifications, in source and/or binary
-    forms; provided that if you redistribute the NVIDIA Software, you must
-    retain the copyright notice of NVIDIA, this notice and the following
-    text and disclaimers in all such redistributions of the NVIDIA Software.
-    Neither the name, trademarks, service marks nor logos of NVIDIA
-    Corporation may be used to endorse or promote products derived from the
-    NVIDIA Software without specific prior written permission from NVIDIA.
-    Except as expressly stated in this notice, no other rights or licenses
-    express or implied, are granted by NVIDIA herein, including but not
-    limited to any patent rights that may be infringed by your derivative
-    works or by other works in which the NVIDIA Software may be
-    incorporated. No hardware is licensed hereunder.
-
-    THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-    WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-    INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-    NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-    ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-    PRODUCTS.
-
-    IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-    INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-    TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-    USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-    OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-    NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-    TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-    NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li ANGLE preprosessor in qtbase/src/testlib/3rdparty/angle/src/compiler/preprocessor
-    \endlist
 
     \section1 WebKit used by the QtWebKit module
 
diff --git a/doc/src/qt5-intro.qdoc b/doc/src/qt5-intro.qdoc
index 0c0dfafb..ceb6d399 100644
--- a/doc/src/qt5-intro.qdoc
+++ b/doc/src/qt5-intro.qdoc
@@ -56,19 +56,30 @@
 
     \section1 Qt Everywhere on Mobile
 
-    Qt now comes with production-ready ports of for Android, iOS, and WinRT
+    \raw HTML
+    <div class="table">
+     <table style="background:transparent; border: none">
+      <tr><td style="width:50%; border: none; vertical-align: top">
+    \endraw
+    Qt now comes with production-ready ports for Android, iOS, and WinRT
     (including Windows Phone 8). Extensive work has gone into these platform
     ports, which now extend Qt’s multi-platform promise to cover desktop,
-    embedded, and mobile platforms with just one framework, Qt.
-
+    embedded, and mobile platforms.
+    \raw HTML
+     <br>
+    \endraw
     With full support for Android, iOS, WinRT, and Blackberry 10, Qt is a
     great solution for targeting the mobile markets with a single codebase.
     It is fast and easy to bring existing desktop or embedded application
     to mobile, by simply recompiling it.
-
+    \raw HTML
+     <br>
+    \endraw
     You can install several demo applications that showcase the power of Qt
     on these mobile platforms. Here is a small list of such applications:
-
+    \raw HTML
+     <br>
+    \endraw
     Demo applications:
     \list
     \li \l{Google Play: Introduction to Qt 5}{Introduction to Qt 5}
@@ -92,29 +103,37 @@
     \li \l{Qt for iOS}
     \li \l{Qt for WinRT}
     \endlist
-
-    \table
-    \header
-    \li Qt Everywhere demo on Nexus 7
-    \row
-    \li \image qt5_everywhere_demo.jpg
-    \endtable
+    \raw HTML
+      </td><td style="width:50%; vertical-align:top;border: none;">
+    \endraw
+    \image qt5_everywhere_demo.jpg
+    \caption Qt Everywhere demo on Nexus 7
+    \raw HTML
+      </td></tr>
+     </table>
+    </div>
+    \endraw
 
     \section1 Amazing Graphics Capability and Performance
 
+    \raw HTML
+    <div class="table">
+     <table style="background:transparent; border: none">
+      <tr><td style="width:50%; vertical-align:top;border: none;">
+    \endraw
+    \image qt5_shadereffect.jpg
+    \caption ShaderEffect on an \l Image
+    \raw HTML
+      </td><td style="width:50%; border: none; vertical-align: top">
+    \endraw
     Qt 5 uses an OpenGL-based scene graph to accelerate the graphics
     of Qt Quick, making it possible to do visually appealing user
     interfaces with animations, impressive graphical effects and
     particle systems, even on the constrained hardware environments of
     mobile and embedded devices.
-
-    \table
-    \header
-    \li ShaderEffect on an \l Image
-    \row
-    \li \image qt5_shadereffect.jpg
-    \endtable
-
+    \raw HTML
+     <br>
+    \endraw
     The benefits of this architectural change in the rendering engine are
     well demonstrated by the following projects:
     \list
@@ -126,9 +145,19 @@
     \li \l{QtonPi} - Good example of Qt 5 running on the low cost hardware,
     Raspberry PI.
     \endlist
+    \raw HTML
+      </td></tr>
+     </table>
+    </div>
+    \endraw
 
     \section1 Qt Quick in Qt 5
 
+    \raw HTML
+    <div class="table">
+     <table style="background:transparent; border: none;">
+      <tr><td style="width:50%; border-bottom:0px;">
+    \endraw
     \l{Qt Quick} provides the necessary infrastructure to develop QML
     applications. The latest version (v2.0) of this technology also
     introduces a set of new C++ classes as a replacement for the
@@ -159,54 +188,66 @@
     \li \l{Qt Quick Scene Graph}{OpenGL-based rendering architecture} for
     optimal performance.
     \endlist
-
-    \table
-    \header
-    \li Qt Quick's \l{Qt Quick Particles QML Types}{Particle System}
-    \row
-    \li \image qt5_particles.jpg
-    \endtable
-
-    Qt Quick's \l {Using the Qt Quick Particle System}{Particle System}
-
+    \raw HTML
+      </td><td style="width:50%; vertical-align:top;border: none;">
+    \endraw
+    \image qt5_particles.jpg
+    \caption Qt Quick's \l{Qt Quick Particles QML Types}{Particle System}
+    \raw HTML
+      </td></tr><tr><td style="width:50%; vertical-align:top;border: none;">
+    \endraw
     The \l {qtgraphicaleffects-index.html}{Qt Graphical Effects} module
     provides a number of ready-made effects for use in Qt Quick
     applications, including soft drop shadow, blur, glow and colorize.
-
-    \table
-    \header
-    \li Excerpts from the Qt Graphical Effects module
-    \row
-    \li \image qt5_graphicaleffects.jpg
-    \endtable
+    \raw HTML
+      </td><td style="width:50%; vertical-align:top;border: none;">
+    \endraw
+    \image qt5_graphicaleffects.jpg
+    \caption Excerpts from the Qt Graphical Effects module
+    \raw HTML
+      </td></tr>
+     </table>
+    </div>
+    \endraw
 
     \section1 Designing UI Made Simpler
 
+
+
+
+    \raw HTML
+    <div class="table">
+     <table style="background:transparent; border: none">
+      <tr><td style="width:25%; border: none; vertical-align: top">
+    \endraw
+    \image qtquickcontrols-example-gallery-android.png
+    \caption Controls gallery example on Android
+    \raw HTML
+      </td><td style="width:30%; border: none; vertical-align: top">
+    \endraw
+    \image qtquickcontrols-example-gallery-osx.png
+    \caption Controls gallery example on OS X
+    \raw HTML
+      </td><td style="width:45%; border: none; vertical-align: top">
+    \endraw
     UI designing can be time consuming if there are not enough tools to help.
     Qt Quick does reduce the effort considerably compared to the traditional
     native (C or C++) approach, but the new \l{Qt Quick Controls} and
     \l{Qt Quick Layouts} take it a step further. These new modules provide
     ready-to-use UI controls and layouts to enable faster application
     development and with less code.
-
+    \raw HTML
+      <br>
+    \endraw
     Qt Quick Controls and Qt Quick Layouts provide a vast set of UI controls
     ranging from the most basic TextField and Button to the more complex
     TableView and TabView. These controls are also made available in
     \l{Qt Creator: Using Qt Quick Designer}{Qt Quick Designer}.
-
-    \table
-    \header
-    \li Controls touch example on Nexus 7
-    \row
-    \li \image quick_controls_touch_ex.jpg
-    \endtable
-
-    \table
-    \header
-    \li Component gallery example on Ubuntu 12.04
-    \row
-    \li \image qtquickcontrols-example-gallery.jpg
-    \endtable
+    \raw HTML
+      </td></tr>
+     </table>
+    </div>
+    \endraw
 
     \section1 Sensor and Location
 
@@ -215,14 +256,23 @@
     can support such use cases in your Qt application using the
     \l{Qt Sensors} and \l{Qt Positioning} modules.
 
-    \table
-    \header
-    \li Accelerating SVG image
-    \li Location-based weather information
-    \row
-    \li \image qtsensors_accelbubble_ex.jpg
-    \li \image qtpositioning_weatherinfo_ex.jpg
-    \endtable
+    \raw HTML
+    <div class="table">
+     <table style="background:transparent; border: none">
+      <tr><td style="width:50%; vertical-align:top;border: none;">
+    \endraw
+    \image qtsensors_accelbubble_ex.jpg
+    \caption Accelerating SVG image
+    \raw HTML
+      </td><td style="width:50%; vertical-align:top;border: none;">
+    \endraw
+    \image qtpositioning_weatherinfo_ex.jpg
+    \caption Location-based weather information
+    \raw HTML
+      </td></tr>
+     </table>
+    </div>
+    \endraw
 
     \section1 Qt Cloud Backend
 
@@ -239,31 +289,56 @@
 
     \section1 Web Engine and HTML5
 
+    \raw HTML
+    <div class="table">
+     <table style="background:transparent; border: none">
+      <tr><td colspan=2 style="width:50%; border: none; vertical-align: top">
+    \endraw
+    \image qtwebengine_quicknanobrowser.jpg
+    \caption Qt Quick nano browser
+    \raw HTML
+      </td><td style="width:50%; border: none; vertical-align: top">
+    \endraw
     \l{Qt WebEngine} is a web content rendering engine based on Chromium
     featuring broad support for standard web technologies. It provides
     integration with both Qt Quick and traditional widgets. The module brings
     the latest in  HTML5 advancements to Qt 5, including CSS filters, animations
     and video, and Canvas.
-
-    This Chromium-based Web Engnine support in Qt is complemented with
+    \raw HTML
+     <br>
+    \endraw
+    This Chromium-based Web Engine support in Qt is complemented with
     \l{Qt WebChannel}, which bridges the gap between QML/C++ and
     HTML/JavaScript. It enables sharing QObjects from QML/C++ with
     HTML/JavaScript-based clients.
+    \raw HTML
+      </td></tr>
+     </table>
+    </div>
+    \endraw
 
     \section1 Multimedia
 
+    \raw HTML
+    <div class="table">
+     <table style="background:transparent; border: none">
+      <tr><td colspan=2 style="width:50%; border: none; vertical-align: top">
+    \endraw
     \l {Qt Multimedia} provides a rich set of QML types and C++ classes to
     handle multimedia content. It also provides necessary APIs to access
     the camera and radio functionality. Qt 5 brings the Qt Multimedia
     module into the set of essential modules with support on all major
     platforms.
-
-    \table
-    \header
-    \li Video embedded into a Qt Quick application with a displacement effect
-    \row
-    \li \image qt5_video.jpg
-    \endtable
+    \raw HTML
+      </td><td style="width:50%; border: none;">
+    \endraw
+    \image qt5_video.jpg
+    \caption Video embedded into a Qt Quick application with a displacement effect
+    \raw HTML
+      </td></tr>
+     </table>
+    </div>
+    \endraw
 
     \section1 Platform-specific Extras
 
@@ -303,12 +378,18 @@
     The \l {Qt Widgets} have been separated into their own module in
     Qt 5, the Qt Widgets module. It is part of the essential modules.
 
-    \table
-    \header
-    \li Screen capture of a widget application.
-    \row
-    \li \image qt5_widgets.jpg
-    \endtable
+    \raw HTML
+    <div class="table">
+     <table style="background:transparent; border: none">
+      <tr><td colspan=2 style="width:50%; border: none; vertical-align: top">
+    \endraw
+    \image qt5_widgets.jpg
+    \caption Screen capture of a widget application.
+    \raw HTML
+      </td></tr>
+     </table>
+    </div>
+    \endraw
 
     Designing the UI for widget-based applications can be quick with
     \l{Qt Designer Manual}{Qt Designer}.