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

Change-Id: Iddaf3939f04ae46cccffa831dc354036663bdd93

doc/src/qtmodules.qdoc

@@ -208,11 +208,6 @@
         \li All
         \li \l{Qt for macOS}{\macos}
         \li Provides platform-specific APIs for \macos.
-    \row
-        \li \l[QtNetworkAuth]{Qt Network Authorization}
-        \li All
-        \li All
-        \li Provides support for OAuth-based authorization to online services.
     \row
         \li \l[QtNfc]{Qt NFC}
         \li All
@@ -385,6 +380,11 @@
         \li All
         \li All
         \li UI Components for creating stunning 3D data visualizations.
+    \row
+        \li \l[QtNetworkAuth]{Qt Network Authorization}
+        \li All
+        \li All
+        \li Provides support for OAuth-based authorization to online services.
     \row
         \li \l{Qt Virtual Keyboard}
         \li All