diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-09-12 12:35:44 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-09-12 12:36:00 +0200 |
| commit | a1db2b655d40a5b154b313d7f789799480841e94 (patch) | |
| tree | 895d2f9e0cd4e659e6cbc43dc0c5042fcfa52038 /src | |
| parent | 9766adb01943873d9109968911734be8e5dcb150 (diff) | |
| parent | ce2f1b140d2d417f925ec54c8a095981827f7e68 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9acebc9f1d01ab9041f75c49749f8a122ffbfe30
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/gyp_run.pro | 4 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 9b45af3be..98ff29f78 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -82,6 +82,10 @@ contains(QT_ARCH, "arm") { contains(MFPU, "neon")|contains(MFPU, "neon-vfpv4"): GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=1 else:!lessThan(MARMV, 7): GYP_CONFIG += arm_neon=0 arm_neon_optional=1 else: GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=0 arm_neon_optional=0 + } else { + # Chromium defaults to arm_neon=1, Qt does not. + GYP_CONFIG += arm_neon=0 + !lessThan(MARMV, 7): GYP_CONFIG += arm_neon_optional=1 } contains(QMAKE_CFLAGS, "-marm"): GYP_CONFIG += arm_thumb=0 diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index 3fea83166..09fb2b98d 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. */ diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 558aa1f50..ccb002404 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -93,7 +93,8 @@ \value JavascriptEnabled Enables the running of JavaScript programs. Enabled by default. \value JavascriptCanOpenWindows - Allows JavaScript programs to open new windows. Enabled by default. + 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. |