diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
commit | 6c344184df2dd6573681a0d2022daa55b6a36f38 (patch) | |
tree | 91493089f958b95138bdbd3f838188450e4349bb /tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc | |
parent | bfc5eb719d30decaf5c65e2747d49a6eec28794d (diff) | |
parent | bc317d32a65eb08da7df10bec6417829533cfc3a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/core/browser_context_adapter.cpp
src/core/web_contents_adapter.cpp
tests/auto/widgets/qwebenginepage/BLACKLIST
Change-Id: I45ee0a33f6316f585555d58fede8072fe514aecf
Diffstat (limited to 'tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc')
-rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc index c7bffd5bb..91adeb694 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc @@ -12,6 +12,7 @@ <file>resources/script.html</file> <file>resources/user.css</file> <file>resources/image.png</file> + <file>resources/pasteimage.html</file> <file>resources/style.css</file> <file>resources/test1.html</file> <file>resources/test2.html</file> |