summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorjocelyn.turcotte@digia.com <jocelyn.turcotte@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>2013-01-21 13:40:06 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-21 17:37:55 +0100
commit70c60ffc8530221d54e0b3f5d9b8687cd3eff875 (patch)
tree2d4c79ae71fe12b3f8cf265afd0bf812b9cd3c8c /Source
parent3fd5921116281201f0c8a5d01039dc6ed64fca31 (diff)
downloadqtwebkit-70c60ffc8530221d54e0b3f5d9b8687cd3eff875.tar.gz
[Qt] Update the documentation about the storage of inspector settings
https://bugs.webkit.org/show_bug.cgi?id=106777 Reviewed by Allan Sandfeld Jensen. Since r76770, QSettings isn't queried anymore to persist inspector settings like whether or not the debugger is enabled by default. It still seems to be used for the default attach height. Update the documentation accordingly. * WidgetApi/qwebinspector.cpp: Change-Id: I0f1bacdd628c56771cf74338b5ef8060154993ef git-svn-id: http://svn.webkit.org/repository/webkit/trunk@140326 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source')
-rw-r--r--Source/WebKit/qt/ChangeLog15
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebinspector.cpp12
2 files changed, 22 insertions, 5 deletions
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 012485d9a..0557e66fe 100644
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2013-01-21 Jocelyn Turcotte <jocelyn.turcotte@digia.com>
+
+ [Qt] Update the documentation about the storage of inspector settings
+ https://bugs.webkit.org/show_bug.cgi?id=106777
+
+ Reviewed by Allan Sandfeld Jensen.
+
+ Since r76770, QSettings isn't queried anymore to persist inspector
+ settings like whether or not the debugger is enabled by default.
+ It still seems to be used for the default attach height.
+
+ Update the documentation accordingly.
+
+ * WidgetApi/qwebinspector.cpp:
+
2013-01-16 Jocelyn Turcotte <jocelyn.turcotte@digia.com>
[Qt] Use the shared HistoryItem serialization for QWebHistory
diff --git a/Source/WebKit/qt/WidgetApi/qwebinspector.cpp b/Source/WebKit/qt/WidgetApi/qwebinspector.cpp
index 9ae69dacf..9e3f82e69 100644
--- a/Source/WebKit/qt/WidgetApi/qwebinspector.cpp
+++ b/Source/WebKit/qt/WidgetApi/qwebinspector.cpp
@@ -66,11 +66,13 @@
The inspector allows the user to configure some options through its
user interface (e.g. the resource tracking "Always enable" option).
- These settings will be persisted automatically by QtWebKit only if
- your application previously called QCoreApplication::setOrganizationName()
- and QCoreApplication::setApplicationName().
- See QSettings's default constructor documentation for an explanation
- of why this is necessary.
+ The inspector UI is itself a web page and is using HTML local storage
+ to persist those settings.
+ Since the internal QWebPage used by the inspector isn't exposed in the API,
+ the only way to enable those settings to be persisted is currently to enable
+ local storage globally through QWebSettings::globalSettings().
+
+ \sa QWebSettings::localStoragePath(), QWebSettings::LocalStorageEnabled
*/
/*!