From c6c41cc1a939748e1394731cb0e5da1e217bd7f4 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Wed, 17 Aug 2022 16:13:27 +0200 Subject: [PATCH] QtBase tests: remove QT_DISABLE_DEPRECATED_UP_TO defines The value will be propagated from Qt build. Task-number: QTBUG-104858 Change-Id: Iae2c32c3037438f41b92f9ee28004f30eb4e3210 Reviewed-by: Edward Welbourne Reviewed-by: Alexandru Croitor --- tests/auto/corelib/global/qlogging/CMakeLists.txt | 2 -- tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt | 2 -- tests/auto/corelib/io/qdir/testdir/dir/qdir.pro | 3 --- .../auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt | 2 -- .../auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt | 2 -- .../itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt | 2 -- tests/auto/corelib/text/qlatin1stringview/CMakeLists.txt | 1 - tests/auto/gui/util/qdesktopservices/CMakeLists.txt | 2 -- tests/auto/other/macnativeevents/CMakeLists.txt | 2 -- tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt | 2 -- tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt | 2 -- tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro | 1 - tests/manual/network_stresstest/CMakeLists.txt | 2 -- tests/manual/network_stresstest/network_stresstest.pro | 1 - tests/manual/windowchildgeometry/CMakeLists.txt | 2 -- tests/manual/windowchildgeometry/windowchildgeometry.pro | 2 -- 16 files changed, 30 deletions(-) diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt index 9b0e54014a7..00825c5526e 100644 --- a/tests/auto/corelib/global/qlogging/CMakeLists.txt +++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt @@ -21,12 +21,10 @@ set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default) qt_internal_add_test(tst_qlogging SOURCES tst_qlogging.cpp DEFINES QT_MESSAGELOGCONTEXT - QT_DISABLE_DEPRECATED_UP_TO=0 HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper" ) qt_internal_add_test(tst_qmessagelogger SOURCES tst_qmessagelogger.cpp DEFINES QT_MESSAGELOGCONTEXT - QT_DISABLE_DEPRECATED_UP_TO=0 ) diff --git a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt index 5c4269fa643..a04a0e8a890 100644 --- a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt +++ b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt @@ -9,8 +9,6 @@ qt_internal_add_executable(qdir GUI - DEFINES - QT_DISABLE_DEPRECATED_UP_TO=0 LIBRARIES Qt::Gui ) diff --git a/tests/auto/corelib/io/qdir/testdir/dir/qdir.pro b/tests/auto/corelib/io/qdir/testdir/dir/qdir.pro index 0a31ac9675e..e69de29bb2d 100644 --- a/tests/auto/corelib/io/qdir/testdir/dir/qdir.pro +++ b/tests/auto/corelib/io/qdir/testdir/dir/qdir.pro @@ -1,3 +0,0 @@ - - -DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0 diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt index 07e6e75eb57..5d4e7ab6e42 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt @@ -11,8 +11,6 @@ qt_internal_add_test(tst_qabstractitemmodel SOURCES ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h tst_qabstractitemmodel.cpp - DEFINES - QT_DISABLE_DEPRECATED_UP_TO=0 INCLUDE_DIRECTORIES ../../../other/qabstractitemmodelutils LIBRARIES diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt index 4cdc86a7c4e..61fda88887e 100644 --- a/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt @@ -10,8 +10,6 @@ qt_internal_add_test(tst_qabstractproxymodel SOURCES tst_qabstractproxymodel.cpp - DEFINES - QT_DISABLE_DEPRECATED_UP_TO=0 LIBRARIES Qt::Gui Qt::TestPrivate diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt index 7937c629822..9edc2d6ab5a 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt @@ -10,8 +10,6 @@ qt_internal_add_test(tst_qsfpm_recursive SOURCES tst_qsortfilterproxymodel_recursive.cpp - DEFINES - QT_DISABLE_DEPRECATED_UP_TO=0 LIBRARIES Qt::Gui ) diff --git a/tests/auto/corelib/text/qlatin1stringview/CMakeLists.txt b/tests/auto/corelib/text/qlatin1stringview/CMakeLists.txt index eef2866a59a..f36c337a3ac 100644 --- a/tests/auto/corelib/text/qlatin1stringview/CMakeLists.txt +++ b/tests/auto/corelib/text/qlatin1stringview/CMakeLists.txt @@ -9,7 +9,6 @@ qt_internal_add_test(tst_qlatin1stringview SOURCES tst_qlatin1stringview.cpp DEFINES - QT_DISABLE_DEPRECATED_UP_TO=0 QT_NO_CAST_TO_ASCII ) diff --git a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt index 520b54a15c7..02671458a59 100644 --- a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt +++ b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt @@ -10,8 +10,6 @@ qt_internal_add_test(tst_qdesktopservices SOURCES tst_qdesktopservices.cpp - DEFINES - # QT_DISABLE_DEPRECATED_UP_TO=0 # special case LIBRARIES Qt::Gui ) diff --git a/tests/auto/other/macnativeevents/CMakeLists.txt b/tests/auto/other/macnativeevents/CMakeLists.txt index a1d81f06d34..75ca45313f0 100644 --- a/tests/auto/other/macnativeevents/CMakeLists.txt +++ b/tests/auto/other/macnativeevents/CMakeLists.txt @@ -18,8 +18,6 @@ qt_internal_add_test(tst_macnativeevents qnativeevents.cpp qnativeevents.h qnativeevents_mac.cpp tst_macnativeevents.cpp - DEFINES - QT_DISABLE_DEPRECATED_UP_TO=0 LIBRARIES ${FWAppKit} Qt::Gui diff --git a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt index 16e57bb0217..12be11c72ad 100644 --- a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt @@ -10,8 +10,6 @@ qt_internal_add_test(tst_qheaderview SOURCES tst_qheaderview.cpp - DEFINES - QT_DISABLE_DEPRECATED_UP_TO=0 LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt index 67bd6b813ce..5cb88dbb3bf 100644 --- a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt +++ b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt @@ -12,8 +12,6 @@ qt_internal_add_manual_test(qt_on_cocoa SOURCES main.mm rasterwindow.cpp rasterwindow.h - DEFINES - QT_DISABLE_DEPRECATED_UP_TO=0 LIBRARIES ${FWAppKit} Qt::Gui diff --git a/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro b/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro index 83c8140a312..8913558915c 100644 --- a/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro +++ b/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro @@ -8,4 +8,3 @@ LIBS += -framework AppKit QT += gui widgets quick QT += quick -DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0 diff --git a/tests/manual/network_stresstest/CMakeLists.txt b/tests/manual/network_stresstest/CMakeLists.txt index 404ed85d530..b3cb61348ad 100644 --- a/tests/manual/network_stresstest/CMakeLists.txt +++ b/tests/manual/network_stresstest/CMakeLists.txt @@ -11,8 +11,6 @@ qt_internal_add_manual_test(tst_network_stresstest SOURCES minihttpserver.cpp minihttpserver.h tst_network_stresstest.cpp - DEFINES - QT_DISABLE_DEPRECATED_UP_TO=0 LIBRARIES Qt::CorePrivate Qt::NetworkPrivate diff --git a/tests/manual/network_stresstest/network_stresstest.pro b/tests/manual/network_stresstest/network_stresstest.pro index 1b7b9a4dffe..2644c2b18f2 100644 --- a/tests/manual/network_stresstest/network_stresstest.pro +++ b/tests/manual/network_stresstest/network_stresstest.pro @@ -11,4 +11,3 @@ HEADERS += \ RESOURCES += wwwfiles.qrc QMAKE_RESOURCE_FLAGS += -no-compress LIBS += $$QMAKE_LIBS_NETWORK -DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0 diff --git a/tests/manual/windowchildgeometry/CMakeLists.txt b/tests/manual/windowchildgeometry/CMakeLists.txt index 377c473fedf..c9b1ddcbbbb 100644 --- a/tests/manual/windowchildgeometry/CMakeLists.txt +++ b/tests/manual/windowchildgeometry/CMakeLists.txt @@ -13,8 +13,6 @@ qt_internal_add_manual_test(windowchildgeometry ../windowflags/controls.cpp ../windowflags/controls.h controllerwidget.cpp controllerwidget.h main.cpp - DEFINES - QT_DISABLE_DEPRECATED_UP_TO=0 INCLUDE_DIRECTORIES ../windowflags LIBRARIES diff --git a/tests/manual/windowchildgeometry/windowchildgeometry.pro b/tests/manual/windowchildgeometry/windowchildgeometry.pro index 19207232ae5..b9a5f37362f 100644 --- a/tests/manual/windowchildgeometry/windowchildgeometry.pro +++ b/tests/manual/windowchildgeometry/windowchildgeometry.pro @@ -5,5 +5,3 @@ TEMPLATE = app INCLUDEPATH += ../windowflags SOURCES += $$PWD/main.cpp controllerwidget.cpp ../windowflags/controls.cpp HEADERS += controllerwidget.h ../windowflags/controls.h - -DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0