diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:28 +0100 |
| commit | 95621e44c4234872aaa827885c5ffedee4e73807 (patch) | |
| tree | 83a82619c1e729b65ada1782d487329cd3645dd4 /src | |
| parent | 9748862ee843b371b795fbf5b1a5b476e30ed402 (diff) | |
| parent | 2d641398008ce8d58bb257f32e10914cd564405e (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I6a39d1ec0ffc0394fbb472ab1df2963ed5c69ec7
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 1 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index b4788e02d..78c0fa3b8 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -133,6 +133,8 @@ bool usingANGLE() bool usingSoftwareDynamicGL() { + if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) + return true; #if defined(Q_OS_WIN) HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle()); wchar_t path[MAX_PATH]; diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index 8a3c6c24f..ff2541376 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -112,6 +112,7 @@ bool QQuickWebEngineSettings::javascriptCanOpenWindows() const \qmlproperty bool WebEngineSettings::javascriptCanAccessClipboard Allows JavaScript programs to read from or write to the clipboard. + Writing to the clipboard is always allowed if it is specifically requested by the user. Disabled by default. */ diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 1919d6ea7..efbeb1991 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -96,8 +96,9 @@ Allows JavaScript programs to open popup windows without user interaction. Enabled by default. \value JavascriptCanAccessClipboard - Allows JavaScript programs to read from and write to the clipboard. Disabled by - default. + Allows JavaScript programs to read from and write to the clipboard. + Writing to the clipboard is always allowed if it is specifically requested by the user. + Disabled by default. \value LinksIncludedInFocusChain Includes hyperlinks in the keyboard focus chain. Enabled by default. \value LocalStorageEnabled |