From 89b7f7671924f810c34637ee1f91de33a720521a Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 6 Jun 2019 10:31:55 +0200 Subject: [PATCH] Android: Move Platform Include Move the include of the platform from QtPlatformSupport to QtSetup. This no longer causes compile tests to fail since they expect explicit include paths instead of using CMAKE_MODULE_PATH. Change-Id: I9d3bed7845104d84422afb5a976ec14b111d259d Reviewed-by: Simon Hausmann --- cmake/QtPlatformSupport.cmake | 4 ---- cmake/QtSetup.cmake | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/QtPlatformSupport.cmake b/cmake/QtPlatformSupport.cmake index 9a3befc4200..ac9973905af 100644 --- a/cmake/QtPlatformSupport.cmake +++ b/cmake/QtPlatformSupport.cmake @@ -79,7 +79,3 @@ endfunction() if(CMAKE_CXX_COMPILER_VERSION) qt_parse_version_string("${CMAKE_CXX_COMPILER_VERSION}" "QT_COMPILER_VERSION") endif() - -if(ANDROID) - include(QtPlatformAndroid) -endif() diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index e7ec66b322e..62d4b0decea 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -63,6 +63,11 @@ enable_testing() ## Define some constants to check for certain platforms, etc: include(QtPlatformSupport) +## Android platform settings +if(ANDROID) + include(QtPlatformAndroid) +endif() + ## add_qt_module and co.: include(QtBuild)