From 672b5b7ab668c67477d36edfcda98caafd35edc0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira 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 Reviewed-by: Olivier Goffart --- .../qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro | 1 + tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro | 1 + tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro | 1 + tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro | 1 + tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro | 1 + tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro | 1 + 6 files changed, 6 insertions(+) (limited to 'tests/benchmarks/network') diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro index eccabd5d89..82c49e40b8 100644 --- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro +++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro @@ -7,3 +7,4 @@ QT += network testlib CONFIG += release SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro index 9de05b5e65..226c123a72 100644 --- a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro +++ b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro @@ -7,3 +7,4 @@ QT += network testlib CONFIG += release SOURCES += tst_qnetworkdiskcache.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro index 1618728295..7031b83210 100644 --- a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro +++ b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro @@ -7,3 +7,4 @@ QT += network testlib CONFIG += release SOURCES += tst_qnetworkreply.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro index 41dae0051b..e335d95aad 100644 --- a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro @@ -7,3 +7,4 @@ QT += core-private network network-private testlib CONFIG += release SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro index ebf1891433..abc7676afa 100644 --- a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro +++ b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro @@ -7,3 +7,4 @@ QT += network testlib CONFIG += release SOURCES += tst_qtcpserver.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro index a67c0d66df..d22fdd326a 100644 --- a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro @@ -7,3 +7,4 @@ QT += network testlib CONFIG += release SOURCES += tst_qsslsocket.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3