diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-05-18 11:42:10 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-05-18 13:34:10 +0000 |
| commit | 90d5224e69b7841e6f82c9fac316fa5fae5a357a (patch) | |
| tree | 3293c5e745be96c7f84572bf1e111cf82006f119 /Source/WebKit | |
| parent | bc2b1642ca2f70d5df570fc1bc416a18dd5a4713 (diff) | |
| parent | ec663831c6e50c3eabbedd46a1b289408b25d0d3 (diff) | |
| download | qtwebkit-90d5224e69b7841e6f82c9fac316fa5fae5a357a.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index cb969a3df..f55b6d721 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -272,9 +272,10 @@ void QWebSettingsPrivate::apply() global->attributes.value(QWebSettings::LocalStorageEnabled)); settings->setLocalStorageEnabled(value); - value = attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls, + bool remoteAccess = attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls, global->attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls)); - settings->setAllowUniversalAccessFromFileURLs(value); + settings->setAllowUniversalAccessFromFileURLs(remoteAccess); + settings->setAllowRemoteAccessFromFileURLs(remoteAccess); value = attributes.value(QWebSettings::LocalContentCanAccessFileUrls, global->attributes.value(QWebSettings::LocalContentCanAccessFileUrls)); |