diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:04:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:10:27 +0100 |
| commit | eef3467cfad9f6ad892344bfcadbd59b5bcb4f53 (patch) | |
| tree | 6871b7e2a09883dba43d68a774be4f9be760df19 /src/plugins/android/qandroidwebview.cpp | |
| parent | 4cefce7644f1eb9b9a5750ebc1b361976d866448 (diff) | |
| parent | f016c7781fb418fd57bae62d22ce46f8711de62a (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
.qmake.conf
Change-Id: Ia6e0a844ba13f1fc5c1098bb70b172d8b120efc4
Diffstat (limited to 'src/plugins/android/qandroidwebview.cpp')
0 files changed, 0 insertions, 0 deletions