diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-21 13:03:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-21 13:03:09 +0100 |
| commit | f94ca82e0ff6345648b499911411f2dcc1849267 (patch) | |
| tree | bc5acac8bfecaf5bccc612f5b009bf249bc69ef1 /configure.pri | |
| parent | fe29a6a6ebbf28505df7cdf1de24fa540fd3745e (diff) | |
| parent | b1092a7d4240d419cc2b5f3f5c326a1cb680bbdd (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ibfcb30053f3aacb8ec2ec480e146538c9bf440ea
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 8f155787e0..1e8f93a41e 100644 --- a/configure.pri +++ b/configure.pri @@ -621,6 +621,9 @@ defineTest(qtConfOutput_prepareOptions) { isEmpty(platform): equals(target_arch, arm64-v8a): \ platform = android-21 + isEmpty(platform): equals(target_arch, x86_64): \ + platform = android-21 + isEmpty(platform): \ platform = android-16 ### the windows configure disagrees ... |