diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-07 17:32:45 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-07 17:33:08 (GMT) |
| commit | a010d26629e8aa5aaa14a7e57ace06708fc903d6 (patch) | |
| tree | 215b2f2ed9a9ebccf5c68248cc17c393ce1e36d8 /src/3rdparty/webkit/WebKit | |
| parent | 7db366ac2486c20e3b44a5a74b4aa8f5948d796d (diff) | |
| download | Qt-a010d26629e8aa5aaa14a7e57ace06708fc903d6.zip Qt-a010d26629e8aa5aaa14a7e57ace06708fc903d6.tar.gz Qt-a010d26629e8aa5aaa14a7e57ace06708fc903d6.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):
Diffstat (limited to 'src/3rdparty/webkit/WebKit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp | 11 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/ChangeLog | 14 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp index b637d04..79ef16f 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp @@ -47,6 +47,17 @@ #include <QUrl> #include <QFileInfo> +#if ENABLE(QT_BEARER) +#include "NetworkStateNotifier.h" +#endif + +void QWEBKIT_EXPORT qt_networkAccessAllowed(bool isAllowed) +{ +#if ENABLE(QT_BEARER) + WebCore::networkStateNotifier().setNetworkAccessAllowed(isAllowed); +#endif +} + class QWebSettingsPrivate { public: QWebSettingsPrivate(WebCore::Settings* wcSettings = 0) diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index d7c3c52..31fad69 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,17 @@ +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): + 2010-01-07 Yongjun Zhang <yongjun.zhang@nokia.com>, Laszlo Gombos <laszlo.1.gombos@nokia.com> Reviewed by Simon Hausmann. |