From 8934e35bde9ec67b4b3a93217d73a0554b15d3b2 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 1 Aug 2012 13:48:22 +0200
Subject: [PATCH] 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: Iab3d9fa844e74b7f8a17dbe1c26f9df6fa8dfadc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
tests/auto/checkxmlfiles/checkxmlfiles.pro | 1 +
tests/auto/headersclean/headersclean.pro | 1 +
.../auto/patternistexamplefiletree/patternistexamplefiletree.pro | 1 +
tests/auto/patternistexamples/patternistexamples.pro | 1 +
tests/auto/patternistheaders/patternistheaders.pro | 1 +
tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro | 1 +
tests/auto/qabstracturiresolver/qabstracturiresolver.pro | 1 +
.../qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro | 1 +
tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro | 1 +
tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro | 1 +
.../qapplicationargumentparser/qapplicationargumentparser.pro | 1 +
tests/auto/qautoptr/qautoptr.pro | 1 +
tests/auto/qsimplexmlnodemodel/qsimplexmlnodemodel.pro | 1 +
tests/auto/qsourcelocation/qsourcelocation.pro | 1 +
tests/auto/qxmlformatter/qxmlformatter.pro | 1 +
tests/auto/qxmlitem/qxmlitem.pro | 1 +
tests/auto/qxmlname/qxmlname.pro | 1 +
tests/auto/qxmlnamepool/qxmlnamepool.pro | 1 +
tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro | 1 +
tests/auto/qxmlquery/qxmlquery.pro | 1 +
tests/auto/qxmlresultitems/qxmlresultitems.pro | 1 +
tests/auto/qxmlschema/qxmlschema.pro | 1 +
tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro | 1 +
tests/auto/qxmlserializer/qxmlserializer.pro | 1 +
tests/auto/xmlpatterns/xmlpatterns.pro | 1 +
tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro | 1 +
tests/auto/xmlpatternsschema/xmlpatternsschema.pro | 1 +
tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro | 1 +
tests/auto/xmlpatternssdk/xmlpatternssdk.pro | 1 +
tests/auto/xmlpatternsvalidator/xmlpatternsvalidator.pro | 1 +
tests/auto/xmlpatternsview/view/view.pro | 1 +
tests/auto/xmlpatternsview/xmlpatternsview.pro | 1 +
tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro | 1 +
tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro | 1 +
34 files changed, 34 insertions(+)
diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro
index e4b11e11..a4a3a953 100644
--- a/tests/auto/checkxmlfiles/checkxmlfiles.pro
+++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro
@@ -19,3 +19,4 @@ DEPLOYMENT += addFiles
} else {
DEFINES += SOURCETREE=\\\"$$absolute_path(../../..)/\\\"
}
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
index 93b0e58f..534f8aa8 100644
--- a/tests/auto/headersclean/headersclean.pro
+++ b/tests/auto/headersclean/headersclean.pro
@@ -2,3 +2,4 @@ TARGET = tst_headersclean
CONFIG += testcase
SOURCES += tst_headersclean.cpp
QT = core xmlpatterns testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
index 61ba4c3c..3e79991b 100644
--- a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
+++ b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
@@ -4,3 +4,4 @@ SOURCES += tst_patternistexamplefiletree.cpp
QT = core testlib
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/patternistexamples/patternistexamples.pro b/tests/auto/patternistexamples/patternistexamples.pro
index e2fa1511..02c66898 100644
--- a/tests/auto/patternistexamples/patternistexamples.pro
+++ b/tests/auto/patternistexamples/patternistexamples.pro
@@ -23,3 +23,4 @@ wince*: {
DEFINES += SOURCETREE=\\\"$$absolute_path(../../..)/\\\"
}
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/patternistheaders/patternistheaders.pro b/tests/auto/patternistheaders/patternistheaders.pro
index a1f45963..9ff24ae4 100644
--- a/tests/auto/patternistheaders/patternistheaders.pro
+++ b/tests/auto/patternistheaders/patternistheaders.pro
@@ -4,3 +4,4 @@ SOURCES += tst_patternistheaders.cpp
QT = core testlib
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro b/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro
index 82795c20..4814df49 100644
--- a/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro
+++ b/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro
@@ -4,3 +4,4 @@ SOURCES += tst_qabstractmessagehandler.cpp
QT = core testlib
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qabstracturiresolver/qabstracturiresolver.pro b/tests/auto/qabstracturiresolver/qabstracturiresolver.pro
index 6ac2df8d..4f21cfc5 100644
--- a/tests/auto/qabstracturiresolver/qabstracturiresolver.pro
+++ b/tests/auto/qabstracturiresolver/qabstracturiresolver.pro
@@ -5,3 +5,4 @@ HEADERS += TestURIResolver.h
QT = core testlib
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro b/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
index 8ba8eb20..07609d58 100644
--- a/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
+++ b/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
@@ -4,3 +4,4 @@ SOURCES += tst_qabstractxmlforwarditerator.cpp
QT = core testlib
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro b/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro
index f8b4df1c..40a171e5 100644
--- a/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro
+++ b/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro
@@ -16,3 +16,4 @@ wince*: {
DEPLOYMENT += addFiles
}
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro b/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro
index a436e765..47eb9dd0 100644
--- a/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro
+++ b/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro
@@ -4,3 +4,4 @@ SOURCES += tst_qabstractxmlreceiver.cpp
QT = core testlib
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro b/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
index f9706383..793f2e18 100644
--- a/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
+++ b/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
@@ -5,3 +5,4 @@ SOURCES += tst_qapplicationargumentparser.cpp \
../../../tools/xmlpatterns/qapplicationargumentparser.cpp
QT = core testlib
INCLUDEPATH += ../../../tools/xmlpatterns/
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qautoptr/qautoptr.pro b/tests/auto/qautoptr/qautoptr.pro
index 6059f689..8d3880ca 100644
--- a/tests/auto/qautoptr/qautoptr.pro
+++ b/tests/auto/qautoptr/qautoptr.pro
@@ -3,3 +3,4 @@ CONFIG += testcase
SOURCES += tst_qautoptr.cpp
QT = core testlib
include(../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qsimplexmlnodemodel/qsimplexmlnodemodel.pro b/tests/auto/qsimplexmlnodemodel/qsimplexmlnodemodel.pro
index c89495b0..3f32d3d6 100644
--- a/tests/auto/qsimplexmlnodemodel/qsimplexmlnodemodel.pro
+++ b/tests/auto/qsimplexmlnodemodel/qsimplexmlnodemodel.pro
@@ -4,3 +4,4 @@ QT += testlib
SOURCES += tst_qsimplexmlnodemodel.cpp
HEADERS += TestSimpleNodeModel.h
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qsourcelocation/qsourcelocation.pro b/tests/auto/qsourcelocation/qsourcelocation.pro
index 3c2c8ea3..9a87e9b7 100644
--- a/tests/auto/qsourcelocation/qsourcelocation.pro
+++ b/tests/auto/qsourcelocation/qsourcelocation.pro
@@ -4,3 +4,4 @@ QT += testlib
SOURCES += tst_qsourcelocation.cpp
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlformatter/qxmlformatter.pro b/tests/auto/qxmlformatter/qxmlformatter.pro
index 6e9e262f..db265525 100644
--- a/tests/auto/qxmlformatter/qxmlformatter.pro
+++ b/tests/auto/qxmlformatter/qxmlformatter.pro
@@ -12,3 +12,4 @@ wince*:{
addFiles.path = .
DEPLOYMENT += addFiles
}
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlitem/qxmlitem.pro b/tests/auto/qxmlitem/qxmlitem.pro
index db9c8a18..d7b66fab 100644
--- a/tests/auto/qxmlitem/qxmlitem.pro
+++ b/tests/auto/qxmlitem/qxmlitem.pro
@@ -4,3 +4,4 @@ QT += testlib
SOURCES += tst_qxmlitem.cpp
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlname/qxmlname.pro b/tests/auto/qxmlname/qxmlname.pro
index 5360180b..230d7444 100644
--- a/tests/auto/qxmlname/qxmlname.pro
+++ b/tests/auto/qxmlname/qxmlname.pro
@@ -4,3 +4,4 @@ QT += testlib
SOURCES += tst_qxmlname.cpp
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlnamepool/qxmlnamepool.pro b/tests/auto/qxmlnamepool/qxmlnamepool.pro
index df756828..34be2a32 100644
--- a/tests/auto/qxmlnamepool/qxmlnamepool.pro
+++ b/tests/auto/qxmlnamepool/qxmlnamepool.pro
@@ -4,3 +4,4 @@ QT += testlib
SOURCES += tst_qxmlnamepool.cpp
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro b/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro
index 4c9fbc19..684ed983 100644
--- a/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro
+++ b/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro
@@ -4,3 +4,4 @@ QT += testlib
SOURCES += tst_qxmlnodemodelindex.cpp
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro
index 7dca9b92..54a30a71 100644
--- a/tests/auto/qxmlquery/qxmlquery.pro
+++ b/tests/auto/qxmlquery/qxmlquery.pro
@@ -24,3 +24,4 @@ wince*: {
DEPLOYMENT += addFiles patternistFiles
}
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlresultitems/qxmlresultitems.pro b/tests/auto/qxmlresultitems/qxmlresultitems.pro
index 30eb0cbe..790e88b2 100644
--- a/tests/auto/qxmlresultitems/qxmlresultitems.pro
+++ b/tests/auto/qxmlresultitems/qxmlresultitems.pro
@@ -4,3 +4,4 @@ QT += testlib
SOURCES += tst_qxmlresultitems.cpp
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlschema/qxmlschema.pro b/tests/auto/qxmlschema/qxmlschema.pro
index 2543a6cb..f03ba911 100644
--- a/tests/auto/qxmlschema/qxmlschema.pro
+++ b/tests/auto/qxmlschema/qxmlschema.pro
@@ -4,3 +4,4 @@ SOURCES += tst_qxmlschema.cpp
QT += network testlib
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro b/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro
index 343fa73f..bb1226f5 100644
--- a/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro
+++ b/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro
@@ -4,3 +4,4 @@ SOURCES += tst_qxmlschemavalidator.cpp
QT += network testlib
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlserializer/qxmlserializer.pro b/tests/auto/qxmlserializer/qxmlserializer.pro
index a1e477b3..8b13b8aa 100644
--- a/tests/auto/qxmlserializer/qxmlserializer.pro
+++ b/tests/auto/qxmlserializer/qxmlserializer.pro
@@ -4,3 +4,4 @@ QT += testlib
SOURCES += tst_qxmlserializer.cpp
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/xmlpatterns/xmlpatterns.pro b/tests/auto/xmlpatterns/xmlpatterns.pro
index 64aa7941..93f905ae 100644
--- a/tests/auto/xmlpatterns/xmlpatterns.pro
+++ b/tests/auto/xmlpatterns/xmlpatterns.pro
@@ -5,3 +5,4 @@ SOURCES += tst_xmlpatterns.cpp \
../qxmlquery/TestFundament.cpp
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
index 2e858a01..b534495f 100644
--- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
+++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
@@ -24,3 +24,4 @@ wince* {
catalog.path = .
DEPLOYMENT += catalog
}
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
index 19f738fb..28239361 100644
--- a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
+++ b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
@@ -8,3 +8,4 @@ SOURCES += tst_xmlpatternsschema.cpp \
include (../xmlpatterns.pri)
INCLUDEPATH += $$QT.xmlpatterns.private_includes
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
index c4173e67..c9fe6893 100644
--- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
+++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
@@ -21,3 +21,4 @@ QT += xml testlib
INCLUDEPATH += \
../xmlpatternsxqts \
../xmlpatternssdk
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
index 4ede97aa..7f908fd1 100644
--- a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
+++ b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
@@ -83,3 +83,4 @@ SOURCES = ASTItem.cpp \
XSDTestSuiteHandler.cpp \
XSDTSTestCase.cpp \
XSLTTestSuiteHandler.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/xmlpatternsvalidator/xmlpatternsvalidator.pro b/tests/auto/xmlpatternsvalidator/xmlpatternsvalidator.pro
index 55c4ec02..216cbeac 100644
--- a/tests/auto/xmlpatternsvalidator/xmlpatternsvalidator.pro
+++ b/tests/auto/xmlpatternsvalidator/xmlpatternsvalidator.pro
@@ -5,3 +5,4 @@ SOURCES += tst_xmlpatternsvalidator.cpp \
../qxmlquery/TestFundament.cpp
include (../xmlpatterns.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/xmlpatternsview/view/view.pro b/tests/auto/xmlpatternsview/view/view.pro
index 31ca97cb..2b87d918 100644
--- a/tests/auto/xmlpatternsview/view/view.pro
+++ b/tests/auto/xmlpatternsview/view/view.pro
@@ -33,3 +33,4 @@ FORMS = ui_BaseLinePage.ui \
ui_FunctionSignaturesView.ui
INCLUDEPATH += ../../xmlpatternsxqts/lib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/xmlpatternsview/xmlpatternsview.pro b/tests/auto/xmlpatternsview/xmlpatternsview.pro
index 2fd12ab8..c5ae493f 100644
--- a/tests/auto/xmlpatternsview/xmlpatternsview.pro
+++ b/tests/auto/xmlpatternsview/xmlpatternsview.pro
@@ -11,3 +11,4 @@ wince*: {
viewexe.path = .
DEPLOYMENT += viewexe
}
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
index b752abe1..f6d492ee 100644
--- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
+++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
@@ -16,3 +16,4 @@ INCLUDEPATH += $$(QTDIR)/include/QtXmlPatterns/private \
QT += xml testlib
TARGET = tst_xmlpatternsxqts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
index f9dc1c2c..3df3d78b 100644
--- a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
+++ b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
@@ -23,3 +23,4 @@ wince*: {
}
requires(contains(QT_CONFIG,private_tests))
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
--
GitLab