diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 19:15:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 19:15:35 (GMT) |
| commit | 3418acfad30be3db2c6009c8e321a39e3ad84700 (patch) | |
| tree | 42daafe580b370c5ae616bf15060a9e4c6ab54d8 /src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h | |
| parent | 6c6c76553e424291bb3b3d2112d09c96604850d9 (diff) | |
| parent | b83705b1c1e0b26b0eb6d604896f2e46a3fa701b (diff) | |
| download | Qt-3418acfad30be3db2c6009c8e321a39e3ad84700.zip Qt-3418acfad30be3db2c6009c8e321a39e3ad84700.tar.gz Qt-3418acfad30be3db2c6009c8e321a39e3ad84700.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 807157e42add842605ec67d9363dd3f1861748ca
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h index 3592e2c..b978f5e 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h @@ -136,9 +136,6 @@ public: void setLocalStoragePath(const QString& path); QString localStoragePath() const; - void setInspectorUrl(const QUrl &location); - QUrl inspectorUrl() const; - static void clearMemoryCaches(); static void enablePersistentStorage(const QString& path = QString()); |