Convert tests/auto/other

Change-Id: I79ba4f6bbbbede8ddab278dd987d9ad98277a229
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot

tests/CMakeLists.txt

@@ -3,7 +3,10 @@ if(NOT TARGET Qt::Test)
     cmake_minimum_required(VERSION 3.14.0)
     project(QtBaseTests VERSION 6.0.0 LANGUAGES C CXX ASM)
     find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Test)
-    find_package(Qt6 COMPONENTS DBus Gui OpenGL Widgets Xml)
+    find_package(Qt6 COMPONENTS DBus Gui OpenGL Widgets Xml
+        AccessibilitySupport LinuxAccessibilitySupport
+        WindowsUIAutomationSupport
+    )
     qt_set_up_standalone_tests_build()
 
     # Find a few packages that are usually found in configure.cmake,

tests/auto/CMakeLists.txt

@@ -44,7 +44,7 @@ endif()
 if (TARGET Qt::Concurrent)
      add_subdirectory(concurrent)
 endif()
-# add_subdirectory(other)
+add_subdirectory(other)
 if (TARGET Qt::Widgets)
      add_subdirectory(widgets)
 endif()

tests/auto/other/CMakeLists.txt

@@ -0,0 +1,49 @@
+# Generated from other.pro.
+
+if(NOT cross_compile)
+    add_subdirectory(compiler)
+    # add_subdirectory(atwrapper) <- does not exist # special case
+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
+endif()
+if(TARGET Qt::Network AND TARGET Qt::Widgets AND NOT WINRT)
+    add_subdirectory(lancelot)
+    add_subdirectory(qnetworkaccessmanager_and_qprogressdialog)
+endif()
+if(APPLE_OSX AND TARGET Qt::Gui AND TARGET Qt::Widgets)
+    add_subdirectory(macgui)
+    add_subdirectory(macplist)
+    add_subdirectory(qaccessibilitymac)
+endif()
+if(TARGET Qt::Gui)
+    add_subdirectory(qcomplextext)
+endif()
+if(QT_FEATURE_process AND TARGET Qt::Gui)
+    add_subdirectory(qprocess_and_guieventloop)
+endif()
+if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets AND NOT WINRT)
+    add_subdirectory(qaccessibility)
+endif()
+if(QT_FEATURE_accessibility_atspi_bridge AND TARGET Qt::Gui AND TARGET Qt::Widgets)
+    add_subdirectory(qaccessibilitylinux)
+endif()
+if(TARGET Qt::Network AND NOT WINRT)
+    add_subdirectory(networkselftest)
+endif()
+if(APPLE_OSX AND TARGET Qt::Gui)
+    add_subdirectory(macnativeevents)
+endif()
+if(embedded)
+    add_subdirectory(qdirectpainter)
+endif()
+if(ANDROID)
+    add_subdirectory(android)
+endif()
+if(QT_FEATURE_xkbcommon)
+    add_subdirectory(xkbkeyboard)
+endif()

tests/auto/other/android/CMakeLists.txt

@@ -0,0 +1,19 @@
+# Generated from android.pro.
+
+#####################################################################
+## tst_android Test:
+#####################################################################
+
+add_qt_test(tst_android
+    SOURCES
+        tst_android.cpp
+)
+
+if(ANDROID)
+    set_property(TARGET tst_android APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
+        ${CMAKE_CURRENT_SOURCE_DIR}/testdata
+    )
+endif()
+
+#### Keys ignored in scope 1:.:.:android.pro:<TRUE>:
+# DISTFILES = "testdata/assets/test.txt"

tests/auto/other/compiler/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Generated from compiler.pro.
+
+#####################################################################
+## tst_compiler Test:
+#####################################################################
+
+add_qt_test(tst_compiler
+    EXCEPTIONS # special case
+    SOURCES
+        baseclass.cpp baseclass.h
+        derivedclass.cpp derivedclass.h
+        othersource.cpp
+        tst_compiler.cpp
+)
+
+## Scopes:
+#####################################################################

tests/auto/other/gestures/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Generated from gestures.pro.
+
+#####################################################################
+## tst_gestures Test:
+#####################################################################
+
+add_qt_test(tst_gestures
+    SOURCES
+        tst_gestures.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)

tests/auto/other/lancelot/CMakeLists.txt

