From 04f11f9935453a3db6bc5e5064a187fa25e85d90 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 8 Jan 2021 17:04:04 +0100 Subject: Remove .prev_CMakeLists.txt files Those serve no purpose anymore, now that the .pro files are gone. Task-number: QTBUG-88742 Change-Id: I39943327b8c9871785b58e9973e4e7602371793e Reviewed-by: Cristian Adam Reviewed-by: Edward Welbourne Reviewed-by: Kai Koehne --- tests/auto/other/.prev_CMakeLists.txt | 50 ---------------------- tests/auto/other/android/.prev_CMakeLists.txt | 19 -------- tests/auto/other/macgui/.prev_CMakeLists.txt | 32 -------------- tests/auto/other/macplist/.prev_CMakeLists.txt | 7 --- tests/auto/other/macplist/app/.prev_CMakeLists.txt | 14 ------ .../other/networkselftest/.prev_CMakeLists.txt | 16 ------- .../auto/other/qaccessibility/.prev_CMakeLists.txt | 40 ----------------- .../other/qaccessibilitylinux/.prev_CMakeLists.txt | 18 -------- 8 files changed, 196 deletions(-) delete mode 100644 tests/auto/other/.prev_CMakeLists.txt delete mode 100644 tests/auto/other/android/.prev_CMakeLists.txt delete mode 100644 tests/auto/other/macgui/.prev_CMakeLists.txt delete mode 100644 tests/auto/other/macplist/.prev_CMakeLists.txt delete mode 100644 tests/auto/other/macplist/app/.prev_CMakeLists.txt delete mode 100644 tests/auto/other/networkselftest/.prev_CMakeLists.txt delete mode 100644 tests/auto/other/qaccessibility/.prev_CMakeLists.txt delete mode 100644 tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt (limited to 'tests/auto/other') diff --git a/tests/auto/other/.prev_CMakeLists.txt b/tests/auto/other/.prev_CMakeLists.txt deleted file mode 100644 index 3ba56f16fb..0000000000 --- a/tests/auto/other/.prev_CMakeLists.txt +++ /dev/null @@ -1,50 +0,0 @@ -# Generated from other.pro. - -if(TARGET Qt::Widgets) - add_subdirectory(gestures) - add_subdirectory(languagechange) - add_subdirectory(qfocusevent) - add_subdirectory(qsharedpointer_and_qwidget) - add_subdirectory(windowsmobile) -endif() -if(TARGET Qt::Network AND TARGET Qt::Widgets) - add_subdirectory(lancelot) - add_subdirectory(qnetworkaccessmanager_and_qprogressdialog) -endif() -if(MACOS AND TARGET Qt::Gui AND TARGET Qt::Widgets) - add_subdirectory(macgui) - add_subdirectory(macplist) - add_subdirectory(qaccessibilitymac) -endif() -if(TARGET Qt::Network) - add_subdirectory(networkselftest) -endif() -if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets AND NOT ANDROID) - add_subdirectory(qaccessibility) -endif() -if(TARGET Qt::Gui) - add_subdirectory(qcomplextext) -endif() -add_subdirectory(qobjectrace) -add_subdirectory(toolsupport) -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) -endif() -if(NOT CMAKE_CROSSCOMPILING) - add_subdirectory(atwrapper) -endif() -if(MACOS AND TARGET Qt::Gui) - add_subdirectory(macnativeevents) -endif() -if(embedded) - add_subdirectory(qdirectpainter) -endif() -if(ANDROID) - add_subdirectory(android) -endif() -if(QT_FEATURE_xkbcommon AND TARGET Qt::Gui) - add_subdirectory(xkbkeyboard) -endif() diff --git a/tests/auto/other/android/.prev_CMakeLists.txt b/tests/auto/other/android/.prev_CMakeLists.txt deleted file mode 100644 index d58103679b..0000000000 --- a/tests/auto/other/android/.prev_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Generated from android.pro. - -##################################################################### -## tst_android Test: -##################################################################### - -qt_internal_add_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:: -# DISTFILES = "testdata/assets/test.txt" diff --git a/tests/auto/other/macgui/.prev_CMakeLists.txt b/tests/auto/other/macgui/.prev_CMakeLists.txt deleted file mode 100644 index 10facb3050..0000000000 --- a/tests/auto/other/macgui/.prev_CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Generated from macgui.pro. - -if(NOT APPLE) - return() -endif() -if(NOT widgets) - return() -endif() - -##################################################################### -## tst_macgui Test: -##################################################################### - -qt_internal_add_test(tst_macgui - SOURCES - guitest.cpp guitest.h - tst_macgui.cpp - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::WidgetsPrivate -) - -#### Keys ignored in scope 1:.:.:macgui.pro:: -# _REQUIREMENTS = "mac" "widgets" - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_macgui CONDITION MACOS - PUBLIC_LIBRARIES - ${FWApplicationServices} -) diff --git a/tests/auto/other/macplist/.prev_CMakeLists.txt b/tests/auto/other/macplist/.prev_CMakeLists.txt deleted file mode 100644 index 2a9bfccdcf..0000000000 --- a/tests/auto/other/macplist/.prev_CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Generated from macplist.pro. - -if(NOT widgets) - return() -endif() -add_subdirectory(app) -add_subdirectory(test) diff --git a/tests/auto/other/macplist/app/.prev_CMakeLists.txt b/tests/auto/other/macplist/app/.prev_CMakeLists.txt deleted file mode 100644 index c3c49ffd84..0000000000 --- a/tests/auto/other/macplist/app/.prev_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Generated from app.pro. - -##################################################################### -## app Binary: -##################################################################### - -qt_internal_add_executable(app - GUI - SOURCES - main.cpp - PUBLIC_LIBRARIES - Qt::Gui - Qt::Widgets -) diff --git a/tests/auto/other/networkselftest/.prev_CMakeLists.txt b/tests/auto/other/networkselftest/.prev_CMakeLists.txt deleted file mode 100644 index c1e1b6518b..0000000000 --- a/tests/auto/other/networkselftest/.prev_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Generated from networkselftest.pro. - -##################################################################### -## tst_networkselftest Test: -##################################################################### - -qt_internal_add_test(tst_networkselftest - SOURCES - tst_networkselftest.cpp - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Network -) - -#### Keys ignored in scope 1:.:.:networkselftest.pro:: -# QT_TEST_SERVER_LIST = "cyrus" "vsftpd" "apache2" "ftp-proxy" "danted" "squid" "echo" diff --git a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt deleted file mode 100644 index bbdb16ac89..0000000000 --- a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Generated from qaccessibility.pro. - -if(NOT QT_FEATURE_accessibility) - return() -endif() - -##################################################################### -## tst_qaccessibility Test: -##################################################################### - -qt_internal_add_test(tst_qaccessibility - SOURCES - accessiblewidgets.h - tst_qaccessibility.cpp - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::TestPrivate - Qt::WidgetsPrivate -) - -#### Keys ignored in scope 1:.:.:qaccessibility.pro:: -# _REQUIREMENTS = "qtConfig(accessibility)" - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity - PUBLIC_LIBRARIES - m -) - -qt_internal_extend_target(tst_qaccessibility CONDITION WIN32 - PUBLIC_LIBRARIES - ole32 - oleacc - oleaut32 - uuid -) diff --git a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt deleted file mode 100644 index 5f7dc751a4..0000000000 --- a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Generated from qaccessibilitylinux.pro. - -##################################################################### -## tst_qaccessibilitylinux Test: -##################################################################### - -qt_internal_add_test(tst_qaccessibilitylinux - SOURCES - tst_qaccessibilitylinux.cpp - DBUS_INTERFACE_SOURCES - ../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml - PUBLIC_LIBRARIES - Qt::DBus - Qt::Gui - Qt::GuiPrivate - Qt::LinuxAccessibilitySupportPrivate - Qt::Widgets -) -- cgit v1.2.3