Created
January 4, 2018 17:52
-
-
Save iomonad/e16b16302331858cbf619c1c00550102 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/qtwebview/src/webview/qwebview_darwin.mm b/qtwebview/src/webview/qwebview_darwin.mm | |
index ff9dc4d..824abef 100644 | |
--- a/qtwebview/src/webview/qwebview_darwin.mm | |
+++ b/qtwebview/src/webview/qwebview_darwin.mm | |
@@ -253,14 +253,19 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N | |
{ | |
if (url.isValid()) { | |
requestFrameCount = 0; | |
- if (!url.isLocalFile()) { | |
- [wkWebView loadRequest:[NSURLRequest requestWithURL:url.toNSURL()]]; | |
- } else { | |
+ | |
+#if QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(101100, 90000, __TVOS_NA, __WATCHOS_NA) | |
+ 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()]]; | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment