diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-12-09 16:13:37 +0100 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-12-09 16:13:37 +0100 |
| commit | 04b30d974aee4fc556249b1bfa62c7cb79b839c5 (patch) | |
| tree | 8c287e09e01936c0f482522d5082bbf64bafb786 /tests/auto/quick/qmltests/data/tst_download.qml | |
| parent | 1c09b16ebb88737682a5cd6ddc58f6d360b635af (diff) | |
| parent | 7c5f2a9393a3fc77c0c5b2406332d57a37325183 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
Change-Id: I451bc61673014db8e87b2a2cf98fb6879ce0e58d
Diffstat (limited to 'tests/auto/quick/qmltests/data/tst_download.qml')
0 files changed, 0 insertions, 0 deletions