diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2018-02-12 11:35:28 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2018-02-12 21:18:46 +0000 |
| commit | c8c3a790d3233d6e456a0ebbebb33043074117c4 (patch) | |
| tree | 8d052fc42132c5249ad851ffdf43533e60145b07 | |
| parent | 0f0d87a757fe30976c183207968e1c07f87460d5 (diff) | |
Remove obsolete code paths
Change-Id: I0608503fd0db30bf409893cab754b66952210eff
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| -rw-r--r-- | src/plugins/darwin/qdarwinwebview.mm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/darwin/qdarwinwebview.mm b/src/plugins/darwin/qdarwinwebview.mm index b31bdaf..9cf7b93 100644 --- a/src/plugins/darwin/qdarwinwebview.mm +++ b/src/plugins/darwin/qdarwinwebview.mm @@ -287,18 +287,14 @@ void QDarwinWebViewPrivate::setUrl(const QUrl &url) if (url.isValid()) { requestFrameCount = 0; -#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 - if (__builtin_available(macOS 10.11, iOS 9, *)) { - [wkWebView loadFileURL:url.toNSURL() - allowingReadAccessToURL:QUrl(url.toString(QUrl::RemoveFilename)).toNSURL()]; - return; - } + [wkWebView loadFileURL:url.toNSURL() + allowingReadAccessToURL:QUrl(url.toString(QUrl::RemoveFilename)).toNSURL()]; + } else { + [wkWebView loadRequest:[NSURLRequest requestWithURL:url.toNSURL()]]; } -#endif - [wkWebView loadRequest:[NSURLRequest requestWithURL:url.toNSURL()]]; } } |