diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-17 10:48:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 10:49:40 +0200 |
| commit | 7be993442fac143ef7b13515b70f0ebacaca2935 (patch) | |
| tree | a6abbba1692db76d123a0a32db491bb6cdb912a0 /Source/WebKit/qt/Api/qwebsettings.cpp | |
| parent | 47c9af1dc624e9417f261265bd31f5819f5df304 (diff) | |
| parent | b35917bcb44d7f200af0f4ac68a126fa0aa8d93d (diff) | |
| download | qtwebkit-7be993442fac143ef7b13515b70f0ebacaca2935.tar.gz | |
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Change-Id: I18e4b5a903bf689636f112108e59162147708866
Diffstat (limited to 'Source/WebKit/qt/Api/qwebsettings.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index 363f58f78..d3a864262 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -455,7 +455,7 @@ QWebSettings* QWebSettings::globalSettings() \value PrivateBrowsingEnabled Private browsing prevents WebKit from recording visited pages in the history and storing web page icons. This is disabled by default. \value JavascriptCanOpenWindows Specifies whether JavaScript programs - can open new windows. This is disabled by default. + can open popup windows without user interaction. This is disabled by default. \value JavascriptCanCloseWindows Specifies whether JavaScript programs can close windows. This is disabled by default. \value JavascriptCanAccessClipboard Specifies whether JavaScript programs |