1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtBase tests: remove QT_DISABLE_DEPRECATED_UP_TO defines

Browse Source 
The value will be propagated from Qt build.

Task-number: QTBUG-104858
Change-Id: Iae2c32c3037438f41b92f9ee28004f30eb4e3210
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Ivan Solovev 2022-08-17 16:13:27 +02:00
parent 373c7fe17e
commit c6c41cc1a9
16 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/global/qlogging/CMakeLists.txt
View File

@ -21,12 +21,10 @@ set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
qt_internal_add_test(tst_qlogging SOURCES tst_qlogging.cpp qt_internal_add_test(tst_qlogging SOURCES tst_qlogging.cpp
DEFINES DEFINES
QT_MESSAGELOGCONTEXT QT_MESSAGELOGCONTEXT
QT_DISABLE_DEPRECATED_UP_TO=0
HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper" HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper"
) )
qt_internal_add_test(tst_qmessagelogger SOURCES tst_qmessagelogger.cpp qt_internal_add_test(tst_qmessagelogger SOURCES tst_qmessagelogger.cpp
DEFINES DEFINES
QT_MESSAGELOGCONTEXT QT_MESSAGELOGCONTEXT
QT_DISABLE_DEPRECATED_UP_TO=0
) )

2
tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
View File

@ -9,8 +9,6 @@
qt_internal_add_executable(qdir qt_internal_add_executable(qdir
GUI GUI
DEFINES
QT_DISABLE_DEPRECATED_UP_TO=0
LIBRARIES LIBRARIES
Qt::Gui Qt::Gui
) )

3
tests/auto/corelib/io/qdir/testdir/dir/qdir.pro
View File

@ -1,3 +0,0 @@
DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0

2
tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt
View File

@ -11,8 +11,6 @@ qt_internal_add_test(tst_qabstractitemmodel
SOURCES SOURCES
../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h
tst_qabstractitemmodel.cpp tst_qabstractitemmodel.cpp
DEFINES
QT_DISABLE_DEPRECATED_UP_TO=0
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../other/qabstractitemmodelutils ../../../other/qabstractitemmodelutils
LIBRARIES LIBRARIES

2
tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt
View File

@ -10,8 +10,6 @@
qt_internal_add_test(tst_qabstractproxymodel qt_internal_add_test(tst_qabstractproxymodel
SOURCES SOURCES
tst_qabstractproxymodel.cpp tst_qabstractproxymodel.cpp
DEFINES
QT_DISABLE_DEPRECATED_UP_TO=0
LIBRARIES LIBRARIES
Qt::Gui Qt::Gui
Qt::TestPrivate Qt::TestPrivate

2
tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt
View File

@ -10,8 +10,6 @@
qt_internal_add_test(tst_qsfpm_recursive qt_internal_add_test(tst_qsfpm_recursive
SOURCES SOURCES
tst_qsortfilterproxymodel_recursive.cpp tst_qsortfilterproxymodel_recursive.cpp
DEFINES
QT_DISABLE_DEPRECATED_UP_TO=0
LIBRARIES LIBRARIES
Qt::Gui Qt::Gui
) )

1
tests/auto/corelib/text/qlatin1stringview/CMakeLists.txt
View File

@ -9,7 +9,6 @@ qt_internal_add_test(tst_qlatin1stringview
SOURCES SOURCES
tst_qlatin1stringview.cpp tst_qlatin1stringview.cpp
DEFINES DEFINES
QT_DISABLE_DEPRECATED_UP_TO=0
QT_NO_CAST_TO_ASCII QT_NO_CAST_TO_ASCII
) )

2
tests/auto/gui/util/qdesktopservices/CMakeLists.txt
View File

@ -10,8 +10,6 @@
qt_internal_add_test(tst_qdesktopservices qt_internal_add_test(tst_qdesktopservices
SOURCES SOURCES
tst_qdesktopservices.cpp tst_qdesktopservices.cpp
DEFINES
# QT_DISABLE_DEPRECATED_UP_TO=0 # special case
LIBRARIES LIBRARIES
Qt::Gui Qt::Gui
) )

2
tests/auto/other/macnativeevents/CMakeLists.txt
View File

@ -18,8 +18,6 @@ qt_internal_add_test(tst_macnativeevents
qnativeevents.cpp qnativeevents.h qnativeevents.cpp qnativeevents.h
qnativeevents_mac.cpp qnativeevents_mac.cpp
tst_macnativeevents.cpp tst_macnativeevents.cpp
DEFINES
QT_DISABLE_DEPRECATED_UP_TO=0
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
Qt::Gui Qt::Gui

2
tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
View File

@ -10,8 +10,6 @@
qt_internal_add_test(tst_qheaderview qt_internal_add_test(tst_qheaderview
SOURCES SOURCES
tst_qheaderview.cpp tst_qheaderview.cpp
DEFINES
QT_DISABLE_DEPRECATED_UP_TO=0
LIBRARIES LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

2
tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt
View File

@ -12,8 +12,6 @@ qt_internal_add_manual_test(qt_on_cocoa
SOURCES SOURCES
main.mm main.mm
rasterwindow.cpp rasterwindow.h rasterwindow.cpp rasterwindow.h
DEFINES
QT_DISABLE_DEPRECATED_UP_TO=0
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
Qt::Gui Qt::Gui

1
tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro
View File

@ -8,4 +8,3 @@ LIBS += -framework AppKit
QT += gui widgets quick QT += gui widgets quick
QT += quick QT += quick
DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0

2
tests/manual/network_stresstest/CMakeLists.txt
View File

@ -11,8 +11,6 @@ qt_internal_add_manual_test(tst_network_stresstest
SOURCES SOURCES
minihttpserver.cpp minihttpserver.h minihttpserver.cpp minihttpserver.h
tst_network_stresstest.cpp tst_network_stresstest.cpp
DEFINES
QT_DISABLE_DEPRECATED_UP_TO=0
LIBRARIES LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::NetworkPrivate Qt::NetworkPrivate

1
tests/manual/network_stresstest/network_stresstest.pro
View File

@ -11,4 +11,3 @@ HEADERS += \
RESOURCES += wwwfiles.qrc RESOURCES += wwwfiles.qrc
QMAKE_RESOURCE_FLAGS += -no-compress QMAKE_RESOURCE_FLAGS += -no-compress
LIBS += $$QMAKE_LIBS_NETWORK LIBS += $$QMAKE_LIBS_NETWORK
DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0

2
tests/manual/windowchildgeometry/CMakeLists.txt
View File

@ -13,8 +13,6 @@ qt_internal_add_manual_test(windowchildgeometry
../windowflags/controls.cpp ../windowflags/controls.h ../windowflags/controls.cpp ../windowflags/controls.h
controllerwidget.cpp controllerwidget.h controllerwidget.cpp controllerwidget.h
main.cpp main.cpp
DEFINES
QT_DISABLE_DEPRECATED_UP_TO=0
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../windowflags ../windowflags
LIBRARIES LIBRARIES

2
tests/manual/windowchildgeometry/windowchildgeometry.pro
View File

@ -5,5 +5,3 @@ TEMPLATE = app
INCLUDEPATH += ../windowflags INCLUDEPATH += ../windowflags
SOURCES += $$PWD/main.cpp controllerwidget.cpp ../windowflags/controls.cpp SOURCES += $$PWD/main.cpp controllerwidget.cpp ../windowflags/controls.cpp
HEADERS += controllerwidget.h ../windowflags/controls.h HEADERS += controllerwidget.h ../windowflags/controls.h
DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0