From f8a83fc5c0aee1290a3e6b9a64ea3d50a07ee71d Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Mon, 26 Oct 2020 21:50:36 +0200
Subject: CMake: allow using ANDORID_NDK_ROOT for user projects

Allow CMake for Android to use ANDROID_NDK_ROOT to deduce the path for
QT_CHAINLOAD_TOOLCHAIN_FILE instead of the user providing it manually.

Change-Id: Ida728011d5ca8d5a723d341ea77b173e8f105f8c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/qt.toolchain.cmake.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cmake/qt.toolchain.cmake.in')

diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in
index f1a7a5abaa..e97e46879d 100644
--- a/cmake/qt.toolchain.cmake.in
+++ b/cmake/qt.toolchain.cmake.in
@@ -1,9 +1,10 @@
-@init_platform@
-
 @init_qt_host_path@
 @init_qt_host_path_cmake_dir@
 @init_original_toolchain_file@
 @init_vcpkg@
+
+@init_platform@
+
 if(NOT "${QT_CHAINLOAD_TOOLCHAIN_FILE}" STREQUAL "")
     set(__qt_chainload_toolchain_file "${QT_CHAINLOAD_TOOLCHAIN_FILE}")
 endif()
-- 
cgit v1.2.3