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

 Conflicts:
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/cocoa/qnsview_dragging.mm
	src/plugins/platforms/ios/qiosinputcontext.mm
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/tools/androiddeployqt/main.cpp
		Was moved from qttools into qtbase in 5.11.
		So re-apply 32398e4d here.
	tests/auto/corelib/global/qlogging/test/test.pro
	tests/auto/corelib/global/qlogging/tst_qlogging.cpp
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
	tests/auto/corelib/thread/qthreadstorage/test/test.pro
	tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
	tests/auto/widgets/kernel/qapplication/test/test.pro

Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Done-with: Mårten Nordheim <marten.nordheim@qt.io>
Done-with: Oliver Wolff <oliver.wolff@qt.io>
Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b

12 files changed, 12 insertions, 12 deletions

diff --git a/examples/network/doc/src/blockingfortuneclient.qdoc b/examples/network/doc/src/blockingfortuneclient.qdoc
index 6719a4e0b9..ecb9a7ba62 100644
--- a/examples/network/doc/src/blockingfortuneclient.qdoc
+++ b/examples/network/doc/src/blockingfortuneclient.qdoc
@@ -29,7 +29,7 @@
     \example blockingfortuneclient
     \title Blocking Fortune Client Example
     \ingroup examples-network
-    \brief Demonstrates how to create a client for a network service
+    \brief Demonstrates how to create a client for a network service.
 
     \image blockingfortuneclient-example.png
 
diff --git a/examples/network/doc/src/fortuneclient.qdoc b/examples/network/doc/src/fortuneclient.qdoc
index f2ad575125..544fa156b7 100644
--- a/examples/network/doc/src/fortuneclient.qdoc
+++ b/examples/network/doc/src/fortuneclient.qdoc
@@ -29,7 +29,7 @@
     \example fortuneclient
     \title Fortune Client Example
     \ingroup examples-network
-    \brief Demonstrates how to create a client for a network service
+    \brief Demonstrates how to create a client for a network service.
 
     This example uses QTcpSocket, and is intended to be run alongside the
     \l{fortuneserver}{Fortune Server} example or
diff --git a/examples/network/doc/src/googlesuggest.qdoc b/examples/network/doc/src/googlesuggest.qdoc
index 50cdb694ba..adb87f4b66 100644
--- a/examples/network/doc/src/googlesuggest.qdoc
+++ b/examples/network/doc/src/googlesuggest.qdoc
@@ -29,7 +29,7 @@
     \example googlesuggest
     \title Google Suggest Example
     \ingroup examples-network
-    \brief Obtains the list of search recommendations by the Google search engine
+    \brief Obtains the list of search recommendations by the Google search engine.
 
     The example uses the QNetworkAccessManager to obtain the list of search
     recommendations by Google as the user types into a QLineEdit.
diff --git a/examples/network/doc/src/http.qdoc b/examples/network/doc/src/http.qdoc
index f4301e7d95..1a70187369 100644
--- a/examples/network/doc/src/http.qdoc
+++ b/examples/network/doc/src/http.qdoc
@@ -29,7 +29,7 @@
     \example http
     \title HTTP Example
     \ingroup examples-network
-    \brief Demonstrates a simple HTTP client
+    \brief Demonstrates a simple HTTP client.
 
     This example demonstrates how a simple HTTP client can fetch files
     from remote hosts.
diff --git a/examples/network/doc/src/loopback.qdoc b/examples/network/doc/src/loopback.qdoc
index 189c4ee0da..f97c9f9c71 100644
--- a/examples/network/doc/src/loopback.qdoc
+++ b/examples/network/doc/src/loopback.qdoc
@@ -29,7 +29,7 @@
     \example loopback
     \title Loopback Example
     \ingroup examples-network
-    \brief Demonstrates the client-server communication on a local host
+    \brief Demonstrates the client-server communication on a local host.
 
     The example demonstrates how the clients and servers on a local host
     communicate with each other.
diff --git a/examples/network/doc/src/multicastreceiver.qdoc b/examples/network/doc/src/multicastreceiver.qdoc
index a0579d7284..3709750436 100644
--- a/examples/network/doc/src/multicastreceiver.qdoc
+++ b/examples/network/doc/src/multicastreceiver.qdoc
@@ -29,7 +29,7 @@
     \example multicastreceiver
     \title Multicast Receiver Example
     \ingroup examples-network
