diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-12-08 12:28:55 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-12-13 19:00:16 +0000 |
| commit | 4d4b118c1294d96741d71a775ac1c57b5acb96bb (patch) | |
| tree | 557a918caa04f5fe588f51962d17c15e889aa66d /src | |
| parent | 17e076b56e40e25248f156830b293fee6421ecfc (diff) | |
Fix the build with Xcode 9 and unguarded availability errors turned on
This fixes a regression introduced in
e4016a67bbffefed71a407494e249e978d212b3d.
Task-number: QTBUG-65075
Change-Id: I5723ba04ce02842c10aaa4b2ae5dd042f8beabf0
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webview/qwebview_darwin.mm | 16 | ||||
| -rw-r--r-- | src/webview/webview.pro | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/webview/qwebview_darwin.mm b/src/webview/qwebview_darwin.mm index ff9dc4d..38ac829 100644 --- a/src/webview/qwebview_darwin.mm +++ b/src/webview/qwebview_darwin.mm @@ -40,6 +40,7 @@ #include "qtwebviewfunctions.h" #include "qtwebviewfunctions_p.h" +#include <QtCore/private/qglobal_p.h> #include <QtCore/qdatetime.h> #include <QtCore/qmap.h> #include <QtCore/qvariant.h> @@ -253,14 +254,19 @@ void QDarwinWebViewPrivate::setUrl(const QUrl &url) { if (url.isValid()) { requestFrameCount = 0; - if (!url.isLocalFile()) { - [wkWebView loadRequest:[NSURLRequest requestWithURL:url.toNSURL()]]; - } else { + +#if QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(101100, 90000) + if (url.isLocalFile()) { // 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()]; + if (__builtin_available(macOS 10.11, iOS 9, *)) { + [wkWebView loadFileURL:url.toNSURL() + allowingReadAccessToURL:QUrl(url.toString(QUrl::RemoveFilename)).toNSURL()]; + return; + } } +#endif + [wkWebView loadRequest:[NSURLRequest requestWithURL:url.toNSURL()]]; } } diff --git a/src/webview/webview.pro b/src/webview/webview.pro index 452a3cc..af1286e 100644 --- a/src/webview/webview.pro +++ b/src/webview/webview.pro @@ -1,7 +1,7 @@ TARGET = QtWebView QT = -QT_FOR_PRIVATE = quick-private gui-private +QT_FOR_PRIVATE = quick-private core-private gui-private include($$PWD/webview-lib.pri) |