From fca18ab38992be9327dc529f497c5806485ad551 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 1 Aug 2012 15:41:28 +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: I9db441ddaeb09298f311ece48111aea1ff2ae554 Reviewed-by: Lars Knoll --- tests/auto/qbluetoothaddress/qbluetoothaddress.pro | 1 + .../qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro | 1 + tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro | 1 + tests/auto/qbluetoothhostinfo/qbluetoothhostinfo.pro | 1 + tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro | 1 + .../qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro | 1 + tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro | 1 + tests/auto/qbluetoothsocket/qbluetoothsocket.pro | 1 + tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro | 1 + tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro | 1 + tests/auto/qbluetoothuuid/qbluetoothuuid.pro | 1 + tests/auto/ql2capserver/ql2capserver.pro | 1 + tests/auto/qndefmessage/qndefmessage.pro | 1 + tests/auto/qndefrecord/qndefrecord.pro | 1 + tests/auto/qnearfieldmanager/qnearfieldmanager.pro | 1 + tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro | 1 + tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro | 1 + tests/auto/qrfcommserver/qrfcommserver.pro | 1 + tests/auto/qrfcommserver/rfcommclient/rfcommclient.pro | 1 + tests/btclient/btclient.pro | 1 + tests/nfctestserver/nfctestserver.pro | 1 + 21 files changed, 21 insertions(+) (limited to 'tests') diff --git a/tests/auto/qbluetoothaddress/qbluetoothaddress.pro b/tests/auto/qbluetoothaddress/qbluetoothaddress.pro index f87551e8..f0ef2b77 100644 --- a/tests/auto/qbluetoothaddress/qbluetoothaddress.pro +++ b/tests/auto/qbluetoothaddress/qbluetoothaddress.pro @@ -4,3 +4,4 @@ CONFIG += testcase QT = core concurrent bluetooth testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro index f02d22b6..64330b65 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro +++ b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro @@ -5,3 +5,4 @@ CONFIG += testcase QT = core concurrent bluetooth testlib CONFIG += insignificant_test # QTBUG-22017 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro b/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro index a12da314..43ca52ed 100644 --- a/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro +++ b/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro @@ -3,3 +3,4 @@ TARGET=tst_qbluetoothdeviceinfo CONFIG += testcase QT = core concurrent bluetooth testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothhostinfo/qbluetoothhostinfo.pro b/tests/auto/qbluetoothhostinfo/qbluetoothhostinfo.pro index 58776a65..42a29179 100644 --- a/tests/auto/qbluetoothhostinfo/qbluetoothhostinfo.pro +++ b/tests/auto/qbluetoothhostinfo/qbluetoothhostinfo.pro @@ -4,3 +4,4 @@ CONFIG += testcase QT = core concurrent bluetooth testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro b/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro index d35df900..ec829afb 100644 --- a/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro +++ b/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro @@ -5,3 +5,4 @@ CONFIG += testcase QT = core concurrent bluetooth testlib CONFIG += insignificant_test # QTBUG-22017 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro b/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro index 9b5c771e..88ba38ec 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro +++ b/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro @@ -5,3 +5,4 @@ CONFIG += testcase QT = core concurrent bluetooth testlib CONFIG += insignificant_test # QTBUG-22017 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro index 072360ec..90703bd1 100644 --- a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro +++ b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro @@ -3,3 +3,4 @@ TARGET = tst_qbluetoothserviceinfo CONFIG += testcase QT = core concurrent bluetooth testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro index 53ca2ea1..98c18cfb 100644 --- a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro +++ b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro @@ -12,3 +12,4 @@ OTHER_FILES += \ README.txt CONFIG += insignificant_test # QTBUG-22017 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro b/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro index c78e8e28..0ea7f4fa 100644 --- a/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro +++ b/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro @@ -9,3 +9,4 @@ INCLUDEPATH += ../../../tests/btclient DEPENDPATH += ../../../tests/btclient CONFIG += insignificant_test # QTBUG-22017 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro b/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro index 2dfbfe09..a9ad84f2 100644 --- a/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro +++ b/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro @@ -3,3 +3,4 @@ TARGET=tst_qbluetoothtransferrequest CONFIG += testcase QT = core concurrent bluetooth testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothuuid/qbluetoothuuid.pro b/tests/auto/qbluetoothuuid/qbluetoothuuid.pro index 2d81c4af..3f56ea88 100644 --- a/tests/auto/qbluetoothuuid/qbluetoothuuid.pro +++ b/tests/auto/qbluetoothuuid/qbluetoothuuid.pro @@ -3,3 +3,4 @@ TARGET = tst_qbluetoothuuid CONFIG += testcase QT = core concurrent bluetooth testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/ql2capserver/ql2capserver.pro b/tests/auto/ql2capserver/ql2capserver.pro index 453c07fa..c87a0503 100644 --- a/tests/auto/ql2capserver/ql2capserver.pro +++ b/tests/auto/ql2capserver/ql2capserver.pro @@ -5,3 +5,4 @@ TARGET = tst_ql2capserver #CONFIG += testcase QT = core concurrent bluetooth testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qndefmessage/qndefmessage.pro b/tests/auto/qndefmessage/qndefmessage.pro index c1309387..9743403d 100644 --- a/tests/auto/qndefmessage/qndefmessage.pro +++ b/tests/auto/qndefmessage/qndefmessage.pro @@ -3,3 +3,4 @@ TARGET = tst_qndefmessage CONFIG += testcase QT = core nfc testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qndefrecord/qndefrecord.pro b/tests/auto/qndefrecord/qndefrecord.pro index e87f8b62..0698be64 100644 --- a/tests/auto/qndefrecord/qndefrecord.pro +++ b/tests/auto/qndefrecord/qndefrecord.pro @@ -3,3 +3,4 @@ TARGET = tst_qndefrecord CONFIG += testcase QT = core nfc testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro index b773cf55..4d1d84b0 100644 --- a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro +++ b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro @@ -5,3 +5,4 @@ CONFIG += testcase QT = core nfc-private testlib DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\" +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro index 4ecae2a5..63a59333 100644 --- a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro +++ b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro @@ -6,3 +6,4 @@ QT = core nfc-private testlib DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\" +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro index 4eb553c1..77332b8e 100644 --- a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro +++ b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro @@ -5,3 +5,4 @@ CONFIG += testcase QT = core nfc-private testlib DEFINES += SRCDIR=\\\"$$PWD\\\" +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qrfcommserver/qrfcommserver.pro b/tests/auto/qrfcommserver/qrfcommserver.pro index 339504c8..b6472ca4 100644 --- a/tests/auto/qrfcommserver/qrfcommserver.pro +++ b/tests/auto/qrfcommserver/qrfcommserver.pro @@ -8,3 +8,4 @@ OTHER_FILES += \ README.txt CONFIG += insignificant_test # QTBUG-22017 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qrfcommserver/rfcommclient/rfcommclient.pro b/tests/auto/qrfcommserver/rfcommclient/rfcommclient.pro index ecd4851a..af41627a 100644 --- a/tests/auto/qrfcommserver/rfcommclient/rfcommclient.pro +++ b/tests/auto/qrfcommserver/rfcommclient/rfcommclient.pro @@ -3,3 +3,4 @@ SOURCES += main.cpp rfcommclient.cpp HEADERS += rfcommclient.h QT = core +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/btclient/btclient.pro b/tests/btclient/btclient.pro index 1a96b99b..ea6b516c 100644 --- a/tests/btclient/btclient.pro +++ b/tests/btclient/btclient.pro @@ -6,3 +6,4 @@ QT -= gui \ core SOURCES = btclient.c HEADERS += btclient.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/nfctestserver/nfctestserver.pro b/tests/nfctestserver/nfctestserver.pro index 4b7695c8..80612a6b 100644 --- a/tests/nfctestserver/nfctestserver.pro +++ b/tests/nfctestserver/nfctestserver.pro @@ -21,3 +21,4 @@ HEADERS += \ socketcontroller.h \ servercontroller.h \ servicenames.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3