summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not call QOpenGLContext::openGLModuleType() from MainDllMichal Klocek2016-10-261-7/+12
| | | | | | | | | | | | | | | In case of dynamic OpenGL on Windows this ends on calling QWindowsIntegration::staticOpenGLContext() from MainDll which in case of angle will end up badly. Add warning message when webengine is loaded from plugin and context is not initialized. Task-number: QTBUG-52201 Task-number: QTBUG-55501 Task-number: QTBUG-56020 Change-Id: I03570cad5f686c4a63910c71136bf3eb9499f223 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update ChromiumAllan Sandfeld Jensen2016-10-172-2/+4
| | | | | | | | | | | | | | | | | | | | Pulls in security fixes from the Chromium 54.0.2840.59 release, Changes included: - Fix renderer crash on null family strings - [Backport] Blink-in-JS should not run micro tasks - [Backport] Disallow reentrance of FrameView::updateLifecyclePhasesInternal() - [Backport] Check CORS policy on redirect in TextTrackLoader - [Backport] Keep top controls visible if SHOW is called right after HIDE. - [Backport] Merge to 2840 "[DevTools] Avoid current_ and pending_ being the same host in RenderFrameDevToolsAgentHost." - [Backport] Enable do not allow default action for untrusted events. - [Backport] Compare font-feature-settings as part of Font::operator==(). - Stop the flood of accessibility messages - [Backport] Fix for hitting an assert when refreshing a page with an image - [Backport] Report the decoded size to ImageObserver, instead of deltas Change-Id: I142cc070ba7fb215e4a5b9c162852b583dab9784 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Add changes for 5.7.1Allan Sandfeld Jensen2016-10-171-0/+51
| | | | | Change-Id: Iec54a4a3a117ce5f6bca8ff22218eb8fea0008e8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Fix nullpointer dereferencing errorViktor Engelmann2016-10-121-1/+1
| | | | | | | | | Check whether iconUrls is NULL before calling contains(iconUrl) on it, which, under certain circumstances, caused a SEGFAULT. Task-number: QTBUG-56330 Change-Id: Ia167d68a4c4d62af4740a8cbab2686bfbc975455 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Update ChromiumAllan Sandfeld Jensen2016-10-121-0/+0
| | | | | Change-Id: I6803569bd7bee4bf8eb94f61771ea2a318eb752b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix crash in WebEngineContext when using WaylandAllan Sandfeld Jensen2016-10-121-2/+9
| | | | | | | | | | | For some reason the OpenGL context wayland QPA sets has no nativeHandle, so we end up crashing in strcmp. Assume a context without nativeHandle is Wayland or other GLES2 platform and also force GLES2 when using Ozone. Change-Id: Ia3fc524f3ffbb278d86f9153ec96c7258ef86656 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Doc: Set the correct indexTitle for C++ Classes pageTopi Reinio2016-10-061-3/+3
| | | | | | | | | ... and mention namespaces in the title, listing the namespaces with a group selector. Change-Id: I06056beba464a441ab56cb0acbfb0440c0878f0d Task-number: QTBUG-56298 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Speculative stabilization of tst_QWebEnginePage::testJSPromptAllan Sandfeld Jensen2016-10-051-0/+3
| | | | | | | | Make sure we start in a well-defined state, and is not in process of setting up the blank page. Change-Id: I787db2ef75323bb72a5a6c6fd2e66b268f89b16d Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-045-5/+19
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: I49d99b5ac2cfba243eda1ea705c2a7d71b5542f6
| * Fix flaky tst_QQuickWebEngineView::loadProgress testAlexandru Croitor2016-09-301-3/+2
| | | | | | | | | | Change-Id: I102bda62bfaa16a8c9ff4c4929e6b5a055de3e25 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Doc: Fix initialize() documentationMichal Klocek2016-09-301-1/+1
| | | | | | | | | | | | | | | | We do not share context between "processes", but between "threads" Change-Id: I20f558f913c1f19fc469ade6faab45762f42d528 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Update ChromiumAllan Sandfeld Jensen2016-09-271-0/+0
| | | | | | | | | | | | | | Pulls in changes to build debug+release correctly and build with Xcode 8 Change-Id: I38d6bd50048b332939416b0fae3f20978995d789 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Propagate the view's screen coordinates on global position change in QuickPeter Varga2016-09-272-0/+15
| | | | | | | | | | | | | | | | | | Based on widget solution: 1e83a2d1b61b13323163dfe8cac64dad397cb202 Task-number: QTBUG-55650 Change-Id: I6df45e7e018fa201c50fe81e8679c36f97ddeb1e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Include neon support for any -fpu=.*neon.*Donald Carr2016-09-271-1/+1
| | | | | | | | | | | | Change-Id: I9c571c823b6fa2411e003799f7ff8627ef6e1d5e Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix flaky tst_QQuickWebEngineView::printToPdf test by using QTRY_VERIFYMichael Brüning2016-10-021-4/+2
| | | | | | | | | | | | Task-number: QTBUG-55857 Change-Id: Ieb7fe836e7b03bea28dd97bcad343708a5be2cb5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Update ChromiumAllan Sandfeld Jensen2016-10-011-0/+0
| | | | | | | | | | | | | | | | Pulls in changes to build debug+release correctly, build with Xcode 8, and added support for running on macOS 10.12 Sierra. Change-Id: I17668229c1b90af9dca26fb48f6cf945ef0ed114 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-09-255-12/+14
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-245-12/+14
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/webengine/api/qquickwebenginesettings.cpp Change-Id: Ib7e2a7558c685410c49c455218d3b9c30f32358f
| | * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-233-9/+9
| | |\ | | | | | | | | | | | | Change-Id: I3e152ee134ed38628d1bf9571df58f469b29e74b
| | | * Fix crash when using openIn on newly created viewv5.6.2Christophe Chapuis2016-09-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a link triggers a NewViewRequest, and the latter creates a new window with a new WebEngineView inside, the "adapter" pointer can still be NULL when the adoptWebContents is called by openIn. Therefore is it necessary to test the adapter pointer before using it. (cherry picked from commit bfc2683ab4ca3f56a2effd1b2f7e68850acb72ba) Task-number: QTBUG-55765 Change-Id: Iaa7cb4e8c7780a2e3f1a8c85b7b5da0ec541b2f3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Doc: Fix types of \qmlpropertyKai Koehne2016-09-193-9/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie355f72a0bf575e66ab465fb2fcada0430ed8c7c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * | Use canonical include paths for public headersKai Koehne2016-09-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not rely on "include/QtWebEngineWidgets" or "include/QtCore" being in the default include path. Task-number: QTBUG-56107 Change-Id: I9535f723814efdef7bf8290a891978aabfa899bb Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * | Fix crash when using openIn on newly created viewChristophe Chapuis2016-09-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a link triggers a NewViewRequest, and the latter creates a new window with a new WebEngineView inside, the "adapter" pointer can still be NULL when the adoptWebContents is called by openIn. Therefore is it necessary to test the adapter pointer before using it. Task-number: QTBUG-55765 Change-Id: Ia1a299dd65c229705462c9444b81d7b26567fc09 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Fix dangling pointer problemViktor Engelmann2016-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn the raw pointer ResourceDispatcherHostLoginDelegateQt::m_authInfo into a scoped_refptr, to prevent chromium from freeing the memory, which caused this pointer to dangle and SEGFAULT upon later usage. Task-number: QTBUG-55828 Change-Id: Ib57e89ca042a4494e2ab77ea10328495e6fc1431 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Disable local database when local storage is disabledAllan Sandfeld Jensen2016-09-251-0/+1
|/ / / | | | | | | | | | | | | | | | | | | Ties the feature switch for Indexed DB to the same as local storage. Change-Id: I9ea8992cc00097a8f7bd86236f8cd43008566d2b Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Use canonical include paths for public headersKai Koehne2016-09-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do not rely on "include/QtWebEngineWidgets" or "include/QtCore" being in the default include path. Task-number: QTBUG-56107 Change-Id: I1a1eb7baf6d3166239eadc5b0b9863704e87888c Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Update ChromiumAllan Sandfeld Jensen2016-09-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Pulls in the second batch of cherry-picked security patches from the 53 release. Change-Id: Ibd5a596648cb8caa47b9df45e019d198eb494d9d Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Doc: Fix types of \qmlpropertyKai Koehne2016-09-203-9/+9
| | | | | | | | | | | | | | | Change-Id: Ibb470580404f2b09dc8c7c2de275ade97251d612 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-182-1/+64
|\| | | | | | | | | | | Change-Id: I2452f25335174d0e0c15a9e069fe50e1d92db1b8
| * | Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-162-1/+64
| |\| | | | | | | | | | Change-Id: Ie075563e90ca184f8bd38be4a9a9bd49b4640769
| | * Add changes file for 5.6.2Allan Sandfeld Jensen2016-09-131-0/+62
| | | | | | | | | | | | | | | Change-Id: I45fcde261328114510ce260a30ad83b8d598c222 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * Resolved nullptr dereference bugViktor Engelmann2016-09-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In line 282f of chromium/content/browser/frame_host/render_frame_host_manager.cc, RenderFrameHostManager::Navigate passes nullptr to WebContentsImpl::NotifyViewSwapped. In line 3833f of chromium/content/browser/web_contents/web_contents_impl.cc, this is passed on to the observers, including UserResourceControllerHost::WebContentsObserverHelper::RenderViewHostChanged which dereferenced it unchecked, causing a crash. Task-number: QTBUG-55254 Change-Id: Ibdb6645f63957d28a89c50b51faeb3aea086a8b3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Enable -fno_delete_null_pointer_checks for g++ 6 on all of chromiumDavid Faure2016-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is necessary e.g. for PaintLayer::enclosingSelfPaintingLayer which also compares this with null. Change-Id: I85d69432a0d7eeb0d8df8f395821880e36180dcc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Update ChromiumAllan Sandfeld Jensen2016-09-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Pulls in the first batch of cherry-picked security patches from the 53 release. Change-Id: Ife72ecef309249e4f80ca9b7cc478bd4e236e094 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Fix test_scrollPositionAfterReload quick auto testPeter Varga2016-09-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Wait for scroll position change before reload. Task-number: QTBUG-55855 Change-Id: Ia42af1a4a76b2c507f4a88b39a469e3e37184ef7 Reviewed-by: Adam Kallai <kadam@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-09-123-2/+7
|\| | | | | | | | | | | Change-Id: I9acebc9f1d01ab9041f75c49749f8a122ffbfe30
| * | Do not assume neon on armv7Allan Sandfeld Jensen2016-09-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Chromium defaults to arm_neon=1 and then sets -mfpu=neon if the arm architecture is 7. Change-Id: Ib144dd4188ba4221ed35367026de9f9a04c69792 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | Improve QWebEngineSettings::JavascriptCanOpenWindows docsFlorian Bruhin2016-09-062-2/+3
| | | | | | | | | | | | | | | Change-Id: I44105c768a958714590b979d3877724f0db659ee Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Fix buildAllan Sandfeld Jensen2016-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We now get a multiword value from $$pkgConfigExecutable which will cause us to treat it as multiple gyp config sets, which will make gyp fail. Change-Id: Icdf781bb633d804ff6355e882dc4997bb5f3310f Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Doc: QWebEngineContextMenuData is in the QtWebEngineWidgets moduleLeena Miettinen2016-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was listed in the wrong place, because the value of the \inmodule command was wrong. Task-number: QTBUG-55872 Change-Id: Ie3df6bb261dd75178bbe0f118d7720e2bff6d205 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Doc: Add type name (WebEngineView) to the SavePage enum value in docsLeena Miettinen2016-09-081-1/+1
| | | | | | | | | | | | | | | Change-Id: Ica90790662929f1141419ccd38d34d3c9d55be32 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Michal Klocek2016-08-317-27/+117
|\| | | | | | | | | | | Change-Id: Ic739ab9db0851cc13467168840ea2549996432f8
| * | Qt Designer plugin: Add a dummy class for querying propertiesFriedemann Kleint2016-08-312-1/+37
| |/ | | | | | | | | | | | | | | | | | | | | Add a lightweight "fake" QWebEngineView class that is returned when Qt Designer queries the default property values by calling QDesignerCustomWidgetInterface::createWidget() with 0 parent, preventing crashes during QWebEngine initialization. Task-number: QTBUG-53984 Change-Id: Iced64b7d8af4c958fe7e29fa2f64bb9b681fbab2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Clicking on a select box option, did not workAdam Kallai2016-08-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There was introcuded a new logic which proves that no mouse / keyboard events are forwarded to Chromium if the view has no focus, and activeFocusOnPress is set to false. The selection box get focus when the user click on it, but the popup window never get (focus is on QuickRootItem) in this case these mouse events are ignored to forward to Chromium. Task-number: QTBUG-54795 Change-Id: Id6e81ee39dcde21a6c5c46e302888b9e9478352f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Update ChromiumAllan Sandfeld Jensen2016-08-261-0/+0
| | | | | | | | | | | | | | Pulls in fixes for webcursors and building against FFMPEG3 Change-Id: Ic852604eea1a15cbf96decd536278f01a7f9dcf3 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Fix textures memory leak on second X11 screenMichal Klocek2016-08-242-20/+67
| | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-48969 was only half-baked patch and introduced massive memory leak on fbo and texture alloctaions. Delete fbo and extra allocated textures. Task-number: QTBUG-52575 Task-number: QTBUG-48969 Change-Id: I2148f37cd27dab9e40ab72caeb6857752b69379f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix crash when trying to navigate in new window but is blockedAllan Sandfeld Jensen2016-08-232-3/+9
| | | | | | | | | | | | | | | | Ensure that if QWebEnginePage::createWindow returns 'this' that we fall back to navigating in current tab. Change-Id: Idffe25dcafaaf3c824815b3cf1f0e400eaec2923 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Bump module versionAllan Sandfeld Jensen2016-08-191-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-55367 Change-Id: If073f0be97d01dfb26ad47803250eb645b386a1c Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Update ChromiumAllan Sandfeld Jensen2016-08-302-1/+1
| | | | | | | | | | | | | | Pulls in a security update and updates our sources to match. Change-Id: I06af8eea04426ee9c695e78cce7c9606eb2b4ab1 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Use pkg-config wrapper provided by qmakeMichal Klocek2016-08-261-0/+2
| | | | | | | | | | | | | | | | Switch to pkg-config wrapper provided by qmake to avoid exporting extra PKG_CONFIG_LIBDIR paths. Change-Id: I6c916d8d20965808af7b206c4fecf6c8791e93b4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>