Remove lint expection in developer build
Avoid lint exception for dependency updates in the developer build so we do not miss updates. Change-Id: I7856a2773e49258c6497ae5d4978a4ea519e9a04 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 6bb3feffd56424d0990b1345f343012a60e3351e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
0f80bb1811
commit
7463b443ce
@ -3,9 +3,30 @@
|
|||||||
|
|
||||||
# Android template files
|
# Android template files
|
||||||
|
|
||||||
|
set(build_gradle "build.gradle")
|
||||||
|
if(QT_FEATURE_developer_build)
|
||||||
|
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/${build_gradle}" build_gradle_in)
|
||||||
|
string(REGEX REPLACE
|
||||||
|
"\n *//noinspection GradleDependency\n"
|
||||||
|
"\n"
|
||||||
|
build_gradle_out
|
||||||
|
"${build_gradle_in}"
|
||||||
|
)
|
||||||
|
qt_configure_file(
|
||||||
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${build_gradle}"
|
||||||
|
CONTENT "${build_gradle_out}"
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
configure_file(
|
||||||
|
"${CMAKE_CURRENT_SOURCE_DIR}/${build_gradle}"
|
||||||
|
"${CMAKE_CURRENT_BINARY_DIR}/${build_gradle}"
|
||||||
|
COPYONLY
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
set(template_files
|
set(template_files
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml"
|
"${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/build.gradle")
|
"${CMAKE_CURRENT_BINARY_DIR}/${build_gradle}")
|
||||||
|
|
||||||
set(template_directories
|
set(template_directories
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/res")
|
"${CMAKE_CURRENT_SOURCE_DIR}/res")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user