From 672b5b7ab668c67477d36edfcda98caafd35edc0 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 1 Aug 2012 13:19:40 +0200
Subject: Set the Qt API level to compatibility mode in all tests.

Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.

Task-number: QTBUG-25053
Change-Id: I8129c3ef3cb58541c95a32d083850d9e7f768927
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 .../auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro  | 1 +
 tests/auto/network/access/qftp/qftp.pro                                  | 1 +
 .../network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro     | 1 +
 tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro        | 1 +
 .../auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro  | 1 +
 .../auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro  | 1 +
 tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro              | 1 +
 tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro        | 1 +
 tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro        | 1 +
 tests/auto/network/access/qnetworkreply/echo/echo.pro                    | 1 +
 tests/auto/network/access/qnetworkreply/test/test.pro                    | 1 +
 tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro            | 1 +
 .../auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro  | 1 +
 .../bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro | 1 +
 tests/auto/network/bearer/qnetworksession/lackey/lackey.pro              | 1 +
 tests/auto/network/bearer/qnetworksession/test/test.pro                  | 1 +
 tests/auto/network/kernel/qauthenticator/qauthenticator.pro              | 1 +
 tests/auto/network/kernel/qdnslookup/qdnslookup.pro                      | 1 +
 tests/auto/network/kernel/qdnslookup_appless/qdnslookup_appless.pro      | 1 +
 tests/auto/network/kernel/qhostaddress/qhostaddress.pro                  | 1 +
 tests/auto/network/kernel/qhostinfo/qhostinfo.pro                        | 1 +
 tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro  | 1 +
 tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro        | 1 +
 tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro                | 1 +
 tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro  | 1 +
 tests/auto/network/socket/platformsocketengine/platformsocketengine.pro  | 1 +
 tests/auto/network/socket/qabstractsocket/qabstractsocket.pro            | 1 +
 tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro        | 1 +
 tests/auto/network/socket/qlocalsocket/example/client/client.pro         | 1 +
 tests/auto/network/socket/qlocalsocket/example/server/server.pro         | 1 +
 tests/auto/network/socket/qlocalsocket/lackey/lackey.pro                 | 1 +
 tests/auto/network/socket/qlocalsocket/test/test.pro                     | 1 +
 tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro    | 1 +
 tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro   | 1 +
 tests/auto/network/socket/qtcpserver/test/test.pro                       | 1 +
 tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro           | 1 +
 tests/auto/network/socket/qtcpsocket/test/test.pro                       | 1 +
 tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro       | 1 +
 tests/auto/network/socket/qudpsocket/test/test.pro                       | 1 +
 tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro             | 1 +
 tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro               | 1 +
 tests/auto/network/ssl/qsslcipher/qsslcipher.pro                         | 1 +
 tests/auto/network/ssl/qsslerror/qsslerror.pro                           | 1 +
 tests/auto/network/ssl/qsslkey/qsslkey.pro                               | 1 +
 tests/auto/network/ssl/qsslsocket/qsslsocket.pro                         | 1 +
 .../qsslsocket_onDemandCertificates_member.pro                           | 1 +
 .../qsslsocket_onDemandCertificates_static.pro                           | 1 +
 47 files changed, 47 insertions(+)

(limited to 'tests/auto/network')

diff --git a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
index 777f84ce2b..56572a2490 100644
--- a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
+++ b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
@@ -7,3 +7,4 @@ SOURCES  += tst_qabstractnetworkcache.cpp
 
 TESTDATA += tests/*
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qftp/qftp.pro b/tests/auto/network/access/qftp/qftp.pro
index 7fdf3a46f0..5d7d534192 100644
--- a/tests/auto/network/access/qftp/qftp.pro
+++ b/tests/auto/network/access/qftp/qftp.pro
@@ -15,3 +15,4 @@ wince*: {
 }
 
 CONFIG+=insignificant_test  # QTBUG-15111: uses live qt-test-server, inherently unstable
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro
index b5dc199f20..925b72ac92 100644
--- a/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro
+++ b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro
@@ -6,3 +6,4 @@ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
 requires(contains(QT_CONFIG,private_tests))
 
 QT = core-private network-private testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro
index 1d0c1ee04d..5325b76726 100644
--- a/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro
+++ b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro
@@ -6,3 +6,4 @@ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
 requires(contains(QT_CONFIG,private_tests))
 
 QT = core-private network-private testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro b/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro
index 8b3de90f54..e6354d0479 100644
--- a/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro
+++ b/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro
@@ -3,3 +3,4 @@ CONFIG += parallel_test
 TARGET = tst_qnetworkaccessmanager
 SOURCES += tst_qnetworkaccessmanager.cpp
 QT = core network testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro
index b8b67a61be..ebef3b007d 100644
--- a/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro
+++ b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro
@@ -4,3 +4,4 @@ TARGET = tst_qnetworkcachemetadata
 QT -= gui
 QT += network testlib
 SOURCES  += tst_qnetworkcachemetadata.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro b/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro
index ba3ece8576..edbc972011 100644
--- a/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro
+++ b/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro
@@ -4,3 +4,4 @@ TARGET = tst_qnetworkcookie
 SOURCES  += tst_qnetworkcookie.cpp
 
 QT = core network testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro b/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro
index bb39f83af6..2fc1485a50 100644
--- a/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro
+++ b/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro
@@ -4,3 +4,4 @@ TARGET = tst_qnetworkcookiejar
 SOURCES  += tst_qnetworkcookiejar.cpp
 
 QT = core core-private network network-private testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
index cb773ab0f1..d84a332870 100644
--- a/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
+++ b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
@@ -4,3 +4,4 @@ TARGET = tst_qnetworkdiskcache
 QT -= gui
 QT += network testlib
 SOURCES  += tst_qnetworkdiskcache.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qnetworkreply/echo/echo.pro b/tests/auto/network/access/qnetworkreply/echo/echo.pro
index 1f05fd9a54..d634c677c6 100644
--- a/tests/auto/network/access/qnetworkreply/echo/echo.pro
+++ b/tests/auto/network/access/qnetworkreply/echo/echo.pro
@@ -2,3 +2,4 @@ SOURCES += main.cpp
 QT = core
 CONFIG -= app_bundle debug_and_release_target
 CONFIG += console
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro
index 0a95e43059..93a8cbad55 100644
--- a/tests/auto/network/access/qnetworkreply/test/test.pro
+++ b/tests/auto/network/access/qnetworkreply/test/test.pro
@@ -17,3 +17,4 @@ TESTDATA += ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg ../certs \
 win32:CONFIG += insignificant_test # QTBUG-24226
 
 TEST_HELPER_INSTALLS = ../echo/echo
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro b/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro
index 0470d96b8c..bbcb9226aa 100644
--- a/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro
+++ b/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro
@@ -4,3 +4,4 @@ TARGET = tst_qnetworkrequest
 SOURCES  += tst_qnetworkrequest.cpp
 
 QT = core network testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro
index cde82a4fb2..8c1e111873 100644
--- a/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro
+++ b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro
@@ -4,3 +4,4 @@ SOURCES  += tst_qnetworkconfiguration.cpp
 HEADERS  += ../qbearertestcommon.h
 
 QT = core network testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
index 52cee1f64d..1a1220763c 100644
--- a/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
+++ b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
@@ -4,3 +4,4 @@ SOURCES  += tst_qnetworkconfigurationmanager.cpp
 HEADERS  += ../qbearertestcommon.h
 
 QT = core network testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro b/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro
index 1605b31d94..9f2e82d4cc 100644
--- a/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro
+++ b/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro
@@ -7,3 +7,4 @@ DESTDIR = ./
 
 win32:CONFIG += console
 mac:CONFIG -= app_bundle
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/bearer/qnetworksession/test/test.pro b/tests/auto/network/bearer/qnetworksession/test/test.pro
index dd7618b4ad..574d0672b6 100644
--- a/tests/auto/network/bearer/qnetworksession/test/test.pro
+++ b/tests/auto/network/bearer/qnetworksession/test/test.pro
@@ -16,3 +16,4 @@ CONFIG(debug_and_release) {
 }
 
 TEST_HELPER_INSTALLS = ../lackey/lackey
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/kernel/qauthenticator/qauthenticator.pro b/tests/auto/network/kernel/qauthenticator/qauthenticator.pro
index 5e4759b690..54ec0e4cff 100644
--- a/tests/auto/network/kernel/qauthenticator/qauthenticator.pro
+++ b/tests/auto/network/kernel/qauthenticator/qauthenticator.pro
@@ -4,3 +4,4 @@ requires(contains(QT_CONFIG,private_tests))
 QT = core network-private testlib
 SOURCES  += tst_qauthenticator.cpp
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/kernel/qdnslookup/qdnslookup.pro b/tests/auto/network/kernel/qdnslookup/qdnslookup.pro
index 3727736fad..36727a3bf6 100644
--- a/tests/auto/network/kernel/qdnslookup/qdnslookup.pro
+++ b/tests/auto/network/kernel/qdnslookup/qdnslookup.pro
@@ -6,3 +6,4 @@ TARGET = tst_qdnslookup
 SOURCES  += tst_qdnslookup.cpp
 
 QT = core network testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/kernel/qdnslookup_appless/qdnslookup_appless.pro b/tests/auto/network/kernel/qdnslookup_appless/qdnslookup_appless.pro
index 0515bbad3b..4a97b89d9a 100644
--- a/tests/auto/network/kernel/qdnslookup_appless/qdnslookup_appless.pro
+++ b/tests/auto/network/kernel/qdnslookup_appless/qdnslookup_appless.pro
@@ -6,3 +6,4 @@ TARGET = tst_qdnslookup_appless
 SOURCES  += tst_qdnslookup_appless.cpp
 
 QT = core network testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/kernel/qhostaddress/qhostaddress.pro b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro
index 421685d855..318c78531b 100644
--- a/tests/auto/network/kernel/qhostaddress/qhostaddress.pro
+++ b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro
@@ -13,3 +13,4 @@ wince*: {
 	LIBS += -lws2_32
 }
 }
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
index 4ca59b5b70..3b9ecbab50 100644
--- a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
+++ b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
@@ -12,3 +12,4 @@ wince*: {
 }
 
 linux-*:CONFIG+=insignificant_test    # QTBUG-23837 - test is unstable
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro b/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro
index ae207e9c79..864d945064 100644
--- a/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro
+++ b/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro
@@ -4,3 +4,4 @@ TARGET = tst_qnetworkaddressentry
 SOURCES  += tst_qnetworkaddressentry.cpp
 
 QT = core network testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro
index 79279514d1..3b59690580 100644
--- a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro
+++ b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro
@@ -4,3 +4,4 @@ TARGET = tst_qnetworkinterface
 SOURCES  += tst_qnetworkinterface.cpp
 
 QT = core network testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro b/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro
index 996f9e3691..daf3e5dead 100644
--- a/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro
+++ b/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro
@@ -7,3 +7,4 @@ TARGET = tst_qnetworkproxy
 QT = core network testlib
 
 SOURCES += tst_qnetworkproxy.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro
index c63c7742a1..1afb5de603 100644
--- a/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro
@@ -8,3 +8,4 @@ TARGET = tst_qnetworkproxyfactory
 QT = core network testlib
 
 SOURCES += tst_qnetworkproxyfactory.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro
index eee762037d..8da6ad9a67 100644
--- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro
+++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro
@@ -9,3 +9,4 @@ requires(contains(QT_CONFIG,private_tests))
 MOC_DIR=tmp
 
 QT = core-private network-private testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro
index 00e604972f..970a3ffe60 100644
--- a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro
+++ b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro
@@ -8,3 +8,4 @@ QT = core network testlib
 
 SOURCES += tst_qabstractsocket.cpp
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro
index d0649410fa..414486f82b 100644
--- a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro
+++ b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro
@@ -9,3 +9,4 @@ MOC_DIR=tmp
 
 QT = core-private network-private testlib
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qlocalsocket/example/client/client.pro b/tests/auto/network/socket/qlocalsocket/example/client/client.pro
index 4b6585ff10..16744d3caf 100644
--- a/tests/auto/network/socket/qlocalsocket/example/client/client.pro
+++ b/tests/auto/network/socket/qlocalsocket/example/client/client.pro
@@ -2,3 +2,4 @@ CONFIG += console
 QT = core network
 
 SOURCES += main.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qlocalsocket/example/server/server.pro b/tests/auto/network/socket/qlocalsocket/example/server/server.pro
index b78e63d0a7..1d1cbd1b91 100644
--- a/tests/auto/network/socket/qlocalsocket/example/server/server.pro
+++ b/tests/auto/network/socket/qlocalsocket/example/server/server.pro
@@ -3,3 +3,4 @@ CONFIG += console
 QT = core network
 
 SOURCES += main.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro b/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro
index 858f22b199..6e697325d7 100644
--- a/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro
+++ b/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro
@@ -12,3 +12,4 @@ DEFINES += QLOCALSOCKET_DEBUG
 
 SOURCES		+= main.cpp
 TARGET		= lackey
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qlocalsocket/test/test.pro b/tests/auto/network/socket/qlocalsocket/test/test.pro
index 6a5df7f9b6..c870304549 100644
--- a/tests/auto/network/socket/qlocalsocket/test/test.pro
+++ b/tests/auto/network/socket/qlocalsocket/test/test.pro
@@ -25,3 +25,4 @@ CONFIG(debug_and_release) {
   DESTDIR = ..
 }
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
index c9793952ce..c741c78980 100644
--- a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
+++ b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
@@ -13,3 +13,4 @@ QT = core-private network-private testlib
 linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC # QTBUG-23380
 
 requires(contains(QT_CONFIG,private_tests))
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro
index 0bea655187..3f3e5ba3d4 100644
--- a/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro
+++ b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro
@@ -6,3 +6,4 @@ DESTDIR = ./
 # This means the auto test works on some machines for MinGW. No dialog stalls
 # the application.
 win32-g++*:CONFIG += console
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro
index 4daa9963ce..1cc9f66de4 100644
--- a/tests/auto/network/socket/qtcpserver/test/test.pro
+++ b/tests/auto/network/socket/qtcpserver/test/test.pro
@@ -25,3 +25,4 @@ win32 {
 QT = core network testlib
 
 MOC_DIR=tmp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro b/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro
index 2eb00593e0..c290fb8aa3 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro
@@ -7,3 +7,4 @@ CONFIG += console
 DESTDIR = ./
 MOC_DIR = .moc/
 TMP_DIR = .tmp/
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro
index 6c6697bfdc..bc34adf349 100644
--- a/tests/auto/network/socket/qtcpsocket/test/test.pro
+++ b/tests/auto/network/socket/qtcpsocket/test/test.pro
@@ -21,3 +21,4 @@ win32 {
 } else {
     DESTDIR = ../
 }
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro b/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro
index a1b0021232..b8522f970e 100644
--- a/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro
+++ b/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro
@@ -4,3 +4,4 @@ CONFIG += console
 CONFIG -= app_bundle
 TARGET = clientserver
 DESTDIR = ./
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro
index 8ad16c652d..ec249b4840 100644
--- a/tests/auto/network/socket/qudpsocket/test/test.pro
+++ b/tests/auto/network/socket/qudpsocket/test/test.pro
@@ -24,3 +24,4 @@ wince* {
 TARGET = tst_qudpsocket
 
 CONFIG+=insignificant_test # QTBUG-25367, QTBUG-25368
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro b/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro
index cf707aa14a..9532401e0b 100644
--- a/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro
+++ b/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro
@@ -3,3 +3,4 @@ QT = core network
 CONFIG -= app_bundle
 CONFIG += console
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro
index 09cb22defe..2a1f6ef299 100644
--- a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro
+++ b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro
@@ -8,3 +8,4 @@ QT = core network testlib
 TARGET = tst_qsslcertificate
 
 TESTDATA += certificates/* more-certificates/* verify-certs/*
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro
index a091bd0184..07907d3b76 100644
--- a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro
+++ b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro
@@ -14,3 +14,4 @@ win32 {
     DESTDIR = release
   }
 }
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/ssl/qsslerror/qsslerror.pro b/tests/auto/network/ssl/qsslerror/qsslerror.pro
index 85a5046923..9708ed0703 100644
--- a/tests/auto/network/ssl/qsslerror/qsslerror.pro
+++ b/tests/auto/network/ssl/qsslerror/qsslerror.pro
@@ -14,3 +14,4 @@ win32 {
     DESTDIR = release
   }
 }
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/ssl/qsslkey/qsslkey.pro b/tests/auto/network/ssl/qsslkey/qsslkey.pro
index 78cfb9ce92..37796bf5b7 100644
--- a/tests/auto/network/ssl/qsslkey/qsslkey.pro
+++ b/tests/auto/network/ssl/qsslkey/qsslkey.pro
@@ -8,3 +8,4 @@ QT = core network testlib
 TARGET = tst_qsslkey
 
 TESTDATA += keys/* rsa-without-passphrase.pem rsa-with-passphrase.pem
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
index c24fe22518..f799d180cd 100644
--- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
+++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
@@ -34,3 +34,4 @@ wince* {
 linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC  # QTBUG-24234
 
 requires(contains(QT_CONFIG,private_tests))
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
index 7e6ae1cc23..1626b62286 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
@@ -24,3 +24,4 @@ wince* {
 }
 
 requires(contains(QT_CONFIG,private_tests))
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
index 6358e400ad..06fad48d5a 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
@@ -23,3 +23,4 @@ wince* {
 }
 
 requires(contains(QT_CONFIG,private_tests))
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
-- 
cgit v1.2.3