diff options
Diffstat (limited to 'tests')
36 files changed, 8 insertions, 40 deletions
diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro index d1d26fb..31301b9 100644 --- a/tests/auto/checkxmlfiles/checkxmlfiles.pro +++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro @@ -20,4 +20,3 @@ DEPLOYMENT += addFiles } else { DEFINES += SOURCETREE=\\\"$$absolute_path(../../..)/\\\" } -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro index 3e79991..61ba4c3 100644 --- a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro +++ b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro @@ -4,4 +4,3 @@ 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 d55e979..dfb8ba8 100644 --- a/tests/auto/patternistexamples/patternistexamples.pro +++ b/tests/auto/patternistexamples/patternistexamples.pro @@ -23,4 +23,3 @@ 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 9ff24ae..a1f4596 100644 --- a/tests/auto/patternistheaders/patternistheaders.pro +++ b/tests/auto/patternistheaders/patternistheaders.pro @@ -4,4 +4,3 @@ 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 4814df4..82795c2 100644 --- a/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro +++ b/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro @@ -4,4 +4,3 @@ 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 4f21cfc..6ac2df8 100644 --- a/tests/auto/qabstracturiresolver/qabstracturiresolver.pro +++ b/tests/auto/qabstracturiresolver/qabstracturiresolver.pro @@ -5,4 +5,3 @@ 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 07609d5..8ba8eb2 100644 --- a/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro +++ b/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro @@ -4,4 +4,3 @@ 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 40a171e..f8b4df1 100644 --- a/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro +++ b/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro @@ -16,4 +16,3 @@ wince*: { DEPLOYMENT += addFiles } -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro b/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro index 47eb9dd..a436e76 100644 --- a/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro +++ b/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro @@ -4,4 +4,3 @@ 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 793f2e1..f970638 100644 --- a/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro +++ b/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro @@ -5,4 +5,3 @@ 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 8d3880c..6059f68 100644 --- a/tests/auto/qautoptr/qautoptr.pro +++ b/tests/auto/qautoptr/qautoptr.pro @@ -3,4 +3,3 @@ 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 3f32d3d..c89495b 100644 --- a/tests/auto/qsimplexmlnodemodel/qsimplexmlnodemodel.pro +++ b/tests/auto/qsimplexmlnodemodel/qsimplexmlnodemodel.pro @@ -4,4 +4,3 @@ 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 9a87e9b..3c2c8ea 100644 --- a/tests/auto/qsourcelocation/qsourcelocation.pro +++ b/tests/auto/qsourcelocation/qsourcelocation.pro @@ -4,4 +4,3 @@ QT += testlib SOURCES += tst_qsourcelocation.cpp include (../xmlpatterns.pri) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp index b5ad007..b72c02b 100644 --- a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp +++ b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp @@ -336,7 +336,7 @@ void tst_QSourceLocation::withinQVariant() const { QSourceLocation val; const QVariant variant(qVariantFromValue(val)); - QSourceLocation val2(qVariantValue<QSourceLocation>(variant)); + QSourceLocation val2(qvariant_cast<QSourceLocation>(variant)); } void tst_QSourceLocation::debugStream() const diff --git a/tests/auto/qxmlformatter/qxmlformatter.pro b/tests/auto/qxmlformatter/qxmlformatter.pro index db26552..6e9e262 100644 --- a/tests/auto/qxmlformatter/qxmlformatter.pro +++ b/tests/auto/qxmlformatter/qxmlformatter.pro @@ -12,4 +12,3 @@ 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 d7b66fa..db9c8a1 100644 --- a/tests/auto/qxmlitem/qxmlitem.pro +++ b/tests/auto/qxmlitem/qxmlitem.pro @@ -4,4 +4,3 @@ QT += testlib SOURCES += tst_qxmlitem.cpp include (../xmlpatterns.pri) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qxmlitem/tst_qxmlitem.cpp b/tests/auto/qxmlitem/tst_qxmlitem.cpp index e608847..89768cd 100644 --- a/tests/auto/qxmlitem/tst_qxmlitem.cpp +++ b/tests/auto/qxmlitem/tst_qxmlitem.cpp @@ -352,7 +352,7 @@ void tst_QXmlItem::withinQVariant() const { QXmlItem val; const QVariant variant(qVariantFromValue(val)); - QXmlItem val2(qVariantValue<QXmlItem>(variant)); + QXmlItem val2(qvariant_cast<QXmlItem>(variant)); } QTEST_MAIN(tst_QXmlItem) diff --git a/tests/auto/qxmlname/qxmlname.pro b/tests/auto/qxmlname/qxmlname.pro index 230d744..5360180 100644 --- a/tests/auto/qxmlname/qxmlname.pro +++ b/tests/auto/qxmlname/qxmlname.pro @@ -4,4 +4,3 @@ 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 34be2a3..df75682 100644 --- a/tests/auto/qxmlnamepool/qxmlnamepool.pro +++ b/tests/auto/qxmlnamepool/qxmlnamepool.pro @@ -4,4 +4,3 @@ 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 684ed98..4c9fbc1 100644 --- a/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro +++ b/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro @@ -4,4 +4,3 @@ 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 54a30a7..7dca9b9 100644 --- a/tests/auto/qxmlquery/qxmlquery.pro +++ b/tests/auto/qxmlquery/qxmlquery.pro @@ -24,4 +24,3 @@ wince*: { DEPLOYMENT += addFiles patternistFiles } -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index cc2cb13..5f78fc9 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -1257,12 +1257,12 @@ void tst_QXmlQuery::basicXQueryToQtTypeCheck() const * just artifacts created somewhere. */ if(produced.type() == QVariant::Double) QVERIFY(qFuzzyCompare(produced.toDouble(), expected.toDouble())); - else if(qVariantCanConvert<QXmlName>(produced)) + else if (produced.canConvert<QXmlName>()) { /* QVariant::operator==() does identity comparison, it doesn't delegate to operator==() of * the contained type, unless it's hardcoded into QVariant. */ - const QXmlName n1 = qVariantValue<QXmlName>(produced); - const QXmlName n2 = qVariantValue<QXmlName>(expected); + const QXmlName n1 = qvariant_cast<QXmlName>(produced); + const QXmlName n2 = qvariant_cast<QXmlName>(expected); QCOMPARE(n1, n2); } else diff --git a/tests/auto/qxmlresultitems/qxmlresultitems.pro b/tests/auto/qxmlresultitems/qxmlresultitems.pro index 790e88b..30eb0cb 100644 --- a/tests/auto/qxmlresultitems/qxmlresultitems.pro +++ b/tests/auto/qxmlresultitems/qxmlresultitems.pro @@ -4,4 +4,3 @@ 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 f03ba91..2543a6c 100644 --- a/tests/auto/qxmlschema/qxmlschema.pro +++ b/tests/auto/qxmlschema/qxmlschema.pro @@ -4,4 +4,3 @@ 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 bb1226f..343fa73 100644 --- a/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro +++ b/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro @@ -4,4 +4,3 @@ 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 8b13b8a..a1e477b 100644 --- a/tests/auto/qxmlserializer/qxmlserializer.pro +++ b/tests/auto/qxmlserializer/qxmlserializer.pro @@ -4,4 +4,3 @@ QT += testlib SOURCES += tst_qxmlserializer.cpp include (../xmlpatterns.pri) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index e207a33..0a189db 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -822,8 +822,10 @@ void tst_XmlPatterns::removeNonWritable(QFile &outFile) */ void tst_XmlPatterns::stdoutFailure() const { +#ifdef QT_NO_PROCESS + QSKIP("Skipping test due to not having process support"); +#else return; // TODO It's really hard to write testing code for this. -#ifndef QT_NO_PROCESS const QString outName(QLatin1String("stdoutFailure.out")); createNonWritable(outName); @@ -845,8 +847,6 @@ void tst_XmlPatterns::stdoutFailure() const QCOMPARE(process.exitCode(), 1); removeNonWritable(outFile); -#else - QSKIP("Skipping test due to not having process support"); #endif // QT_NO_PROCESS } diff --git a/tests/auto/xmlpatterns/xmlpatterns.pro b/tests/auto/xmlpatterns/xmlpatterns.pro index 93f905a..64aa794 100644 --- a/tests/auto/xmlpatterns/xmlpatterns.pro +++ b/tests/auto/xmlpatterns/xmlpatterns.pro @@ -5,4 +5,3 @@ 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 f8904cc..54aa71d 100644 --- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro +++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro @@ -25,6 +25,5 @@ wince* { DEPLOYMENT += catalog } -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro index 59199a4..7394ec9 100644 --- a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro +++ b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro @@ -6,4 +6,3 @@ SOURCES += tst_xmlpatternsschema.cpp \ include (../xmlpatterns.pri) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro index a1e7896..15c31b6 100644 --- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro +++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro @@ -22,6 +22,5 @@ INCLUDEPATH += \ ../xmlpatternsxqts \ ../xmlpatternssdk -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro index b932d49..254d37b 100644 --- a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro +++ b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro @@ -81,4 +81,3 @@ 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 216cbea..55c4ec0 100644 --- a/tests/auto/xmlpatternsvalidator/xmlpatternsvalidator.pro +++ b/tests/auto/xmlpatternsvalidator/xmlpatternsvalidator.pro @@ -5,4 +5,3 @@ SOURCES += tst_xmlpatternsvalidator.cpp \ ../qxmlquery/TestFundament.cpp include (../xmlpatterns.pri) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/xmlpatternsview/xmlpatternsview.pro b/tests/auto/xmlpatternsview/xmlpatternsview.pro index c5ae493..2fd12ab 100644 --- a/tests/auto/xmlpatternsview/xmlpatternsview.pro +++ b/tests/auto/xmlpatternsview/xmlpatternsview.pro @@ -11,4 +11,3 @@ 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 41e9c68..9040502 100644 --- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro +++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro @@ -16,6 +16,5 @@ INCLUDEPATH += $$(QTDIR)/include/QtXmlPatterns/private \ QT += xml testlib TARGET = tst_xmlpatternsxqts -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro index 3df3d78..f9dc1c2 100644 --- a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro +++ b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro @@ -23,4 +23,3 @@ wince*: { } requires(contains(QT_CONFIG,private_tests)) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |