diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-04 08:08:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-04 09:41:19 +0200 |
| commit | f9801f90f684dd75b93b4d84ecc299912c728d7a (patch) | |
| tree | 637c2be6f8189e84c35730d4c95358d46114f683 /qtxmlpatterns | |
| parent | 314d3efaf096a933bf550266d3c6cacc28af35eb (diff) | |
| parent | 80791b03ee245b893e638a78508f1fa957f0b08d (diff) | |
Merge remote-tracking branch 'origin/5.13.1' into 5.14
Conflicts:
coin/platform_configs/qt5.yaml
5.14 is using NDK r20 for android.
Change-Id: I483a628abd154c40937a44e196643a2be2552987
Fixes: QTBUG-77999
Diffstat (limited to 'qtxmlpatterns')
0 files changed, 0 insertions, 0 deletions