diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-01-08 08:19:22 +0200 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-01-08 08:19:22 +0200 |
commit | 846320f5877aafb9c7b319da6c972786805d9c30 (patch) | |
tree | b4bda9f9b27ee311fc7f75de3843a828da23c340 /examples/webenginewidgets/minimal/doc/src/minimal.qdoc | |
parent | 35b97b92968505793b162ccfdada65e25690f711 (diff) | |
parent | 5c85e0748b6c321d9988d126903fed85f311f5e7 (diff) |
Merge 5.12 into 5.12.1
Change-Id: Ia86d2e001e3575bb4995f5f57b88d6c809246941
Diffstat (limited to 'examples/webenginewidgets/minimal/doc/src/minimal.qdoc')
-rw-r--r-- | examples/webenginewidgets/minimal/doc/src/minimal.qdoc | 14 |
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 |