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

Conflicts:
	.qmake.conf
	src/core/net/network_delegate_qt.cpp
	src/core/profile_io_data_qt.cpp
	src/core/web_engine_context.h
	tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp

Change-Id: Id98e3f52f548ceb5b68abd80aedd6ae59db72cc0

1 files changed, 10 insertions, 4 deletions

diff --git a/examples/webenginewidgets/minimal/doc/src/minimal.qdoc b/examples/webenginewidgets/minimal/doc/src/minimal.qdoc
index 477ff521b..d0b25c4b8 100644
--- a/examples/webenginewidgets/minimal/doc/src/minimal.qdoc
+++ b/examples/webenginewidgets/minimal/doc/src/minimal.qdoc
@@ -42,6 +42,15 @@
 
     \section1 The Code
 
+    We first define a \c commandLineUrlArgument function that returns the URL to open.
+    This is either the first positional argument given on the command line, or
+    \c https://www.qt.io as a fallback.
+
+    \quotefromfile webenginewidgets/minimal/main.cpp
+    \skipto #include
+
+    \printto int main
+
     In the \c main function we first set the
     \l{QCoreApplication::organizationName} property. This affects the locations
     where Qt WebEngine stores persistent and cached data (see also
@@ -52,14 +61,11 @@
     view automatically scale on high-dpi displays.
 
     Next, we instantiate a QApplication and a QWebEngineView. The URL
-    to load is taken from the command-line in \c commandLineUrlArgument and
+    to load is taken from \c commandLineUrlArgument and
     loaded by calling \l QWebEngineView::setUrl. The view widget is
     given a reasonable default size, and shown.
     Finally, QApplication::exec() launches the main event loop.
 
-    \quotefromfile webenginewidgets/minimal/main.cpp
-    \skipto #include
-
     \printuntil }
 
     \section1 Requirements