Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/android/androidjnimain.cpp
	src/plugins/platforms/android/qandroidplatformintegration.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/android/qandroidplatformopenglcontext.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/sql/doc/src/sql-driver.qdoc
	src/widgets/widgets/qtoolbararealayout.cpp

Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e

13 files changed, 14 insertions, 14 deletions

diff --git a/examples/widgets/doc/images/basicgraphicslayouts-example.png b/examples/widgets/doc/images/basicgraphicslayouts-example.png
index 5c8f4cbc5d..6b8b39090f 100644
--- a/examples/widgets/doc/images/basicgraphicslayouts-example.png
+++ b/examples/widgets/doc/images/basicgraphicslayouts-example.png
diff --git a/examples/widgets/doc/images/basiclayouts-example.png b/examples/widgets/doc/images/basiclayouts-example.png
index f293423a8e..4a1c45dd80 100644
--- a/examples/widgets/doc/images/basiclayouts-example.png
+++ b/examples/widgets/doc/images/basiclayouts-example.png
diff --git a/examples/widgets/doc/images/draganddroppuzzle-example.png b/examples/widgets/doc/images/draganddroppuzzle-example.png
index 812278210d..ca6844581e 100644
--- a/examples/widgets/doc/images/draganddroppuzzle-example.png
+++ b/examples/widgets/doc/images/draganddroppuzzle-example.png
diff --git a/examples/widgets/doc/images/dropsite-example.png b/examples/widgets/doc/images/dropsite-example.png
index 42b988d733..2c42c7be69 100644
--- a/examples/widgets/doc/images/dropsite-example.png
+++ b/examples/widgets/doc/images/dropsite-example.png
diff --git a/examples/widgets/doc/images/echopluginexample.png b/examples/widgets/doc/images/echopluginexample.png
index 7cb1e4d63b..24e039714f 100644
--- a/examples/widgets/doc/images/echopluginexample.png
+++ b/examples/widgets/doc/images/echopluginexample.png
diff --git a/examples/widgets/doc/images/fridgemagnets-example.png b/examples/widgets/doc/images/fridgemagnets-example.png
index 9adb572afc..2a890aad4e 100644
--- a/examples/widgets/doc/images/fridgemagnets-example.png
+++ b/examples/widgets/doc/images/fridgemagnets-example.png
diff --git a/examples/widgets/doc/images/graphicsanchorlayout-example.png b/examples/widgets/doc/images/graphicsanchorlayout-example.png
index d30d6839d9..3f35fdb6b7 100644
--- a/examples/widgets/doc/images/graphicsanchorlayout-example.png
+++ b/examples/widgets/doc/images/graphicsanchorlayout-example.png
diff --git a/examples/widgets/doc/images/graphicsflowlayout-example.png b/examples/widgets/doc/images/graphicsflowlayout-example.png
index a5f9b3dc40..953d54086a 100644
--- a/examples/widgets/doc/images/graphicsflowlayout-example.png
+++ b/examples/widgets/doc/images/graphicsflowlayout-example.png
diff --git a/examples/widgets/doc/images/graphicssimpleanchorlayout-example.png b/examples/widgets/doc/images/graphicssimpleanchorlayout-example.png
index d073b12c0c..543670e05c 100644
--- a/examples/widgets/doc/images/graphicssimpleanchorlayout-example.png
+++ b/examples/widgets/doc/images/graphicssimpleanchorlayout-example.png
diff --git a/examples/widgets/doc/images/itemviewspuzzle-example.png b/examples/widgets/doc/images/itemviewspuzzle-example.png
index 05ae28be81..aae6a953ca 100644
--- a/examples/widgets/doc/images/itemviewspuzzle-example.png
+++ b/examples/widgets/doc/images/itemviewspuzzle-example.png
diff --git a/examples/widgets/doc/images/mainwindow-demo.png b/examples/widgets/doc/images/mainwindow-demo.png
index 5799dc0fa3..0e146d156e 100644
--- a/examples/widgets/doc/images/mainwindow-demo.png
+++ b/examples/widgets/doc/images/mainwindow-demo.png
diff --git a/examples/widgets/doc/images/mousebutton-buttontester.png b/examples/widgets/doc/images/mousebutton-buttontester.png
index 82fcb7617f..f8f71db59b 100644
--- a/examples/widgets/doc/images/mousebutton-buttontester.png
+++ b/examples/widgets/doc/images/mousebutton-buttontester.png
diff --git a/examples/widgets/doc/src/plugandpaint.qdoc b/examples/widgets/doc/src/plugandpaint.qdoc
index bfb763b7d1..4e48245bd9 100644
--- a/examples/widgets/doc/src/plugandpaint.qdoc
+++ b/examples/widgets/doc/src/plugandpaint.qdoc
@@ -47,9 +47,9 @@
     If you want to learn how to make your own application extensible
     through plugins, we recommend that you start by reading this
     overview, which explains how to make an application use plugins.
