diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-26 15:28:31 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-26 15:30:24 +0200 |
commit | 6cdd1dc5b48dfe54de4d926fc9a64c46f3fc75f2 (patch) | |
tree | d4b626a6041cac6e17bbd825d139b201e708f43d /examples/webengine | |
parent | 7757ec1a562ae36b65a6cae93b3cd308247755ef (diff) | |
parent | 6e019f2ad5a5d6341d14762fba5a245da46ebeb3 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
configure.json
src/3rdparty
tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
Change-Id: Id79ff6cf01c2db3a2044881ddcbf044abdf84936
Diffstat (limited to 'examples/webengine')
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/webengine/customdialogs/doc/src/customdialogs.qdoc b/examples/webengine/customdialogs/doc/src/customdialogs.qdoc index ecbe36c78..3fc888a77 100644 --- a/examples/webengine/customdialogs/doc/src/customdialogs.qdoc +++ b/examples/webengine/customdialogs/doc/src/customdialogs.qdoc @@ -29,7 +29,7 @@ \example webengine/customdialogs \title WebEngine Qt Quick Custom Dialogs Example \ingroup webengine-examples - \brief Customizes UI elements of Qt WebEngine's dialogs + \brief Customizes UI elements of Qt WebEngine's dialogs. \image customdialogs.png diff --git a/examples/webengine/minimal/doc/src/minimal.qdoc b/examples/webengine/minimal/doc/src/minimal.qdoc index a52ddea1f..e021a81d1 100644 --- a/examples/webengine/minimal/doc/src/minimal.qdoc +++ b/examples/webengine/minimal/doc/src/minimal.qdoc @@ -29,7 +29,7 @@ \example webengine/minimal \title WebEngine Qt Quick Minimal Example \ingroup webengine-examples - \brief Displays a web page using the Qt Quick integration of Qt WebEngine + \brief Displays a web page using the Qt Quick integration of Qt WebEngine. \image minimal-example.png diff --git a/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc b/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc index 7b8c6d5d0..0321c22e4 100644 --- a/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc +++ b/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc @@ -77,7 +77,7 @@ \printuntil RecipeList \dots 16 - \skipuntil onRecipeSelected + \skipuntil webView.showRecipe \printline } \printuntil WebEngineView \dots 16 |