diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 15:21:42 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 15:22:10 +0100 |
| commit | 3fe3c36039a68df52ce072af034ada6b4b946cb4 (patch) | |
| tree | 5d94f3ae084b30baff037f92446aee29cae21a3d /tests | |
| parent | d18b3e7c3b3cb1baa20c8fcc53038a91c8fa40af (diff) | |
| parent | 7a39d2c3082822b9d4b2417d41f08b5def41b1db (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/3rdparty
src/webenginewidgets/api/qwebenginepage.cpp
src/webenginewidgets/api/qwebenginepage_p.h
Change-Id: I050b4c7691a070e04cace2663ad633903f6d96a9
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions