diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:19 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:19 +0200 |
commit | 5538c7fbcbdf6c52e835a594018d2cc5a120ef48 (patch) | |
tree | 20b83b2c5cb9435b21cb8466f4042edf543dd3df | |
parent | df059b51320febc2fb7e9ee33872ce256b8184c4 (diff) | |
parent | 1ac5e98a02f4467033c1159860b20e4b6a5d45c4 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie947397c531d594f1774b2fc5a931a3b560e1c4b
-rw-r--r-- | dist/changes-5.11.1 | 24 | ||||
-rw-r--r-- | src/webview/qquickwebview.cpp | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1 new file mode 100644 index 0000000..030ea3f --- /dev/null +++ b/dist/changes-5.11.1 @@ -0,0 +1,24 @@ +Qt 5.11.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.11.1 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp index eb0727a..898154e 100644 --- a/src/webview/qquickwebview.cpp +++ b/src/webview/qquickwebview.cpp @@ -76,7 +76,7 @@ Q_GLOBAL_STATIC(CallbackStorage, callbacks) \qmltype WebView \inqmlmodule QtWebView \ingroup qtwebview - \brief A component for displaying web content + \brief A component for displaying web content. WebView is a component for displaying web content which is implemented using native APIs on the platforms where this is available, thus it does not necessarily require |