diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-07 17:32:45 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-01-13 13:18:53 (GMT) |
| commit | cff92ac3f51571d4f7c88ed8b5ecd4ce9512ca96 (patch) | |
| tree | 1603ba845c65ac52db452197c8b46ed2213381ed /tools/assistant | |
| parent | d86343355a9e04382a59ceb3eb1733746ee48f61 (diff) | |
| download | Qt-cff92ac3f51571d4f7c88ed8b5ecd4ce9512ca96.zip Qt-cff92ac3f51571d4f7c88ed8b5ecd4ce9512ca96.tar.gz Qt-cff92ac3f51571d4f7c88ed8b5ecd4ce9512ca96.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-01-07 Yael Aharon <yael.aharon@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Allow the application to override online/offline network status
https://bugs.webkit.org/show_bug.cgi?id=32684
Add a setting so that applications can overide the network status.
Applications that use this setting still need to block network access
through QNAM.
* Api/qwebsettings.cpp:
(qt_networkAccessAllowed):
(cherry picked from commit a010d26629e8aa5aaa14a7e57ace06708fc903d6)
Diffstat (limited to 'tools/assistant')
0 files changed, 0 insertions, 0 deletions