@@ -0,0 +1,80 @@
+# Generated from lancelot.pro.
+
+#####################################################################
+## tst_lancelot Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    scripts/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_lancelot
+    SOURCES
+        ../../../baselineserver/shared/baselineprotocol.cpp ../../../baselineserver/shared/baselineprotocol.h
+        ../../../baselineserver/shared/lookup3.cpp
+        ../../../baselineserver/shared/qbaselinetest.cpp ../../../baselineserver/shared/qbaselinetest.h
+        paintcommands.cpp paintcommands.h
+        tst_lancelot.cpp
+    DEFINES
+        QMAKESPEC=\\\"\\\"
+    INCLUDE_DIRECTORIES
+        ../../../baselineserver/shared
+    LIBRARIES
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Network
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(images_resource_files
+    "images/alpha.png"
+    "images/alpha2x2.png"
+    "images/bitmap.png"
+    "images/border.png"
+    "images/borderimage.png"
+    "images/dome_argb32.png"
+    "images/dome_indexed.png"
+    "images/dome_indexed_mask.png"
+    "images/dome_mono.png"
+    "images/dome_mono_128.png"
+    "images/dome_mono_palette.png"
+    "images/dome_rgb32.png"
+    "images/dot.png"
+    "images/face.png"
+    "images/gam030.png"
+    "images/gam045.png"
+    "images/gam056.png"
+    "images/gam100.png"
+    "images/gam200.png"
+    "images/image.png"
+    "images/mask.png"
+    "images/mask_100.png"
+    "images/masked.png"
+    "images/sign.png"
+    "images/solid.png"
+    "images/solid2x2.png"
+    "images/struct-image-01.jpg"
+    "images/struct-image-01.png"
+    "images/zebra.png"
+)
+
+add_qt_resource(tst_lancelot "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:WIN32:
+# MKSPEC = "$$replace(QMAKESPEC, \\\\, /)"
+
+#### Keys ignored in scope 4:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:else:
+# MKSPEC = "$$QMAKESPEC"

tests/auto/other/languagechange/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Generated from languagechange.pro.
+
+#####################################################################
+## tst_languagechange Test:
+#####################################################################
+
+add_qt_test(tst_languagechange
+    SOURCES
+        tst_languagechange.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:languagechange.pro:WIN32:
+# testcase.timeout = "1800"

tests/auto/other/macgui/CMakeLists.txt

@@ -0,0 +1,34 @@
+# Generated from macgui.pro.
+
+if(NOT APPLE)
+    return()
+endif()
+if(NOT TARGET Qt::Widgets) # special case
+    return()
+endif()
+
+#####################################################################
+## tst_macgui Test:
+#####################################################################
+
+add_qt_test(tst_macgui
+    SOURCES
+        guitest.cpp guitest.h
+        tst_macgui.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:macgui.pro:<TRUE>:
+# _REQUIREMENTS = "mac" "widgets"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_macgui CONDITION APPLE_OSX
+    PUBLIC_LIBRARIES
+        ${FWApplicationServices}
+)

tests/auto/other/macnativeevents/CMakeLists.txt

@@ -0,0 +1,27 @@
+# Generated from macnativeevents.pro.
+
+if(NOT APPLE)
+    return()
+endif()
+
+#####################################################################
+## tst_macnativeevents Test:
+#####################################################################
+
+add_qt_test(tst_macnativeevents
+    SOURCES
+        expectedeventlist.cpp expectedeventlist.h
+        nativeeventlist.cpp nativeeventlist.h
+        qnativeevents.cpp qnativeevents.h
+        qnativeevents_mac.cpp
+        tst_macnativeevents.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:macnativeevents.pro:<TRUE>:
+# _REQUIREMENTS = "mac"

tests/auto/other/macplist/CMakeLists.txt

@@ -0,0 +1,7 @@
+# Generated from macplist.pro.
+
+if(NOT TARGET Qt::Widgets) # special case
+    return()
+endif()
+add_subdirectory(app)
+add_subdirectory(test)

tests/auto/other/macplist/app/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Generated from app.pro.
+
+#####################################################################
+## app Binary:
+#####################################################################
+
+add_qt_executable(app
+    GUI
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)

tests/auto/other/macplist/test/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_macplist Test:
+#####################################################################
+
+add_qt_test(tst_macplist
+    SOURCES
+        ../tst_macplist.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################

tests/auto/other/networkselftest/CMakeLists.txt

@@ -0,0 +1,14 @@
+# Generated from networkselftest.pro.
+
+#####################################################################
+## tst_networkselftest Test:
+#####################################################################
+
+add_qt_test(tst_networkselftest
+    SOURCES
+        tst_networkselftest.cpp
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Network
+)

tests/auto/other/qaccessibility/CMakeLists.txt

@@ -0,0 +1,55 @@
+# Generated from qaccessibility.pro.
+
+if(NOT QT_FEATURE_accessibility)
+    return()
+endif()
+
+# special case begin
+if (WIN32 AND NOT TARGET Qt::WindowsUIAutomationSupport)
+    return()
+endif()
+# special case end
+
+#####################################################################
+## tst_qaccessibility Test:
+#####################################################################
+
+add_qt_test(tst_qaccessibility
+    SOURCES
+        accessiblewidgets.h
+        tst_qaccessibility.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qaccessibility.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(accessibility)"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity
+    PUBLIC_LIBRARIES
+        m
+)
+
+extend_target(tst_qaccessibility CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ole32
+        oleacc
+        oleaut32
+        uuid
+)
+
+extend_target(tst_qaccessibility CONDITION WIN32 AND NOT WINRT
+    LIBRARIES
+        Qt::WindowsUIAutomationSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::WindowsUIAutomationSupport
+)

tests/auto/other/qaccessibilitylinux/CMakeLists.txt

@@ -0,0 +1,34 @@
+# Generated from qaccessibilitylinux.pro.
+# special case begin
+if (NOT QT_FEATURE_accessibility OR NOT TARGET Qt::LinuxAccessibilitySupportPrivate)
+    return()
+endif()
+# special case end
+
+#####################################################################
+## tst_qaccessibilitylinux Test:
+#####################################################################
+
+add_qt_test(tst_qaccessibilitylinux
+    SOURCES
+        tst_qaccessibilitylinux.cpp
+    DBUS_INTERFACE_SOURCES
+        ../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml
+    LIBRARIES
+        Qt::AccessibilitySupportPrivate
+        Qt::GuiPrivate
+        Qt::LinuxAccessibilitySupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::AccessibilitySupport
+        Qt::DBus
+        Qt::Gui
+        Qt::LinuxAccessibilitySupport
+        Qt::Widgets
+)
+
+# special case begin
+# require for struct_marshallers_p.h which is included dbus_interface.h
+target_include_directories(tst_qaccessibilitylinux PRIVATE
+    ../../../../src/platformsupport/linuxaccessibility
+)
+# special case end

tests/auto/other/qaccessibilitymac/CMakeLists.txt

@@ -0,0 +1,33 @@
+# Generated from qaccessibilitymac.pro.
+
+if(NOT APPLE)
+    return()
+endif()
+
+#####################################################################
+## tst_qaccessibilitymac Test:
+#####################################################################
+
+add_qt_test(tst_qaccessibilitymac
+    SOURCES
+        tst_qaccessibilitymac.cpp
+        tst_qaccessibilitymac_helpers.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qaccessibilitymac.pro:<TRUE>:
+# _REQUIREMENTS = "mac"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qaccessibilitymac CONDITION APPLE
+    SOURCES
+        tst_qaccessibilitymac_helpers.mm
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        ${FWApplicationServices}
+        ${FWSecurity}
+)

tests/auto/other/qcomplextext/CMakeLists.txt

@@ -0,0 +1,42 @@
+# Generated from qcomplextext.pro.
+
+#####################################################################
+## tst_qcomplextext Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "data")
+
+add_qt_test(tst_qcomplextext
+    SOURCES
+        tst_qcomplextext.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+if(ANDROID)
+    # Resources:
+    set(android_testdata_resource_files
+        "data/BidiCharacterTest.txt"
+        "data/BidiTest.txt"
+    )
+
+    add_qt_resource(tst_qcomplextext "android_testdata"
+        PREFIX
+            "/android_testdata"
+        FILES
+            ${android_testdata_resource_files}
+    )
+endif()
+
+extend_target(tst_qcomplextext CONDITION builtin_testdata
+    DEFINES
+        BUILTIN_TESTDATA
+)

tests/auto/other/qfocusevent/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Generated from qfocusevent.pro.
+
+#####################################################################
+## tst_qfocusevent Test:
+#####################################################################
+
+add_qt_test(tst_qfocusevent
+    SOURCES
+        tst_qfocusevent.cpp
+    LIBRARIES
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)

tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt

@@ -0,0 +1,14 @@
+# Generated from qnetworkaccessmanager_and_qprogressdialog.pro.
+
+#####################################################################
+## tst_qnetworkaccessmanager_and_qprogressdialog Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkaccessmanager_and_qprogressdialog
+    SOURCES
+        tst_qnetworkaccessmanager_and_qprogressdialog.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Network
+        Qt::Widgets
+)

tests/auto/other/qobjectrace/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Generated from qobjectrace.pro.
+
+#####################################################################
+## qobjectrace Test:
+#####################################################################
+
+add_qt_test(qobjectrace
+    SOURCES
+        ../../../shared/emulationdetector.h
+        tst_qobjectrace.cpp
+    INCLUDE_DIRECTORIES
+        ../../../shared
+)

tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Generated from qprocess_and_guieventloop.pro.
+
+#####################################################################
+## tst_qprocess_and_guieventloop Test:
+#####################################################################
+
+add_qt_test(tst_qprocess_and_guieventloop
+    SOURCES
+        tst_qprocess_and_guieventloop.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+add_subdirectory(write-read-write)

tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Generated from write-read-write.pro.
+
+#####################################################################
+## write-read-write Binary:
+#####################################################################
+
+add_qt_executable(write-read-write
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)

tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Generated from qsharedpointer_and_qwidget.pro.
+
+#####################################################################
+## tst_qsharedpointer_and_qwidget Test:
+#####################################################################
+
+add_qt_test(tst_qsharedpointer_and_qwidget
+    SOURCES
+        tst_qsharedpointer_and_qwidget.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)

tests/auto/other/qtokenautomaton/CMakeLists.txt

@@ -1,15 +1,16 @@
-add_qt_test(tst_qtokenautomaton SOURCES
+# Generated from qtokenautomaton.pro.
+
+#####################################################################
+## tst_qtokenautomaton Test:
+#####################################################################
+
+add_qt_test(tst_qtokenautomaton
+    SOURCES
+        tokenizers/basic/basic.cpp tokenizers/basic/basic.h
+        tokenizers/basicNamespace/basicNamespace.cpp tokenizers/basicNamespace/basicNamespace.h
+        tokenizers/boilerplate/boilerplate.cpp tokenizers/boilerplate/boilerplate.h
+        tokenizers/noNamespace/noNamespace.cpp tokenizers/noNamespace/noNamespace.h
+        tokenizers/noToString/noToString.cpp tokenizers/noToString/noToString.h
+        tokenizers/withNamespace/withNamespace.cpp tokenizers/withNamespace/withNamespace.h
         tst_qtokenautomaton.cpp
-        tokenizers/basic/basic.cpp
-        tokenizers/basicNamespace/basicNamespace.cpp
-        tokenizers/boilerplate/boilerplate.cpp
-        tokenizers/noNamespace/noNamespace.cpp
-        tokenizers/noToString/noToString.cpp
-        tokenizers/withNamespace/withNamespace.cpp
-        tokenizers/basic/basic.h
-        tokenizers/basicNamespace/basicNamespace.h
-        tokenizers/boilerplate/boilerplate.h
-        tokenizers/noNamespace/noNamespace.h
-        tokenizers/noToString/noToString.h
-        tokenizers/withNamespace/withNamespace.h
 )

tests/auto/other/toolsupport/CMakeLists.txt

@@ -1 +1,12 @@
-add_qt_test(tst_toolsupport SOURCES tst_toolsupport.cpp LIBRARIES Qt::CorePrivate)
+# Generated from toolsupport.pro.
+
+#####################################################################
+## tst_toolsupport Test:
+#####################################################################
+
+add_qt_test(tst_toolsupport
+    SOURCES
+        tst_toolsupport.cpp
+    LIBRARIES
+        Qt::CorePrivate
+)

tests/auto/other/xkbkeyboard/CMakeLists.txt

@@ -1,2 +1,15 @@
-add_qt_test(alive SOURCES tst_alive.cpp
+# Generated from xkbkeyboard.pro.
-                  LIBRARIES Widgets)
+
+#####################################################################
+## tst_xkbkeyboard Test:
+#####################################################################
+
+add_qt_test(tst_xkbkeyboard
+    SOURCES
+        tst_xkbkeyboard.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)