-    Afterward, you can read the
+    Afterwards, you can read the
     \l{tools/plugandpaintplugins/basictools}{Basic Tools} and
-    \l{plugandpaintplugins/extrafilters}{Extra Filters}
+    \l{tools/plugandpaintplugins/extrafilters}{Extra Filters}
     overviews, which show how to implement static and dynamic
     plugins, respectively.
 
@@ -126,8 +126,8 @@
     a good idea to include a version number in the string, as we did
     above.
 
-    The \l{plugandpaintplugins/basictools}{Basic Tools} plugin
-    and the \l{plugandpaintplugins/extrafilters}{Extra Filters}
+    The \l{tools/plugandpaintplugins/basictools}{Basic Tools} plugin
+    and the \l{tools/plugandpaintplugins/extrafilters}{Extra Filters}
     plugin shows how to derive from \c BrushInterface, \c
     ShapeInterface, and \c FilterInterface.
 
@@ -275,7 +275,7 @@
 
     \section1 Importing Static Plugins
 
-    The \l{plugandpaintplugins/basictools}{Basic Tools} plugin
+    The \l{tools/plugandpaintplugins/basictools}{Basic Tools} plugin
     is built as a static plugin, to ensure that it is always
     available to the application. This requires using the
     Q_IMPORT_PLUGIN() macro somewhere in the application (in a \c
@@ -307,7 +307,7 @@
 
     This completes our review of the Plug & Paint application. At
     this point, you might want to take a look at the
-    \l{plugandpaintplugins/basictools}{Basic Tools} example
+    \l{tools/plugandpaintplugins/basictools}{Basic Tools} example
     plugin.
 */
 
@@ -316,7 +316,7 @@
     \title Plug & Paint Basic Tools Example
 
     The Basic Tools example is a static plugin for the
-    \l{plugandpaint}{Plug & Paint} example. It provides a set
+    \l{tools/plugandpaint}{Plug & Paint} example. It provides a set
     of basic brushes, shapes, and filters. Through the Basic Tools
     example, we will review the four steps involved in writing a Qt
     plugin:
@@ -333,7 +333,7 @@
     \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.h 0
 
     We start by including \c interfaces.h, which defines the plugin
-    interfaces for the \l{plugandpaint}{Plug & Paint}
+    interfaces for the \l{tools/plugandpaint}{Plug & Paint}
     application. For the \c #include to work, we need to add an \c
     INCLUDEPATH entry to the \c .pro file with the path to Qt's \c
     examples/tools directory.
@@ -344,7 +344,7 @@
     The \c Q_INTERFACES() macro is necessary to tell \l{moc}, Qt's
     meta-object compiler, that the base classes are plugin
     interfaces. Without the \c Q_INTERFACES() macro, we couldn't use
-    \l qobject_cast() in the \l{plugandpaint}{Plug & Paint}
+    \l qobject_cast() in the \l{tools/plugandpaint}{Plug & Paint}
     application to detect interfaces.
     For an explanation for the \c Q_PLUGIN_METADATA() macro see
     \l {Exporting the Plugin}.
@@ -473,7 +473,7 @@
 
     To make the plugin a static plugin, all that is required is to
     specify \c static in addition to \c plugin. The
-    \l{plugandpaintplugins/extrafilters}{Extra Filters} plugin,
+    \l{tools/plugandpaintplugins/extrafilters}{Extra Filters} plugin,
     which is compiled as a dynamic plugin, doesn't specify \c static
     in its \c .pro file.
 
@@ -501,15 +501,15 @@
     \title Plug & Paint Extra Filters Example
 
     The Extra Filters example is a plugin for the
-    \l{plugandpaint}{Plug & Paint} example. It provides a set
+    \l{tools/plugandpaint}{Plug & Paint} example. It provides a set
     of filters in addition to those provided by the
-    \l{plugandpaintplugins/basictools}{Basic Tools} plugin.
+    \l{tools/plugandpaintplugins/basictools}{Basic Tools} plugin.
 
     Since the approach is identical to
-    \l{plugandpaintplugins/basictools}{Basic Tools}, we won't
+    \l{tools/plugandpaintplugins/basictools}{Basic Tools}, we won't
     review the code here. The only part of interest is the
     \c .pro file, since Extra Filters is a dynamic plugin
-    (\l{plugandpaintplugins/basictools}{Basic Tools} is
+    (\l{tools/plugandpaintplugins/basictools}{Basic Tools} is
     linked statically into the Plug & Paint executable).
 
     Here's the project file for building the Extra Filters plugin: