summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Stabilize test_urlPropertyv5.6.0-beta1Allan Sandfeld Jensen2015-12-142-0/+2
| | | | | | | | | | Pulls in Chromium patches that fixes crashes in the test, and add a missing waitForLoadSucceeded, that otherwise might cause the next test to fail. Task-number: QTBUG-48031 Change-Id: I4844aee0ccf159e50de955f3b3da704160a4a0f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix namespaced build of demobrowserJoerg Bornemann2015-12-142-2/+6
| | | | | | Change-Id: I6f863676dabacbe193e148481178753f05bd2869 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Make QQuickWebEngineProfile publicKai Koehne2015-12-1214-197/+345
| | | | | | | | | Make QQuickWebEngineProfile a publicly exported class. This allows users to set up and manipulate the profile from C++, and removes the ugly hack needed to access the cookie store. Change-Id: I99e1a8c2cb99d9d1a14e1c78bec5948ba1282fb3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Build qmltests only if QML testsupport API is availableJoerg Bornemann2015-12-111-1/+2
| | | | | Change-Id: Id54356024f60e5f877271b29895912e2bf0cb84f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix some syncqt warningsJoerg Bornemann2015-12-113-0/+26
| | | | | | Change-Id: I9f224e96138117bdf202084231ce6c805e15f5b2 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix path issues tst_QQuickWebEngineViewJoerg Bornemann2015-12-111-25/+36
| | | | | | | | | Compare URLs, not paths. This saves us a bunch of conversions and fixes the test on Windows. Change-Id: Iaf91e7be2b015545bb7b2b1141bc316f85e629ea Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update tests/auto/quick/publicapiJoerg Bornemann2015-12-111-1/+5
| | | | | Change-Id: Ia40857762cffb8e9fc47b55e3f9e41a177a6fa26 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Remove explicit version \inqmlmoduleKai Koehne2015-12-109-11/+11
| | | | | | | Also bump version in \qmlmodule QtWebEngine 1.2 Change-Id: I4d0379a3a46548e626508a8cf1fad51f742c8ddb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Add changes fileAllan Sandfeld Jensen2015-12-101-0/+74
| | | | | | | | | List the major new changes listed in the wiki. The list is not yet complete though, and needs to be expanded. Change-Id: I3d8b418518f63a6fdac236b580b4891ac409817b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update ChromiumAllan Sandfeld Jensen2015-12-101-0/+0
| | | | | | | Pulls in the last of the Chromium 47 security fixes Change-Id: Iaffa0a727948a45ca1dea036823bab2399105e09 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Make use of QObject's d-pointer in QWebEngineCookieStoreJoerg Bornemann2015-12-104-12/+10
| | | | | | | | | This safes us from managing d_ptr/q_ptr pairs and saves a bit of memory. Change-Id: Icdd692c5ddf0980de980bebb691ecf51b738acaa Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Stabilize tst_QWebEnginePage::getUserMediaRequestJoerg Bornemann2015-12-101-3/+3
| | | | | | | Do not use 100 ms timeouts. Change-Id: Ied4a9a8b9af6ac33c025930a823d334000be2945 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Stabilize tst_download.qmlJoerg Bornemann2015-12-101-4/+8
| | | | | | | | | Connect to WebEngineViewDownloadItem.stateChanged to collect state changes. This makes sure that state changes from tests that ran before do not interfere with the current test. Change-Id: I360ac325711bf041f82375b3714a9cfe7a42398c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Michael Bruning2015-12-094-26/+93
|\ | | | | | | | | | | | | Conflicts: src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp Change-Id: I451bc61673014db8e87b2a2cf98fb6879ce0e58d
| * Fix incorrect device pixel ratio used on startup.Alexandru Croitor2015-12-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Report the correct device pixel ratio to Chromium, when the QOpenGLWidget gets initialized. The initial value on startup is incorrect, because Chromium tries to query the screen information, before a relevant QWindow handle can be returned, and thus defaults to 1.0f. Change-Id: Ibbedd7b2915840f9716340e582aedbc13406f11a Task-number: QTBUG-49727 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Reuse or clean up HttpNetworkSession when (re-) setting a cache type.Michael Bruning2015-12-042-24/+81
| | | | | | | | | | | | | | | | | | | | | | Not reusing or cleaning up the session led to race conditions which in turn lead to crashes and asserts. Reuse the session if parameters match, clean up and it recreate otherwise. Task-number: QTBUG-49397 Change-Id: I4f846a448b50d80a3cf7c4f9bb833fa6d64974d7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix embedded Linux debug buildJoerg Bornemann2015-12-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The icu header files are picked up from src/3rdparty/chromium/third_party/icu, but the syroot's icu libs were linked. Do not claim to support linking against the sysroot's icu. This never worked properly in 5.5. Task-number: QTBUG-49693 Change-Id: I7dca37ecefbc5b1dabfadf86540442b8face8347 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix ninja for shadow builds on windows.Michael Bruning2015-11-301-2/+6
| | | | | | | | | | | | | | | | xcopy seems to behave differently for than cp when copying directories recursively. Change-Id: I5130a0642511fb796d9b32e0d4cd2cd2b9153dc0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update Chromium SHA1Allan Sandfeld Jensen2015-12-081-0/+0
| | | | | | | | | | | | | | Pulls in most of the security updates from Chromium 47 Change-Id: I1c023deb97a9d1b4f24c8573127d135672ed7ab4 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | enable tests/auto/widgetsJoerg Bornemann2015-12-073-3/+12
| | | | | | | | | | | | | | Enable autotests and blacklist tests that are known to fail. Change-Id: Iea23c69aa5a7bbd44c21803e352d17a92e9178a0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | stabilize tst_qwebenginepage some moreJoerg Bornemann2015-12-071-6/+5
| | | | | | | | | | | | | | | | Remove a qWait, and use the default timeout of waitForSignal. Do not expect the CI to be as fast as your desktop machine. Change-Id: I30b060422a285a2110ee7e065a3f17f80039e775 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Make the MIME-type of downloads availableAllan Sandfeld Jensen2015-12-0711-10/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | An application currently have to rely on suggested filename only to guess the type of a download. This is often insufficient when the suffix is misleading or missing. This patch adds the mimetype to the reported metadata and also adds a mimetype appropriate suffix to suggested filenames. Task-number: QTBUG-48206 Change-Id: I4c70f076d6eb5ae820fd6b7f568515eeb7c18df5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Quick: Close WebUI popups properlySzabolcs David2015-12-072-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch deactivates the web view with a FocusOut event when it turns to invisible and Chromium closes its WebUI popups. In case when the window is closing, we can't always rely on the destroyed() signal or the visibility state of the WebEngineView, since we have multiple top level windows and the destroying order of the items is not so trivial as in the single-window case. Task-number: QTBUG-49099 Change-Id: I802a47c72eed3ed6352f1ba24998622fc95bb48a Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix unclosable tabs in demobrowserMichal Klocek2015-12-072-25/+36
| | | | | | | | | | | | | | | | | | Switching to private profile back and forth brakes interactions with tabs. Connect signals every time new WebPage is created. Change-Id: I1765171116a3b9b9caba6ef2233289f50b315e62 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add margin to downloadmanageritem uiMichal Klocek2015-12-071-1/+10
| | | | | | | | | | | | | | | | Improve look of downloadmanager window by adding left, right margins to downloadmanageritem.ui Change-Id: I89dbb4bd4290592dde8f6c85e4865037cd990f91 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: edit WebEngineCertificateError QML type docsLeena Miettinen2015-12-041-9/+11
| | | | | | | | | | Change-Id: I658eaaefa422a0393318140a345e5114a3c085e6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: mark QWebEngineUrlRequestInfo::changed() internalLeena Miettinen2015-12-031-0/+3
| | | | | | | | | | | | | | ...to stop QDoc from printing an error. Change-Id: I22ac3d94e4f8ad53c0bfbda97a71c615a43a2262 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Doc: remove obsolete docs about URL requests and scheme handlerLeena Miettinen2015-12-022-12/+0
| | | | | | | | | | Change-Id: Ic567bcd9ba91d82c1df1ef42f6b57e4209418f22 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Rename setExtraHeader to setHttpHeader in QWebEngineUrlRequestInfo.Michael Bruning2015-12-022-3/+3
| | | | | | | | | | | | | | | | Also make a small update to the documentation of the method. Change-Id: Ie19578ffccfd30c884cdfe882dffcdae6637e8e2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Change QWebEngineUrlRequestInterceptor::interceptRequest to void.Michael Bruning2015-12-026-7/+18
| | | | | | | | | | | | | | | | Now uses a flag in QWebEngineUrlRequestInfoPrivate to store if the interceptor actually changed the request. Change-Id: Idccbd1c15696e577ee69248e53b75ba6ec1c571c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: edit QWebEngineCookieStoreClient::FilterRequest docsLeena Miettinen2015-12-021-7/+18
| | | | | | | | | | | | | | | | | | - Add \brief commands. - Each \variable command needs to be in a separate help topic. - Edit the language Change-Id: Iac9b57ceaca5d3decce83305b8d3d39d54eb09dd Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: edit the porting instructionsLeena Miettinen2015-12-021-20/+19
| | | | | | | | | | | | | | | | Follow the Qt documentation guidelines and fix some grammar issues. Change-Id: I1e708a2089b112aa079871b19698f71f0d3e85c3 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Work around MSVC linker out of memory failureJoerg Bornemann2015-12-021-0/+24
| | | | | | | | | | | | | | | | | | | | The native 32 bit MSVC linker tends to fail with LNK1102 (out of memory) in debug mode. Work around this issue by disabling debug information for x86, when not using the amd64_x86 cross-compiler. Task-number: QTBUG-49545 Change-Id: I2aac7e400719f74ced450e264ab1464596e5f204 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Support custom mouse cursorsSzabolcs David2015-12-012-2/+17
| | | | | | | | | | | | Task-number: QTBUG-43009 Change-Id: Ic36554c5137a55d9d4b9143c204d9d4400e23ff8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add core-private dependency to core_api.proJoerg Bornemann2015-12-011-1/+1
| | | | | | | | | | | | | | | | We want to use private QtCore API in later commits. Change-Id: If006d9bfd503cdb21b3adf164c0ebf2aa8967bac Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove superfluous destructor from QWebEngineCookieStorePrivateJoerg Bornemann2015-12-012-6/+0
| | | | | | | | | | | | Change-Id: I449f4c19b256373b78fa4585c14d06dbc8bc7276 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Remove unneeded qWaits from tst_QWebEngineCookieStoreJoerg Bornemann2015-12-011-2/+0
| | | | | | | | | | | | | | The issue why these waits were introduced is not valid anymore. Change-Id: Ie8d562ba1b27b8ddbf3b0dfd27c12904b0f6a20e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Rename QWebEngineCookieStoreClient to QWebEngineCookieStoreMichal Klocek2015-12-0123-133/+133
| | | | | | | | | | Change-Id: I8f9a4c5c155a65ede24908799218fd867db0767c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Remove the empty virtual destructor from QWebEngineUrlRequestInterceptor.Michael Bruning2015-12-011-3/+0
| | | | | | | | | | Change-Id: Ia7bcdcfd7db7120e6d9e5f46842501ec0f613f18 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Rename url scheme handler's destroyed signalAllan Sandfeld Jensen2015-12-013-5/+7
| | | | | | | | | | | | | | | | Make the signal distinct from the QObject destroyed signal and make sure it is not documented and follows private signal naming. Change-Id: If10a6e7fcee5e9ea4d3ed12ddb8e6ff3f1170adc Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge "Merge branch '5.5' into 5.6" into refs/staging/5.6Allan Sandfeld Jensen2015-12-011-0/+18
|\ \
| * | Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-11-271-0/+18
| |\| | | | | | | | | | Change-Id: Ie1f05c97650ecb86a6fe2d69ad037790c315a83b
| | * Reassociate the web channel when setting a profile.Michael Bruning2015-11-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The WebContentsAdapter gets recreated and the QmlWebChannel needs to be reassociated with the new adapter instance. Change-Id: I88494fd379c429f2ae98df95a22c04c334452088 Task-number: QTBUG-49521 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * fix crash on WebEngineNewViewRequest.openInJoerg Bornemann2015-11-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling WebEngineNewViewRequest.openIn with the WebEngineView that initiated the request, QQuickWebEngineViewPrivate::adoptWebContents would destroy the current WebContentsAdapter object. But this WebContentsAdapter implicitly holds the RenderHostViewImpl of the current call stack. Accesses to it after adoptWebContents is finished will crash. Fix the crash by deferred deletion of the current WebContentsAdapter. Task-number: QTBUG-47601 Change-Id: I3c229172511b4aed77632a0abefbe0265ebf1557 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Update QtWebEngine version in module overviewKai Koehne2015-12-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Also remove QtQuick import. This one is not specific for the module. Change-Id: I0cdbb0f36823e109e0b4b93e65ae3de59aebd2b7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | | Set -no-duplicate-basenameAllan Sandfeld Jensen2015-12-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Add another gyp flag from gyp_chromium.py, this is needed on some non-x86 platforms in particular AArch64. Change-Id: Id9ca1490d0e8637e52cec53c40e9bc40403501f2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Fix loading of Flash plugin on WindowsKai Koehne2015-12-011-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | So far we were only storing the filenames, not the full paths. While at it also fix the loading on 32 bit Windows, and do not hardcode the location of the Windows directory. Change-Id: Ie5d9a23b941ff9bde36e687c37c412b15b4d65c8 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Configure gyp for arm64Allan Sandfeld Jensen2015-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | Introduces basic support for doing native arm64 builds. Change-Id: Ic03327c053a1c8197ba0610cf1364ccc93f015ff Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Doc: Adobe Flash player plugin supportLeena Miettinen2015-12-011-0/+30
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-49625 Change-Id: I2b01f45d0b8082a13eff4a4629de13fa8da862aa Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Doc: remove include and linking instructions from front pageLeena Miettinen2015-12-013-25/+15
| | | | | | | | | | | | | | | | | | | | | | | | Make sure that the instructions are visible on the linked page for each module. Change-Id: I47625bd8eb19ddf1f94e1bafb49f132216a0c069 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>