diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-28 09:51:04 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-28 09:53:31 +0100 |
| commit | e280d6794a2b9fc6b9280f2f91016e5f95570d9d (patch) | |
| tree | 11a7f0944721f84a5e72a9b48d4e8893091d72bd /src/core/api/qwebenginecallback_p.h | |
| parent | fd73b33893e0acb22c6082a1754b01bf9f5c436e (diff) | |
| parent | 09a341f4a62a0fe244dc188a75d77d0067ad1fe7 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/3rdparty
Change-Id: I49acdd9b5ca94f2807b0c13a97f508a67f1c5750
Diffstat (limited to 'src/core/api/qwebenginecallback_p.h')
0 files changed, 0 insertions, 0 deletions