diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 11:04:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 11:04:39 +0200 |
| commit | b04131f375a64204be962e7b92c88a3ecaf892c5 (patch) | |
| tree | ad3cac0a277791692eb4374af8b647cec5706cb1 /src/webengine/api/qquickwebenginesettings.cpp | |
| parent | 001ee1d6da4bf6769d702810f8ebcb05978663cc (diff) | |
| parent | 0e5553a1626cb707499d82c96e136ceb79dfb54d (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/3rdparty
src/core/delegated_frame_node.h
src/webengine/api/qquickwebenginecontextmenudata.cpp
Change-Id: I163488d0d32cd981351608b2886f12e547e24672
Diffstat (limited to 'src/webengine/api/qquickwebenginesettings.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index 87b0b0422..7aa4d2a96 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -99,7 +99,7 @@ bool QQuickWebEngineSettings::javascriptEnabled() const /*! \qmlproperty bool WebEngineSettings::javascriptCanOpenWindows - Allows JavaScript programs to open new windows. + Allows JavaScript programs to open popup windows without user interaction. Enabled by default. */ |