summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.15' into dev"HEADdevAllan Sandfeld Jensen2019-10-28153-1249/+2456
|\
| * Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2019-10-28153-1249/+2456
| |\ | | | | | | | | | Change-Id: Iae246af4df63e4f8cbc18d03f9b37a7be0a0c81b
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Allan Sandfeld Jensen2019-10-16113-759/+1396
| | |\ | | | | | | | | | | | | Change-Id: I87dd74f5f639201ca85ac1277bf80f9d5eae854e
| | | * Doc: Fix link to the WebRTC featureLeena Miettinen2019-10-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc generates the link to the WebRTC license topic, so a target was added for the section in the "Features" topic. Fixes: QTBUG-79159 Change-Id: I9b6dfa00393461b137515c5d8c06a4d4faef1128 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Adaptations for Chromium 77Allan Sandfeld Jensen2019-10-1168-415/+835
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-77267 Change-Id: I181e24cf80ebee6991b95dde6c636f0d169b40a4 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | | * Adaptations for Chromium 76Allan Sandfeld Jensen2019-10-1134-244/+247
| | | | | | | | | | | | | | | | | | | | Change-Id: Id6d18a3854b572334dc1d65f1916b8991a740cd2 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | | * Use ProtocolHandlerRegistry with network serviceJüri Valdmann2019-10-114-8/+85
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia7448fb1406536822dd245cfdb6fe7c1cf19e211 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Add example for QQuickWebEngineTooltipRequestSzabolcs David2019-10-1013-1/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement an example usage in customdialogs application and extend the documentation. Change-Id: Ibc240cf94ac939335455f4eac3d52ffec2ba7ff6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Move lifecycle docs to features pageJüri Valdmann2019-10-104-75/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix incorrect \since versions in QML API docs. Change-Id: I87b5899d4a55832dca2cd251aeb681e4bb2de2a2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | * Do not build certificateerror tests if Qt is configured with -no-sslPeter Varga2019-10-081-1/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic5d80b968b92a4edbf25a3d6e8cb9c07cbcf98f1 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
| | | * Improve Q(Quick)WebEngineDownloadItem APITamas Zakor2019-10-074-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements suggestions from 5.14 API review: - Replace QString with const QString & - Extend documentation Change-Id: I08365767128aa72bc7ef2356c761c2abe512e4eb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | * Mark new QWebEngineCertificateError methods with '\since' tagv5.14.0-beta1Kirill Burtsev2019-10-011-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf6c6448e8c8979dccd507b1ae131dc386161e94 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | * Re-enable User Activation V2Szabolcs David2019-09-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes auto tests with synthetic keyboard events. Change-Id: Iaed47077288309fd71295a0ebda9480516f08fde Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Support qrc protocol in @match rules of user scriptsSzabolcs David2019-09-303-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in the following Chromium changes: 7ac85fb4cc6 Fix building with pulseaudio 13 7956dfb8d20 Support qrc protocol in UrlPattern 9af3b1bf632 Fix pressure of tablet events Task-number: QTBUG-76173 Change-Id: Iffc21ed6eb0a99e2b96780ce4f11629d38f8b47e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | | * Doc: Update the module version to 1.10Leena Miettinen2019-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This value is used for the version number in the import statements of all QML types in the module. Change-Id: I7c0a384421973d97334d40b285a64d6080c9c911 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Merge branch '5.14' into 5.15Allan Sandfeld Jensen2019-09-2741-151/+563
| | |\ \ | | | |/ | | | | | | | | Change-Id: I23e4776c66c26ac41f33d4590d709b4ec0c21ce7
| | | * Set default jumbo build merge limit to 8Michal Klocek2019-09-271-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If not specified otherwise use 8 as merge limit. Reuse cached value for report call. Change-Id: I78b3832b45c787f2ab0dcc9b41b6bb9e76c9c08c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Blacklist visibilityState3 on windowsAllan Sandfeld Jensen2019-09-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Being flaky Change-Id: Ic9286b66296e58ce16dde63443c7e83e54c56682 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | | * Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Allan Sandfeld Jensen2019-09-2539-147/+552
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.13' into 5.14Allan Sandfeld Jensen2019-09-2439-147/+552
| | | | |\ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/glibc/glibc.cpp src/3rdparty src/core/configure.json src/core/profile_io_data_qt.cpp src/webengine/configure.json src/webenginewidgets/api/qwebenginepage.cpp tests/auto/widgets/qwebenginepage/BLACKLIST Change-Id: I3e1781048c3cb09bfbf7427dfc5dd1fec11a2b97
| | | | * Add gold linker support for boot2qt buildsMichal Klocek2019-09-191-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-73216 Task-number: COIN-326 Change-Id: I1f5b83520f8ad241652b0a34726743a7ecca7307 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| | | | * Fix flaky tst_QWebEnginePage::runJavaScriptFromSlotJüri Valdmann2019-09-142-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, "load finished" doesn't mean "ready to execute JavaScript". Fixes: QTBUG-74718 Change-Id: I611e35cfbb530ff68745d86124679d60ab0b113e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | | | * Doc: Add ATL to Qt WebEngine build requirements on WindowsLeena Miettinen2019-09-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-66882 Change-Id: I879854fb35a4e34dd7ae4760f88de69fc061c23e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | | * Add environment variable check for tst_ProxyPac::proxypac()Tamas Zakor2019-09-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yield error message if --proxy-pac-url argument is not passed. Change-Id: I9a5685982c0a9d8decc65ad9c728357c038ef0a0 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | | | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-09-127-17/+94
| | | | |\
| | | | | * Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-09-127-17/+94
| | | | | |\ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Ib1202bcce587f9614013105c6a836344c1727cb7
| | | | | * Update ChromiumMichael Brüning2019-09-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in the following change: 111349f18a4 Rename Chromium bootstrap name to prevent collisions Change-Id: I7003c35c5bad96f32b69900d507e637252a4950d Fixes: QTBUG-77938 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | | | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+80
| | | | | |\
| | | | | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+80
| | | | | | |\ | | | | | |/ / | | | | | | | | | | | | | | Change-Id: I4bff23ec94b76de300328a5235a35bd3e2f5da2c
| | | | | | * Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-291-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68aae7202d853802bd67bd11c41a037de93554b9 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | | | | * | Reject certificate error for non-overridable errorsKirill Burtsev2019-08-292-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On certificate validation error page load is just halted meaning that no progress or load result are reported and no default error page for certificate errors is shown. Even though documentation states that 'By default, an invalid certificate will be automatically rejected' and that aligns with default implementation of certificateError method within Page and non-deferred errors in quick View, page or view silently stays in an intermediate state for non-overridable errors. Fix this inconsistent behavior by automatically rejecting certificate for every invalid case (non-overridable error, not deferred or not implemented overridable method). Change-Id: Id1cee2ee5cc45bdcb5f262a6c99c84274e6ca374 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | | | | * | Fix reporting overridable flag for QML WebEngineCertificateError typeKirill Burtsev2019-08-294-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove confusion inside CertificateErrorController constructor and overridable method by matching documentation for AllowCertificateError method of ContentBrowserClient api. Change-Id: I7e10ef71a4429dcf5acc4b714a8a45f67a2ec684 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | | | | * | Fix WebEngineView.findText with a callback doc parameter descriptionKirill Burtsev2019-08-281-6/+5
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6415ccd9486433d6c449ea0d18b65f354e4bcd42 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | | | | * Update ChromiumJüri Valdmann2019-08-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in the following changes: a90e18d2d30 [Backport] Security bug 983938 0699308555b [Backport] Security bug 976050 852040586ec [Backport] Security bug 983850 a9f2f201ec6 [Backport] Security bug 973893 4bc95ce8486 [Backport] Security bug 958717 456aa9409ea [Backport] CVE-2019-5856 8ad3193acea [Backport] CVE-2019-5852 c1a19035306 [Backport] CVE-2019-5854 de78692c035 [Backport] CVE-2019-5855 ac7d5d7df5a [Backport] CVE-2019-5851 81417ff67b7 [Backport] Critical security issue 977057 ffbd836a7c8 [Backport] CVE-2019-5857 6693cf14341 [Backport] CVE-2019-5860 134a78ac91b [Backport] Security bug 981602 e981e2326a8 [Backport] CVE-2019-5865 b814b7b7d71 [Backport] CVE-2019-5862 1/4 dbb531a8212 [Backport] CVE-2019-5862 2/4 8502a1f7be2 [Backport] CVE-2019-5862 3/4 b71efe4a834 [Backport] CVE-2019-5862 4/4 d377f182ec3 [Backport] CVE-2019-5861 1/2 e13a9847f21 [Backport] CVE-2019-5861 2/2 4d84676d74a [Backport] Security bug 974627 d0d509db8c7 [Backport] Security bug 961674 691d632f7af [Backport] Security bug 960785 bdb7acb5afd [Backport] Security bug 964002 6e2562dd1ef Fix build with recent linux kernel. 7a779d01607 Fix skcms build with avx Fixes: QTBUG-77402 Change-Id: Ib9fe63c806149c299714bb1f76e4adf2877389d5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | | * | Fix WebEngineView flashing when closing popupPeter Varga2019-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closing a popup (eg. HTML select element) might cause WebEngineView to flash on macOS. This seems to be related to the window's NSPanel destruction and seems to appear only if the Qt::ToolTip window flag is set. Fixes: QTBUG-77072 Fixes: QTBUG-78084 Change-Id: I72af67ee97304278870b312482f8f9058ecd1233 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | | | * | Fix doc of QQuickWebEngineSettings::fullScreenSupportEnabledJüri Valdmann2019-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-78091 Change-Id: I65c8c39625955782c157b6360f92aa3a7e1c8c1b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | | * | Update ChromiumMichael Brüning2019-09-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in the following change: ca4dd6567c0 Fix iterating when erasing last element from task queue 0240cfc1a59 [macOS] Rename Chromium bootstrap name to prevent collisions Change-Id: I201516009705580ce232c8948ff0861f50860a67 Fixes: QTBUG-77938 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | | * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-052-1/+94
| | | | |\ \
| | | | | * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-052-1/+94
| | | | | |\ \ | | | | |/ / / | | | | | | | | | | | | | | Change-Id: I23368e20be22e833368818008e741e1f0d2cfb4a
| | | | | * | Add changes file for Qt 5.13.1v5.13.15.13.1Allan Sandfeld Jensen2019-08-191-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75c3c6c993b9cbdbc1fcb0e5bdbc99d346a3bff9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | | | * | Doc: Mention QML API for client certificatesKai Koehne2019-08-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebEngineView.selectClientCertificate is new API in Qt 5.13. Add a link to the signal in the 'Client Certificate' section of the 'Qt WebEngine Features' page. Change-Id: Ie347973d8f9657870e975adde089e3d9d0abd6d4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | | * | | Fix invalid url on profile changeMichal Klocek2019-09-042-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If adapter is initialized use always active url. Fixes: QTBUG-77977 Change-Id: Ie8d4ec7d7c703322cef50d26931cce2b130dcf34 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | | * | | Fix broken jpeg includesMichal Klocek2019-09-031-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Chromium 67 use of system jpeg is by default. Fix our configure. Fixes: QTBUG-77827 Change-Id: I6319f0fab9983d63c733a9723847ad793141e073 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | | * | | Add doc's cross-references for web notification example and api methodsKirill Burtsev2019-08-292-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If5a2d6a15a282a83e47e2bfb3d7e1a2a7c9a50fa Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | | * | | Add missing doc for WebEngineNotification QML typeKirill Burtsev2019-08-291-4/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3090b7cbbb9b913f147aaba8f39cefcd41e30d46 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | | * | | Fix snippet in notification exampleAllan Sandfeld Jensen2019-08-293-28/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc couldn't find the lines asked for. Also switch example to Qt coding style for good measure. Change-Id: I8798d4e85011cb1f46ea9a051f205dc2f650eccb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | | * | | Update ChromiumJüri Valdmann2019-08-261-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in the following changes: 74e69da92d0 Fix build with recent linux kernel. 32e459f495d Restore -fno-delete-null-pointer-checks Fixes: QTBUG-77671 Change-Id: I91987ac792179b77ffa312a9d6d40767b6fdbd57 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | | * | | Fix QWebEnginePage visibility stateJüri Valdmann2019-08-203-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling view.show(); view.load(...); view.hide(); results in a WebContents in visible state because the first call to show() is delayed via a timer and never canceled so it takes effect after the hide(). Also, the page's visibility state is not updated when changing views, so that a visible QWebEngineView can be set to display a hidden QWebEnginePage. Fixes: QTBUG-77209 Change-Id: I0243c659f4039a35c36e04ea55c5972666170fd0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | | * | | Skip qtwebengine for -no-gui build (also in the configure system)Liang Qi2019-08-111-0/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This amends 26ac59af2306 and cb265ff630fd. Task-number: QTQAINFRA-2576 Task-number: QTBUG-75465 Change-Id: I2953222d2094f4f7a8570844b29426314e8f6279 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | | * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-08-119-17/+30
| | | | |\ \
generated by cgit v1.2.1 (git 2.18.0) at 2019-11-22 19:51:14 +0000