1 files changed, 12 insertions, 8 deletions
diff --git a/tests/auto/other/CMakeLists.txt b/tests/auto/other/CMakeLists.txt
index 8255406bb5..16f96cd5f4 100644
--- a/tests/auto/other/CMakeLists.txt
+++ b/tests/auto/other/CMakeLists.txt
@@ -1,14 +1,15 @@
-# Generated from other.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 if(NOT CMAKE_CROSSCOMPILING)
-    # add_subdirectory(atwrapper) <- does not exist # special case
+    # add_subdirectory(atwrapper) <- does not exist
 endif()
 if(TARGET Qt::Widgets)
     add_subdirectory(gestures)
     add_subdirectory(languagechange)
     add_subdirectory(qfocusevent)
     add_subdirectory(qsharedpointer_and_qwidget)
-    # add_subdirectory(windowsmobile) <- does not exist # special case
+    # add_subdirectory(windowsmobile) <- does not exist
 endif()
 if(TARGET Qt::Network AND TARGET Qt::Widgets)
     add_subdirectory(qnetworkaccessmanager_and_qprogressdialog)
@@ -21,8 +22,7 @@ endif()
 if(TARGET Qt::Network)
     add_subdirectory(networkselftest)
 endif()
-# QTBUG-87674 # special case
-if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets AND NOT ANDROID)
+if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets)
     add_subdirectory(qaccessibility)
 endif()
 if(TARGET Qt::Gui)
@@ -30,15 +30,15 @@ if(TARGET Qt::Gui)
 endif()
 add_subdirectory(qobjectrace)
 add_subdirectory(toolsupport)
-# QTBUG-87670 # special case
+# QTBUG-87670
 if(QT_FEATURE_process AND TARGET Qt::Gui AND NOT ANDROID)
     add_subdirectory(qprocess_and_guieventloop)
 endif()
 if(QT_FEATURE_accessibility_atspi_bridge AND TARGET Qt::Gui AND TARGET Qt::Widgets)
-    #add_subdirectory(qaccessibilitylinux) # special case # This test is broken
+    #add_subdirectory(qaccessibilitylinux) # TODO: This test is broken
 endif()
 if(MACOS AND TARGET Qt::Gui)
-    # add_subdirectory(macnativeevents) # special case it's disabled in qmake too
+    # add_subdirectory(macnativeevents) # TODO: it's disabled in qmake too
 endif()
 if(embedded)
     add_subdirectory(qdirectpainter)
@@ -46,3 +46,7 @@ endif()
 if(QT_FEATURE_xkbcommon AND TARGET Qt::Gui)
     add_subdirectory(xkbkeyboard)
 endif()
+
+if(ANDROID AND QT_BUILD_STANDALONE_TESTS)
+    add_subdirectory(android_deployment_settings)
+endif()