Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: I324839cf08d91e861de0f82414accbb7dd5fec49

3 files changed, 33 insertions, 1 deletions

diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1
new file mode 100644
index 0000000..60a7de0
--- /dev/null
+++ b/dist/changes-5.9.1
@@ -0,0 +1,24 @@
+Qt 5.9.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.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.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                                         *
+****************************************************************************
+
+- This release contains only minor code improvements.
diff --git a/src/webview/qwebview_darwin.mm b/src/webview/qwebview_darwin.mm
index 45add1d..ff9dc4d 100644
--- a/src/webview/qwebview_darwin.mm
+++ b/src/webview/qwebview_darwin.mm
@@ -253,7 +253,14 @@ void QDarwinWebViewPrivate::setUrl(const QUrl &url)
 {
     if (url.isValid()) {
         requestFrameCount = 0;
-        [wkWebView loadRequest:[NSURLRequest requestWithURL:url.toNSURL()]];
+        if (!url.isLocalFile()) {
+            [wkWebView loadRequest:[NSURLRequest requestWithURL:url.toNSURL()]];
+        } else {
+            // We need to pass local files via loadFileURL and the read access should cover
+            // the directory that the file is in, to facilitate loading referenced images etc
+            [wkWebView loadFileURL:url.toNSURL()
+           allowingReadAccessToURL:QUrl(url.toString(QUrl::RemoveFilename)).toNSURL()];
+        }
     }
 }
 
diff --git a/src/webview/webview-lib.pri b/src/webview/webview-lib.pri
index 39ebd46..f5d6774 100644
--- a/src/webview/webview-lib.pri
+++ b/src/webview/webview-lib.pri
@@ -51,6 +51,7 @@ android {
         $$COMMON_HEADERS \
         qwebview_darwin_p.h
     LIBS_PRIVATE += -framework Foundation -framework WebKit
+    ios: LIBS_PRIVATE += -framework UIKit
 
     macos: CONFIG += use_webengine_backend
 } else: winrt {