1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Move Platform Include

Browse Source 
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 <simon.hausmann@qt.io>
This commit is contained in:
Leander Beernaert 2019-06-06 10:31:55 +02:00
parent 37cdd44982
commit 89b7f76719
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtPlatformSupport.cmake
View File

@ -79,7 +79,3 @@ endfunction()
if(CMAKE_CXX_COMPILER_VERSION) if(CMAKE_CXX_COMPILER_VERSION)
qt_parse_version_string("${CMAKE_CXX_COMPILER_VERSION}" "QT_COMPILER_VERSION") qt_parse_version_string("${CMAKE_CXX_COMPILER_VERSION}" "QT_COMPILER_VERSION")
endif() endif()
if(ANDROID)
include(QtPlatformAndroid)
endif()

5
cmake/QtSetup.cmake
View File

@ -63,6 +63,11 @@ enable_testing()
## Define some constants to check for certain platforms, etc: ## Define some constants to check for certain platforms, etc:
include(QtPlatformSupport) include(QtPlatformSupport)
## Android platform settings
if(ANDROID)
include(QtPlatformAndroid)
endif()
## add_qt_module and co.: ## add_qt_module and co.:
include(QtBuild) include(QtBuild)