summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Buhr <andreas.buhr@qt.io>2022-02-14 16:34:18 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-17 17:27:20 +0000
commit462bd9933c742e7aa5faf9e9ad48b634d3f71e10 (patch)
tree780735cbfd5e9f2d2af144c54c408569824da638
parent86f8bad3c18aab166f0f00d56bfd9ede4cc8533b (diff)
Set version for tst_qguiapplication and tst_qcoreapplication
In tst_qguiapplication and tst_qcoreapplication, the application version should be set. On Android, this is done using QT_ANDROID_VERSION_CODE. Change-Id: I6b473ad25092fb24df9400e0ab8fbb8ea4edbb6a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 4e77f5ce0a69765ae7571a8981536f8494184f87) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt5
-rw-r--r--tests/auto/gui/kernel/qguiapplication/CMakeLists.txt3
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt b/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt
index 24be474f90..92d4b03d26 100644
--- a/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt
@@ -31,6 +31,11 @@ if (APPLE)
endif()
# special case end
+if (ANDROID)
+ set_property(TARGET tst_qcoreapplication PROPERTY QT_ANDROID_VERSION_NAME ${target_version})
+endif()
+
+
#### Keys ignored in scope 1:.:.:qcoreapplication.pro:<TRUE>:
# QMAKE_INFO_PLIST = "$$PWD/Info.plist"
# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
index 647fc274b9..85dfae8b68 100644
--- a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
@@ -44,6 +44,9 @@ qt_internal_add_resource(tst_qguiapplication "tst_qguiapplication"
${tst_qguiapplication_resource_files}
)
+if (ANDROID)
+ set_property(TARGET tst_qguiapplication PROPERTY QT_ANDROID_VERSION_NAME ${target_version})
+endif()
# special case begin
if (APPLE)
set_property(TARGET tst_qguiapplication PROPERTY MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist")