diff options
author | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-16 12:26:25 +0200 |
---|---|---|
committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-19 23:52:05 +0200 |
commit | 3226c82740a7ed73b3d0ca39568d8b1c79500963 (patch) | |
tree | 2504c906816e9ff26c65c615fa9e6e9d166508c8 /tests/manual | |
parent | b9baa42b62b7ae34dabd54592cb12be6e2b18b35 (diff) |
Rename QT_DISABLE_DEPRECATED_BEFORE -> QT_DISABLE_DEPRECATED_UP_TO
The new name describes the behavior in a better way.
[ChangeLog][Build System] The QT_DISABLE_DEPRECATED_BEFORE macro is
renamed to QT_DISABLE_DEPRECATED_UP_TO. The old name is deprecated, but
is still recognized if it is defined during configuration and the new
name is not defined.
Task-number: QTBUG-104944
Change-Id: Ifc34323e0bbd9e3dc2f86c3e80d4d0940ebccbb8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/manual')
9 files changed, 9 insertions, 9 deletions
diff --git a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt index 014cddad67..5586e34523 100644 --- a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt +++ b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt @@ -13,7 +13,7 @@ qt_internal_add_manual_test(qt_on_cocoa main.mm rasterwindow.cpp rasterwindow.h DEFINES - QT_DISABLE_DEPRECATED_BEFORE=0 + 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 91c4d2c875..83c8140a31 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,4 @@ LIBS += -framework AppKit QT += gui widgets quick QT += quick -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0 diff --git a/tests/manual/network_stresstest/CMakeLists.txt b/tests/manual/network_stresstest/CMakeLists.txt index 440ac9d33b..30c70611a0 100644 --- a/tests/manual/network_stresstest/CMakeLists.txt +++ b/tests/manual/network_stresstest/CMakeLists.txt @@ -12,7 +12,7 @@ qt_internal_add_manual_test(tst_network_stresstest minihttpserver.cpp minihttpserver.h tst_network_stresstest.cpp DEFINES - QT_DISABLE_DEPRECATED_BEFORE=0 + 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 cefb064020..1b7b9a4dff 100644 --- a/tests/manual/network_stresstest/network_stresstest.pro +++ b/tests/manual/network_stresstest/network_stresstest.pro @@ -11,4 +11,4 @@ HEADERS += \ RESOURCES += wwwfiles.qrc QMAKE_RESOURCE_FLAGS += -no-compress LIBS += $$QMAKE_LIBS_NETWORK -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0 diff --git a/tests/manual/wasm/clipboard/clipboard.pro b/tests/manual/wasm/clipboard/clipboard.pro index 3286049225..cffce46997 100644 --- a/tests/manual/wasm/clipboard/clipboard.pro +++ b/tests/manual/wasm/clipboard/clipboard.pro @@ -6,7 +6,7 @@ CONFIG += c++11 # You can make your code fail to compile if it uses deprecated APIs. # In order to do so, uncomment the following line. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +#DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x060000 # disables all APIs deprecated in Qt 6.0.0 and earlier SOURCES += \ main.cpp \ diff --git a/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro index 408dab6482..d5dbe729b9 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro +++ b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro @@ -18,7 +18,7 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also make your code fail to compile if you use deprecated APIs. # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +#DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x060000 # disables all APIs deprecated in Qt 6.0.0 and earlier SOURCES += \ diff --git a/tests/manual/windowchildgeometry/CMakeLists.txt b/tests/manual/windowchildgeometry/CMakeLists.txt index b31f7d88f2..0cb4196996 100644 --- a/tests/manual/windowchildgeometry/CMakeLists.txt +++ b/tests/manual/windowchildgeometry/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_manual_test(windowchildgeometry controllerwidget.cpp controllerwidget.h main.cpp DEFINES - QT_DISABLE_DEPRECATED_BEFORE=0 + 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 7722547ce7..19207232ae 100644 --- a/tests/manual/windowchildgeometry/windowchildgeometry.pro +++ b/tests/manual/windowchildgeometry/windowchildgeometry.pro @@ -6,4 +6,4 @@ INCLUDEPATH += ../windowflags SOURCES += $$PWD/main.cpp controllerwidget.cpp ../windowflags/controls.cpp HEADERS += controllerwidget.h ../windowflags/controls.h -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0 diff --git a/tests/manual/xembed/gtk-container/gtk-container.pro b/tests/manual/xembed/gtk-container/gtk-container.pro index 5b4b826315..e98f1d6cfa 100644 --- a/tests/manual/xembed/gtk-container/gtk-container.pro +++ b/tests/manual/xembed/gtk-container/gtk-container.pro @@ -10,7 +10,7 @@ QMAKE_USE += gtk3 # Please consult the documentation of the deprecated API in order to know # how to port your code away from it. # You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +#DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x060000 # disables all APIs deprecated in Qt 6.0.0 and earlier # Input SOURCES += gtk-container.cpp |