| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Add missing namespace qml registration for WebEngineLoadingInfo,
CertificateError
Change-Id: I154070df3ab685b36d000cdfc064a074d002afc0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 5f39a1098e7e64bf8d9947077d95b69e13f42416)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Merge and unify handling of loading started/finished for quick
and widgets by removing separate quick's type for monitoring
error page load and replace it with an isErrorPage method
in WebEngineLoadRequest to indicate, that load ended with an error
page being displayed. Effectively this only slightly changes when
loading finished gets emitted: now the signal is just postponed until
error page is finished loading after initial failure.
[ChangeLog][QWebEngineQuick][WebEngineLoadingInfo] New property
'isErrorPage' which indicates that the load resulted in an error page
Change-Id: I3e59dc488429d776f7c8e083b6d0489fb30a65fc
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webenginewidgets/printme/printhandler.cpp
src/3rdparty
src/core/api/qwebenginepage_p.h
src/core/content_browser_client_qt.h
src/core/web_contents_adapter_client.h
src/core/web_contents_delegate_qt.cpp
src/core/web_contents_delegate_qt.h
src/webenginequick/api/qquickwebengineview_p_p.h
tests/auto/quick/qmltests/data/tst_download.qml
tests/auto/quick/qmltests/data/tst_viewSoure.qml
tests/auto/widgets/loadsignals/tst_loadsignals.cpp
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
Change-Id: I9c1819ec15e13d4f8e244defe860e26274b5d4be
|
| |
| |
| |
| |
| |
| |
| | |
Prerequisite for WebEngineLoadRequest type rename
Change-Id: Ia8f4f15317881ba522c778c443cf17e55f5c9d65
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
We had split qmltest directory since we could not run qml tests
without test support, however this duplicated quite a lot files.
Moreover adding more fine-grained checks would mean creating
even more copies.
Generate test list on qmake call, so we can fine-grained which test
should be run.
Change-Id: I093bdd6deeca50a1936a72276d7d6af12a376c45
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
| |
Move the qmltests that require testsupport to qmltests2, this enables
us to run most of the tests on CI configurations that isn't developer-
builds.
Change-Id: Ie0ba060632b36cbd738d6ede512a6a5f35880ae3
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
| |
Change-Id: I49cd3c419d4dd1180144c3c07bdd9a628ab73caa
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
|
|
|
|
|
|
|
|
|
| |
Load failures now have a Chromium side timeout of 10s so we need to wait
longer than that. Additionally error-pages no longer have descriptive
titles, so we can not rely on that in our tests any longer.
Change-Id: I33ac8b9f1247403eb214f7260267edb887fe10d0
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
- Remove superfluous imports of QtWebEngine.experimental
- Remove unused waitForViewportReady()
- Remove "when: windowShown" from tests where UI is not used for testing
Change-Id: I05362596ace44a490417dc61e6d0564b4004537e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I1d8d221787c11bc8461e4989b0e5a5ece1c7d572
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
From Qt 5.7 -> tools & tests are licensed under GPL v3 with some
exceptions, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new GPL-EXCEPT header
(in those files which will be under GPL 3 with exceptions)
Change-Id: I59fcbb8cd1ca42b1a5ef96577bcb35ea0af01b71
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
This allows to use a WebEngineView to make a UI element that should not
get focus, which can be useful inthe case of hybrid UIs.
[ChangeLog][QtWebEngineQML][QQuickWebEngineView] Add activeFocusOnPress
Change-Id: I0666f81badd135db0049e0dd7b0fc30d0765b1c9
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|
|
|
|
|
|
| |
Wrong module...
Change-Id: Ie9657084e19b33798eef609385ee864340806007
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The testsupport API is used for test those features that are not
planned to be accessible via the public API. For example,
signals of the chromium's error page should not be visible for the
develepor but it is important to test whether the error page is loaded
properly.
Change-Id: Ie5b3265a207d05649cabd624a001a6ffe2e45971
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ie5c484540e5a46adec7f4e50cb63bc31d854a8b9
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: Ieb6bac7a1be5c25eb7cb917495b58b6a870ca6d4
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Error page should be disabled while testing loadFail signal since
testing signals of the internal error page is not possible yet.
Change-Id: I07f0bb6378fcbf5d18634197808801c94606803c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
If we get a replacement content, we can see a DidFinishLoad event for a frame.
This error page should be ignored based on the frame.
Change-Id: I3e1cd1773e8c5fc608605197c957011ddf258123
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
Also update all the examples to use 1.0 as 0.9 shouldn't be
publically recommended.
Change-Id: Ic58e35bdfd3a0f3d5201fc069b7103027ba84574
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I5f16a2f824112bdfa2c50b3e4d93d6d47e34ba1b
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
Test has been ported from QtWebkit and checks whether the error domain
is correct when LoadFailStatus is sent.
Change-Id: I456119ea1f5d74e1ed3c6e4fece72597f1306a71
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|