diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
commit | d74fd9b0d9bf5ab80e6c104fec5a92a9b3b9372d (patch) | |
tree | 25056d484013efbbbb3eb1a78ad6a6449b671578 /src/webengine/doc/src/webengineview_lgpl.qdoc | |
parent | 7de23e9fbb4c48152de5c1d26ed34cd68666aa30 (diff) | |
parent | 89afebb830f616a6e8c43dd37bf34551f243b264 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/3rdparty
src/core/core_common.pri
Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
Diffstat (limited to 'src/webengine/doc/src/webengineview_lgpl.qdoc')
-rw-r--r-- | src/webengine/doc/src/webengineview_lgpl.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webengine/doc/src/webengineview_lgpl.qdoc index cc826a0d9..87094c266 100644 --- a/src/webengine/doc/src/webengineview_lgpl.qdoc +++ b/src/webengine/doc/src/webengineview_lgpl.qdoc @@ -365,7 +365,7 @@ \since QtWebEngine 1.3 JavaScript world that the web channel instance used by this view is - installed in. + installed in. The world must be a number between \c 0 and \c 256. */ /*! |