diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-02 14:54:15 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-05 17:11:22 +0200 |
| commit | 6fec7eae319c7d737c1df585a66a151a654f723b (patch) | |
| tree | b657af9143ee9108c35ecef25fecfae3b769c9cc /src/widgets/styles | |
| parent | 785df612319d3023ad994f3153d42a067a1adaa9 (diff) | |
Make Android detection more robust
Our only way to detect whether the user requests an Android build of Qt
was to peek into the CMake toolchain file if it is specified. If the
toolchain file contains a certain magic string, we decide that we're
building for Android.
This approach is fragile and bound to break should the Android toolchain
file's magic string ever change.
Now, we assume an Android build if any of our ANDROID_* cache variables
is set. In that case, we do not peek into the toolchain file.
Pick-to: 6.2
Fixes: QTBUG-94955
Change-Id: Ie2f0ac0963f90f09805e311111bb6912d4325ada
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/widgets/styles')
0 files changed, 0 insertions, 0 deletions