diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:01:31 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:55:46 +0200 |
| commit | 6711472d14d8f675160d559978acee96c1fb25c6 (patch) | |
| tree | 8869725c1337e4ecf6c64343e05543fb973bce3c /src/androidextras/jni/qandroidjnienvironment.cpp | |
| parent | 254ee1c61aebf43ffedf389d7872d79a3be0583d (diff) | |
| parent | 82fc3412c648d17ce99aecf7b46b273f72a4dbda (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: If16713447ac1192606cee870cd7b9e5e48db8578
Diffstat (limited to 'src/androidextras/jni/qandroidjnienvironment.cpp')
0 files changed, 0 insertions, 0 deletions