Merge remote-tracking branch 'origin/5.9.0' into 5.9

Change-Id: I7a416b9874590be159dc49e7500c19462e67f7a7

2 files changed, 51 insertions, 0 deletions

diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 0000000..c68eea4
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,43 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.x series. 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.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+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.
+
+****************************************************************************
+*                                 Library                                  *
+****************************************************************************
+
+ - [QTBUG-59559] Fixed bundling of module resources for static builds.
+
+ - [QTBUG-60150] The WebView will now receive the active focus when
+                 forceActiveFocus is called.
+
+ - [QTBUG-57284] Fixed QtWebEngine dependency for the qml plugin.
+
+****************************************************************************
+*                         Platform-specific Changes                        *
+****************************************************************************
+
+WinRT
+-----
+
+- [QTBUG-57288] Removed support for WinRT 8.1 and Windows Phone 8.1.
+
+macOS & iOS
+-----------
+
+ - Removed WebView and UIWebView backends. Minimum deployment target is
+   now macOS 10.10 and iOS 8.0, so the WKWebView backend is used for both
+   platforms.
diff --git a/src/imports/webview.cpp b/src/imports/webview.cpp
index f4e0c70..ca10e29 100644
--- a/src/imports/webview.cpp
+++ b/src/imports/webview.cpp
@@ -40,6 +40,13 @@
 #include <QtWebView/private/qquickwebviewloadrequest_p.h>
 #include <QtWebView/private/qquickwebview_p.h>
 
+static void initResources()
+{
+#ifdef QT_STATIC
+    Q_INIT_RESOURCE(qmake_QtWebView);
+#endif
+}
+
 QT_BEGIN_NAMESPACE
 
 class QWebViewModule : public QQmlExtensionPlugin
@@ -47,6 +54,7 @@ class QWebViewModule : public QQmlExtensionPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
+    QWebViewModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
     void registerTypes(const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebView"));