summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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>
* | Support the command-line argument --allow-running-insecure-contentAllan Sandfeld Jensen2016-08-262-1/+6
| | | | | | | | | | | | | | | | | | Reads the chromium command-line argument and pass it on to WebKit. This also prepares for adding it as proper API later. Task-number: QTBUG-54902 Change-Id: I391940ef43a88332f45cc3c97fe22514d7f6a76c Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Ensure WebEngineContext::destroy() is called before the destructorAllan Sandfeld Jensen2016-08-231-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a false reference only removed after destroy() is called, so the tearing down of static objects won't dereference it before the QApplication is destroyed and the post routines including destroy() are called. Also adds a little safety by asserting destroy() has been called before ~WebEngineContext() and make sure we don't create a new WebEngineContext() during shut down. Task-number: QTBUG-54769 Change-Id: I2b1d189f9ebd8da2dc9f322f9bb307a5aa0c6a2f Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Pass alsa pulseaudio qt build settings for embedded buildsMichal Klocek2016-08-201-1/+10
| | | | | | | | | | | | Change-Id: I0996b08d661bc52233396a98acdf9d2e68876711 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Fix sandboxing of localtime syscallAllan Sandfeld Jensen2016-08-191-63/+1
| | | | | | | | | | | | | | | | | | | | The check OS(LINUX) does not work here, so use the Qt OS defines, and remove the stat and fopen overrides that Chromium no longer proxies this way. Task-number: QTBUG-55125 Change-Id: Ie03b8e0cabd100f2f72b7ab1cff5dc8697ba69ad Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-1614-152/+158
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webengine/api/qquickwebenginecertificateerror.cpp src/webengine/doc/src/webengineview.qdoc tools/qmake/config.tests/libcap/libcap.cpp Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
| * Explicitly disable the build on MirSimon Hausmann2016-08-151-0/+4
| | | | | | | | | | | | | | | | Unfortunately Mir is not supported yet, see EGL context retrieval code in src/core/content_browser_client_qt.cpp. Change-Id: Icade55c4c35f1a2a625479c31699d33853922087 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Update ChromiumAllan Sandfeld Jensen2016-08-101-0/+0
| | | | | | | | | | | | | | Pulls in security updates from Chromium 52 Change-Id: I4fb5183a321b45fdf5515f0a88100b48697ee3aa Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Doc: Add type name to enumeration values to follow the doc conventionLeena Miettinen2016-08-096-89/+107
| | | | | | | | | | Change-Id: I86eea3a64a38f6ec9984f663499abffa03cd9eb2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Remove libcap dependencyAllan Sandfeld Jensen2016-08-053-49/+0
| | | | | | | | | | | | | | | | Chromium does not appear to use it anymore. Change-Id: I846fd869ffb15b832f208764fe8066f000187973 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Add Qt WebEngine to list of "All QML Modules"Kai Koehne2016-08-051-0/+1
| | | | | | | | | | | | | | This list is shown in qtdoc/qmlmodules.html Change-Id: Ib51f0405e7581571f8a124ea6806e7bc4982dba3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Fix issue where Chromium thought it had active focusAlexandru Croitor2016-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when a WebEngineView's RenderWidgetHostViewQtDelegateQuick had focus, but not activeFocus, Chromium was told that it had keyboard focus. That is not correct, because having focus inside the FocusScope (the WebEngineView), does not mean it has keyboard focus, it just means the RWHVQDQ will receive active focus, when the WebEngineView does. The call path for that erronous check was done when a new page was loaded, specifically going through NavigatorImpl::DidNavigate() -> RenderFrameHostManager::CommitPending() -> render_frame_host_->GetView()->HasFocus() -> RenderWidgetHostViewQtDelegateQuick::hasKeyboardFocus(), which resulted in incorrect display of a blinking caret in an input, when the view actually wasn't focused. The fix consists in checking for the activeFocus rather than the focus property. Change-Id: I97002be3fc8adfec2228a1b5ad62696f8872d3cc Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Doc: Explain how to support High DPI devices in applicationsLeena Miettinen2016-08-041-0/+25
| | | | | | | | | | | | Task-number: QTBUG-54114 Change-Id: I63ae6c47eb76a4acf85cd5b0c7adb21399a985dd Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Doc: Move WebEngineView property docs to webengine.qdocLeena Miettinen2016-07-292-20/+20
| | | | | | | | | | | | | | | | | | The docs do not currently get built, because docs for a QML type need to reside in one file. Also edited the docs for grammar and style. Change-Id: Ic62f293e113d0e4bfe0497ce4a665a2a42971eb3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Blacklist flaky getUserMediaRequest test for all platformsMichael Bruning2016-08-121-1/+1
| | | | | | | | | | | | | | | | It seems to fail on RHEL 7.2 and Windows on integration machines. Task-number: QTBUG-51652 Change-Id: I44fe19e625f3a639e91325ddef29b910ddd3525c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Check if gpu fence is supported in pullTextureMichal Klocek2016-08-091-1/+1
| | | | | | | | | | | | Task-number: QTBUG-53972 Change-Id: Ie722e40e4763c5a78ce566d03fec6877d64b2023 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Doc: Describe deployment of Qt WebEngine applicationsLeena Miettinen2016-08-091-26/+97
| | | | | | | | | | | | Task-number: QTBUG-55142 Change-Id: I1255269730bb3b5ae13e2128743da421589c26c8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Doc: Add type name to enumeration values added in Qt WebEngine 1.3Leena Miettinen2016-08-085-142/+149
| | | | | | | | | | Change-Id: I8f3aa86b451e57d01937559e595a439529a839ce Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Doc: Move "Target Platforms" to deployment topic from "Platform Notes"Leena Miettinen2016-08-082-13/+14
| | | | | | | | | | Change-Id: I178260c8356afaada989abfb2a1218d4ce0f134e Reviewed-by: Kai Koehne <kai.koehne@qt.io>