1 files changed, 34 insertions, 6 deletions
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
index 1193a9d731..16dd1cf9cf 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Generated from tst.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qpluginloader Test:
@@ -14,30 +15,57 @@ qt_internal_add_test(tst_qpluginloader
         ../fakeplugin.cpp
         ../theplugin/plugininterface.h
         ../tst_qpluginloader.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         staticplugin
     TESTDATA ${test_data}
 )
 
+add_dependencies(tst_qpluginloader tst_qpluginloaderlib staticplugin theplugin)
+if (UNIX)
+    if(NOT APPLE)
+        add_dependencies(tst_qpluginloader theoldplugin)
+    endif()
+    if (NOT ANDROID AND NOT APPLE)
+        add_dependencies(tst_qpluginloader almostplugin)
+    endif()
+endif()
+
+if(ANDROID)
+    add_compile_definitions(ANDROID_ARCH="${CMAKE_ANDROID_ARCH_ABI}")
+    set(plugins
+        theplugin
+        theoldplugin
+        tst_qpluginloaderlib
+    )
+    set(extra_libs)
+    foreach(plugin IN LISTS plugins)
+        list(APPEND extra_libs
+            "${CMAKE_CURRENT_BINARY_DIR}/../bin/lib${plugin}_${CMAKE_ANDROID_ARCH_ABI}.so")
+    endforeach()
+    set_target_properties(tst_qpluginloader PROPERTIES
+        QT_ANDROID_EXTRA_LIBS "${extra_libs}"
+    )
+endif()
+
 ## Scopes:
 #####################################################################
 
 qt_internal_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
 )
 
 qt_internal_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
-    PUBLIC_LIBRARIES
+    LIBRARIES
         # Remove: L../staticplugin/debug
 )
 
 qt_internal_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
-    PUBLIC_LIBRARIES
+    LIBRARIES
         # Remove: L../staticplugin/release
 )
 
 qt_internal_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
-    PUBLIC_LIBRARIES
+    LIBRARIES
         # Remove: L../staticplugin
 )