aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2022-02-02 16:32:24 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2022-02-03 15:31:13 +0000
commit9bc9fb5a0d9a235b06356fc03d50dab0719d905a (patch)
tree89e5df7be5730cf4b8bed99885355d52ccdc258a /tests
parent1e34d6ee2218a74c1f7be8f903bcd0a0101755b7 (diff)
Fix avdmanageroutputparser test
- There is no PLUGIN_DEPENDS for tests, and it wouldn't work anyhow because of duplicated symbols. It was interpreted as a dependency and the test disabled because no such target exists. - Move the platformNameToApiLevel(...) function to avdmanageroutputparser.h to break the dependency to a lot of Android support code. Amends 78da7e2922274c429bb677abf63157b8ae679d03 Change-Id: I6933684a76e5291d415c72388caa3df2bee7cbfb Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/android/CMakeLists.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/android/CMakeLists.txt b/tests/auto/android/CMakeLists.txt
index bf132fe599..8f328fe98e 100644
--- a/tests/auto/android/CMakeLists.txt
+++ b/tests/auto/android/CMakeLists.txt
@@ -1,6 +1,5 @@
add_qtc_test(tst_avdmanageroutputparser
DEPENDS Utils
- PLUGIN_DEPENDS Android
INCLUDES
"${PROJECT_SOURCE_DIR}/src/plugins"
"${PROJECT_SOURCE_DIR}/src/plugins/android"
@@ -10,8 +9,6 @@ add_qtc_test(tst_avdmanageroutputparser
"${PROJECT_SOURCE_DIR}/src/plugins/android/avdmanageroutputparser.h"
"${PROJECT_SOURCE_DIR}/src/plugins/android/androiddeviceinfo.cpp"
"${PROJECT_SOURCE_DIR}/src/plugins/android/androiddeviceinfo.h"
- "${PROJECT_SOURCE_DIR}/src/plugins/android/androidmanager.cpp"
- "${PROJECT_SOURCE_DIR}/src/plugins/android/androidmanager.h"
)
qtc_add_resources(tst_avdmanageroutputparser tst_avdmanageroutputparser_rcc