Merge remote-tracking branch 'origin/5.13' into 5.14

Change-Id: I859b5820a93517c7172f4cd03317fce0a662ed63

doc/src/examples.qdoc

@@ -89,7 +89,7 @@
         \li \l{First Steps with QML}
         \li \l{Qt Creator: Developing Qt Quick Applications}{Developing Qt Quick Applications}
         \li \l{Qt Quick Controls 1 - Gallery}
-        \li \l{Qt Quick Controls 2 - Gallery}
+        \li \l{Qt Quick Controls - Gallery}
         \li \l{QML Advanced Tutorial}{SameGame}
         \li \l{Qt Quick Text Editor Guide}
         \endlist

doc/src/howtos/scalabilityintro.qdoc

@@ -62,8 +62,7 @@
     To implement scalable applications using \l{Qt Quick}:
 
     \list
-        \li Design UIs using \e {Qt Quick Controls} or \e {Qt Quick Controls 2}
-            that provide sets of UI controls.
+        \li Design UIs using \e {Qt Quick Controls} that provide sets of UI controls.
         \li Define layouts using \e {Qt Quick Layouts}, which can resize their
             items.
         \li Use \e {property binding} to implement use cases

doc/src/qmlapp/applicationdevelopers.qdoc

@@ -99,7 +99,7 @@ several built-in styles that can be used, and also support the creation
 of custom styles.
 
 \list
-\li \l{Qt Quick Controls 2 Guidelines}
+\li \l{Qt Quick Controls Guidelines}
 \li \l{Qt Quick Templates 2}
 \endlist
 

doc/src/qt5-intro.qdoc

@@ -103,7 +103,7 @@
     \li \l{Qt for WinRT}
     \endlist
     \raw HTML
-      </td><td style="width:50%; vertical-align:top;border: none;">
+      </td><td style="width:50%; vertical-align:top; border: none">
     \endraw
     \image qt5_everywhere_demo.jpg
     \caption Qt Everywhere demo on Nexus 7
@@ -118,7 +118,7 @@
     \raw HTML
     <div class="table">
      <table style="background:transparent; border: none">
-      <tr><td style="width:50%; vertical-align:top;border: none;">
+      <tr><td style="width:50%; vertical-align:top; border: none">
     \endraw
     \image qt5_shadereffect.jpg
     \caption ShaderEffect on an \l Image
@@ -154,8 +154,8 @@
 
     \raw HTML
     <div class="table">
-     <table style="background:transparent; border: none;">
-      <tr><td style="width:50%; vertical-align:top;">
+     <table style="background:transparent; border: none">
+      <tr><td style="width:50%; vertical-align:top; border: none">
     \endraw
     \l{Qt Quick} provides the necessary infrastructure to develop QML
     applications. The latest version (v2.0) of this technology also
@@ -188,18 +188,18 @@
     optimal performance.
     \endlist
     \raw HTML
-      </td><td style="width:50%; vertical-align:top;border: none;">
+      </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;">
+      </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.
     \raw HTML
-      </td><td style="width:50%; vertical-align:top;border: none;">
+      </td><td style="width:50%; vertical-align:top; border: none">
     \endraw
     \image qt5_graphicaleffects.jpg
     \caption Excerpts from the Qt Graphical Effects module
@@ -217,17 +217,16 @@
       <tr><td style="width:50%; border: none; vertical-align: top">
     \endraw
     \image qtquickcontrols2-material.png
-    \caption Qt Quick Controls 2 Material style
+    \caption Qt Quick Controls Material style
     \raw HTML
       </td><td style="width:50%; border: none; vertical-align: top">
     \endraw
     UI designing can be time consuming if there are not enough tools to help.
     Qt Quick reduces the effort considerably compared to the traditional
-    native (C or C++) approach, especially if the \l{Qt Quick Controls} or
-    \l{Qt Quick Controls 2} and \l{Qt Quick Layouts} modules are used. These
-    modules provide ready-to-use UI controls and layouts to enable faster
-    application development with less code. For a comparison of the two sets of
-    controls, see \l {Differences with Qt Quick Controls 1}.
+    native (C or C++) approach, especially if the \l{Qt Quick Controls} and
+    \l{Qt Quick Layouts} modules are used. These modules provide ready-to-use
+    UI controls and layouts to enable faster application development with less
+    code.
     \raw HTML
       <br>
     \endraw
@@ -251,12 +250,12 @@
     \raw HTML
     <div class="table">
      <table style="background:transparent; border: none">
-      <tr><td style="width:50%; vertical-align:top;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;">
+      </td><td style="width:50%; vertical-align:top; border: none">
     \endraw
     \image qtpositioning_weatherinfo_ex.jpg
     \caption Location-based weather information
@@ -378,7 +377,7 @@
     \raw HTML
     <div class="table">
      <table style="background:transparent; border: none">
-      <tr><td style="width:50%; vertical-align:top;border: none;">
+      <tr><td style="width:50%; vertical-align:top; border: none">
     \endraw
     In today's world, location and maps information is more widely used, be it
     to look up nearby restaurants or plan commute to the office. With Qt,

doc/src/qtmodules.qdoc

@@ -431,6 +431,7 @@
     \section1 Technology Preview Features
 
     The following features are still in development but are available as technology previews.
+    They are licensed under Commercial Licenses, or GNU General Public License v3.
 
     \table 80%
     \header
@@ -441,7 +442,7 @@
         \li A platform target to compile Qt applications for the web browsers using WebAssembly.
     \row
         \li \l{Qt Lottie Animation} (Technology Preview)
-        \li  A QML API for rendering graphics and animations in JSON format,
+        \li A QML API for rendering graphics and animations in JSON format,
             exported by the \l Bodymovin plugin for Adobe® After Effects.
     \endtable