diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:34:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:34:53 +0100 |
| commit | bb3c2b9090bd1e1c9664492413c05fedbde575fa (patch) | |
| tree | e46a6c0f72bf0acdb07cf5c25f73dc55ae457d5d /src/androidextras/android/qandroidservice.cpp | |
| parent | 125c4fdbf4df3e79c84798f55a3d29fa418517ca (diff) | |
| parent | 5794f3130cb1894ea3d8143c2c89de23886d9c17 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I5b98d2d4fea7b3b6e9c093d35866c4d11aee4dfe
Diffstat (limited to 'src/androidextras/android/qandroidservice.cpp')
0 files changed, 0 insertions, 0 deletions