-    \brief Demonstrates how to receive information sent to a multicast group
+    \brief Demonstrates how to receive information sent to a multicast group.
 
     This example demonstrates how to receive messages sent to a multicast group
     \image multicastreceiver-example.png
diff --git a/examples/network/doc/src/multicastsender.qdoc b/examples/network/doc/src/multicastsender.qdoc
index 3adc8959ba..72558eb062 100644
--- a/examples/network/doc/src/multicastsender.qdoc
+++ b/examples/network/doc/src/multicastsender.qdoc
@@ -29,7 +29,7 @@
     \example multicastsender
     \title Multicast Sender Example
     \ingroup examples-network
-    \brief Demonstrates how to send messages to a multicast group
+    \brief Demonstrates how to send messages to a multicast group.
 
     This example demonstrates how to send messages to the clients of a
     multicast group.
diff --git a/examples/network/doc/src/network-chat.qdoc b/examples/network/doc/src/network-chat.qdoc
index 701dc76ec3..85edf611b6 100644
--- a/examples/network/doc/src/network-chat.qdoc
+++ b/examples/network/doc/src/network-chat.qdoc
@@ -29,7 +29,7 @@
     \example network-chat
     \title Network Chat Example
     \ingroup examples-network
-    \brief Demonstrates a stateful peer-to-peer Chat client
+    \brief Demonstrates a stateful peer-to-peer Chat client.
 
     This example uses broadcasting with QUdpSocket and QNetworkInterface to
     discover its peers.
diff --git a/examples/network/doc/src/network-download.qdoc b/examples/network/doc/src/network-download.qdoc
index e51da38ed8..9d171e4142 100644
--- a/examples/network/doc/src/network-download.qdoc
+++ b/examples/network/doc/src/network-download.qdoc
@@ -28,7 +28,7 @@
 /*!
     \example download
     \title Network Download Example
-    \brief Demonstrates how to use networking APIs for multiple downloads
+    \brief Demonstrates how to use networking APIs for multiple downloads.
     \ingroup examples-network
 
     The Network Download example shows how to perform multiple downloads in
diff --git a/examples/network/doc/src/network-downloadmanager.qdoc b/examples/network/doc/src/network-downloadmanager.qdoc
index ca65b8e559..f89ed66616 100644
--- a/examples/network/doc/src/network-downloadmanager.qdoc
+++ b/examples/network/doc/src/network-downloadmanager.qdoc
@@ -28,7 +28,7 @@
 /*!
     \example downloadmanager
     \title Network Download Manager Example
-    \brief Demonstrates how to use the networking APIs for multiple downloads
+    \brief Demonstrates how to use the networking APIs for multiple downloads.
     \ingroup examples-network
 
     The Network Download example shows how to implement a queue for multiple
diff --git a/examples/network/doc/src/securesocketclient.qdoc b/examples/network/doc/src/securesocketclient.qdoc
index 052e6ad868..78cfab7af4 100644
--- a/examples/network/doc/src/securesocketclient.qdoc
+++ b/examples/network/doc/src/securesocketclient.qdoc
@@ -29,7 +29,7 @@
     \example securesocketclient
     \title Secure Socket Client Example
     \ingroup examples-network
-    \brief Demonstrates how to communicate over an encrypted (SSL) connection
+    \brief Demonstrates how to communicate over an encrypted (SSL) connection.
 
     This example uses QSslSocket to demonstrate how to communicate over an
     encrypted connection, deal with authenticity problems, and display security
diff --git a/examples/network/doc/src/torrent.qdoc b/examples/network/doc/src/torrent.qdoc
index 2ef5be8171..8d69bee6d1 100644
--- a/examples/network/doc/src/torrent.qdoc
+++ b/examples/network/doc/src/torrent.qdoc
@@ -29,7 +29,7 @@
     \example torrent
     \title Torrent Example
     \ingroup examples-network
-    \brief Demonstrates complex TCP/IP operations
+    \brief Demonstrates complex TCP/IP operations.
 
     This example demonstrates some of the complex TCP/IP operations
     supported by the Qt Network APIs.