From 32d692798fef2cb34a0894959b83b7eab95649dd Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 12 Oct 2011 16:21:52 +1000 Subject: [PATCH] Remove dead code from autotests. tests/auto/xmlpatterns.pri ensured that QTEST_XMLPATTERNS was always defined, so the preprocessor directives using this define were redundant. Change-Id: Id21d8b5cc4586ce0e92c1ee4a22c582eb3f76245 Reviewed-on: http://codereview.qt-project.org/6493 Sanity-Review: Qt Sanity Bot Reviewed-by: Rohan McGovern --- tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp | 6 ------ .../patternistexamplefiletree/tst_patternistexamplefiletree.cpp | 5 ----- tests/auto/patternistexamples/tst_patternistexamples.cpp | 5 ----- tests/auto/patternistheaders/tst_patternistheaders.cpp | 4 ---- tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp | 6 ------ tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp | 5 ----- .../qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp | 5 ----- tests/auto/qabstractxmlnodemodel/LoadingModel.cpp | 2 -- tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp | 5 ----- tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp | 5 +---- tests/auto/qautoptr/tst_qautoptr.cpp | 5 ----- tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp | 5 ----- tests/auto/qsourcelocation/tst_qsourcelocation.cpp | 6 ------ tests/auto/qxmlformatter/tst_qxmlformatter.cpp | 5 +---- tests/auto/qxmlitem/tst_qxmlitem.cpp | 5 ----- tests/auto/qxmlname/tst_qxmlname.cpp | 5 +---- tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp | 5 +---- tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp | 5 ----- tests/auto/qxmlquery/MessageValidator.cpp | 3 --- tests/auto/qxmlquery/tst_qxmlquery.cpp | 5 ----- tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp | 5 +---- tests/auto/qxmlschema/tst_qxmlschema.cpp | 5 ----- tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp | 5 ----- tests/auto/qxmlserializer/tst_qxmlserializer.cpp | 4 ---- tests/auto/xmlpatterns.pri | 1 - tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 5 ----- .../auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp | 5 ----- tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp | 5 ----- tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp | 5 ----- tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp | 5 ----- tests/auto/xmlpatternsxqts/tst_suitetest.cpp | 4 ---- tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp | 5 ----- tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp | 5 ----- 33 files changed, 5 insertions(+), 151 deletions(-) diff --git a/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp b/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp index 81e91ab..92de39b 100644 --- a/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp +++ b/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp @@ -43,9 +43,6 @@ #include #include -/* We use Patternist, so without it, we won't build. */ -#ifdef QTEST_XMLPATTERNS - #include #include #include "../qxmlquery/TestFundament.h" @@ -119,8 +116,5 @@ void tst_CheckXMLFiles::checkXMLFiles_data() const QTEST_MAIN(tst_CheckXMLFiles) #include "tst_checkxmlfiles.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp b/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp index a45accc..1e8b8e8 100644 --- a/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp +++ b/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - /*! \class tst_PatternistExampleFileTree \internal @@ -67,8 +65,5 @@ void tst_PatternistExampleFileTree::run() const QTEST_MAIN(tst_PatternistExampleFileTree) #include "tst_patternistexamplefiletree.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/patternistexamples/tst_patternistexamples.cpp b/tests/auto/patternistexamples/tst_patternistexamples.cpp index e71a47d..e3069c0 100644 --- a/tests/auto/patternistexamples/tst_patternistexamples.cpp +++ b/tests/auto/patternistexamples/tst_patternistexamples.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include #include #include @@ -366,8 +364,5 @@ void tst_PatternistExamples::buildSnippets() const QTEST_MAIN(tst_PatternistExamples) #include "tst_patternistexamples.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/patternistheaders/tst_patternistheaders.cpp b/tests/auto/patternistheaders/tst_patternistheaders.cpp index 0069b4c..f62937e 100644 --- a/tests/auto/patternistheaders/tst_patternistheaders.cpp +++ b/tests/auto/patternistheaders/tst_patternistheaders.cpp @@ -42,7 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS /*! \class tst_PatternistHeaders \internal @@ -136,8 +135,5 @@ void tst_PatternistHeaders::run() const QTEST_MAIN(tst_PatternistHeaders) #include "tst_patternistheaders.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp b/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp index 873e8ba..b0a72e1 100644 --- a/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp +++ b/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp @@ -43,9 +43,6 @@ #include #include -#ifdef QTEST_XMLPATTERNS -#include - /* We expect these headers to be available. */ #include #include @@ -185,8 +182,5 @@ void tst_QAbstractMessageHandler::hasQ_OBJECTMacro() const QTEST_MAIN(tst_QAbstractMessageHandler) #include "tst_qabstractmessagehandler.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp b/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp index 6425382..1535f32 100644 --- a/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp +++ b/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp @@ -43,8 +43,6 @@ #include #include -#ifdef QTEST_XMLPATTERNS - /* We expect these headers to be available. */ #include #include @@ -125,8 +123,5 @@ void tst_QAbstractUriResolver::hasQ_OBJECTMacro() const QTEST_MAIN(tst_QAbstractUriResolver) #include "tst_qabstracturiresolver.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp b/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp index 3688a6d..ca06178 100644 --- a/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp +++ b/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include "private/qabstractxmlforwarditerator_p.h" /*! @@ -82,6 +80,3 @@ void tst_QAbstractXmlForwardIterator::objectSize() const QTEST_MAIN(tst_QAbstractXmlForwardIterator) #include "tst_qabstractxmlforwarditerator.moc" -#else //QTEST_XMLPATTERNS -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp index 794eb4f..3e42704 100644 --- a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp +++ b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp @@ -42,7 +42,6 @@ #include #include -#ifdef QTEST_XMLPATTERNS #include #include #include @@ -367,4 +366,3 @@ QAbstractXmlNodeModel::Ptr LoadingModel::create(const QXmlNamePool &np) return Ptr(new LoadingModel(loader.m_result, np)); } -#endif //QTEST_XMLPATTERNS diff --git a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp index f42108c..9da1c70 100644 --- a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp +++ b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp @@ -43,8 +43,6 @@ #include #include -#ifdef QTEST_XMLPATTERNS - #include #include #include @@ -400,8 +398,5 @@ void tst_QAbstractXmlNodeModel::sourceLocation() const QTEST_MAIN(tst_QAbstractXmlNodeModel) #include "tst_qabstractxmlnodemodel.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp b/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp index c3bacdf..443f5e8 100644 --- a/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp +++ b/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp @@ -42,7 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS #include #include @@ -89,7 +88,5 @@ void tst_QAbstractXmlReceiver::charactersStringRef() const QTEST_MAIN(tst_QAbstractXmlReceiver) #include "tst_qabstractxmlreceiver.moc" -#else -QTEST_NOOP_MAIN -#endif + // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/qautoptr/tst_qautoptr.cpp b/tests/auto/qautoptr/tst_qautoptr.cpp index 14a1de9..8fa0355 100644 --- a/tests/auto/qautoptr/tst_qautoptr.cpp +++ b/tests/auto/qautoptr/tst_qautoptr.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include "private/qautoptr_p.h" using namespace QPatternist; @@ -334,6 +332,3 @@ void tst_QAutoPtr::operatorBoolSignature() const QTEST_MAIN(tst_QAutoPtr) #include "tst_qautoptr.moc" -#else -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp index ed09c08..77da722 100644 --- a/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp +++ b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include #include #include @@ -167,6 +165,3 @@ void tst_QSimpleXmlNodeModel::stringValue() const QTEST_MAIN(tst_QSimpleXmlNodeModel) #include "tst_qsimplexmlnodemodel.moc" -#else //QTEST_XMLPATTERNS -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp index 5d955d4..b6da435 100644 --- a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp +++ b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp @@ -42,9 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS -#include - /* We expect these headers to be available. */ #include #include @@ -391,8 +388,5 @@ void tst_QSourceLocation::withQHash() const QTEST_MAIN(tst_QSourceLocation) #include "tst_qsourcelocation.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/qxmlformatter/tst_qxmlformatter.cpp b/tests/auto/qxmlformatter/tst_qxmlformatter.cpp index 287ca0f..07094a5 100644 --- a/tests/auto/qxmlformatter/tst_qxmlformatter.cpp +++ b/tests/auto/qxmlformatter/tst_qxmlformatter.cpp @@ -42,7 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS #include #include @@ -199,7 +198,5 @@ void tst_QXmlFormatter::cleanupTestCase() const QTEST_MAIN(tst_QXmlFormatter) #include "tst_qxmlformatter.moc" -#else -QTEST_NOOP_MAIN -#endif + // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/qxmlitem/tst_qxmlitem.cpp b/tests/auto/qxmlitem/tst_qxmlitem.cpp index 8b83798..8583a04 100644 --- a/tests/auto/qxmlitem/tst_qxmlitem.cpp +++ b/tests/auto/qxmlitem/tst_qxmlitem.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include /*! @@ -368,6 +366,3 @@ void tst_QXmlItem::withinQVariant() const QTEST_MAIN(tst_QXmlItem) #include "tst_qxmlitem.moc" -#else //QTEST_XMLPATTERNS -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/qxmlname/tst_qxmlname.cpp b/tests/auto/qxmlname/tst_qxmlname.cpp index edaff22..2a24de3 100644 --- a/tests/auto/qxmlname/tst_qxmlname.cpp +++ b/tests/auto/qxmlname/tst_qxmlname.cpp @@ -42,7 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS #include #include @@ -559,7 +558,5 @@ void tst_QXmlName::fromClarkNameSignature() const QTEST_MAIN(tst_QXmlName) #include "tst_qxmlname.moc" -#else -QTEST_NOOP_MAIN -#endif + // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp b/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp index 8ab45fb..f34efc7 100644 --- a/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp +++ b/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp @@ -42,7 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS #include #include @@ -84,7 +83,5 @@ void tst_QXmlNamePool::assignmentOperator() const QTEST_MAIN(tst_QXmlNamePool) #include "tst_qxmlnamepool.moc" -#else -QTEST_NOOP_MAIN -#endif + // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp index ed41763..5b1f09d 100644 --- a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp +++ b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include /*! @@ -192,6 +190,3 @@ void tst_QXmlNodeModelIndex::withqHash() const QTEST_MAIN(tst_QXmlNodeModelIndex) #include "tst_qxmlnodemodelindex.moc" -#else //QTEST_XMLPATTERNS -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/qxmlquery/MessageValidator.cpp b/tests/auto/qxmlquery/MessageValidator.cpp index 0a588f6..bf75d86 100644 --- a/tests/auto/qxmlquery/MessageValidator.cpp +++ b/tests/auto/qxmlquery/MessageValidator.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ -#ifdef QTEST_XMLPATTERNS #include #include "MessageValidator.h" @@ -97,5 +96,3 @@ QString MessageValidator::received() const { return m_received; } - -#endif //QTEST_XMLPATTERNS diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index b56c373..c524282 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include #include #include @@ -3477,6 +3475,3 @@ void tst_QXmlQuery::identityConstraintFailure_data() const QTEST_MAIN(tst_QXmlQuery) #include "tst_qxmlquery.moc" -#else //QTEST_XMLPATTERNS -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp b/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp index b4dee78..ea0b985 100644 --- a/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp +++ b/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp @@ -42,7 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS #include #include #include @@ -234,7 +233,5 @@ void tst_QXmlResultItems::evalateWithQueryError() const QTEST_MAIN(tst_QXmlResultItems) #include "tst_qxmlresultitems.moc" -#else -QTEST_NOOP_MAIN -#endif + // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/qxmlschema/tst_qxmlschema.cpp b/tests/auto/qxmlschema/tst_qxmlschema.cpp index 9743b9b..07ff4ce 100644 --- a/tests/auto/qxmlschema/tst_qxmlschema.cpp +++ b/tests/auto/qxmlschema/tst_qxmlschema.cpp @@ -41,8 +41,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include #include #include @@ -401,6 +399,3 @@ void tst_QXmlSchema::uriResolver() const QTEST_MAIN(tst_QXmlSchema) #include "tst_qxmlschema.moc" -#else //QTEST_PATTERNIST -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp b/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp index 75b8a74..2c1c24a 100644 --- a/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp +++ b/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp @@ -41,8 +41,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include #include #include @@ -474,6 +472,3 @@ void tst_QXmlSchemaValidator::uriResolver() const QTEST_MAIN(tst_QXmlSchemaValidator) #include "tst_qxmlschemavalidator.moc" -#else //QTEST_PATTERNIST -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/qxmlserializer/tst_qxmlserializer.cpp b/tests/auto/qxmlserializer/tst_qxmlserializer.cpp index 86cc622..7fca99a 100644 --- a/tests/auto/qxmlserializer/tst_qxmlserializer.cpp +++ b/tests/auto/qxmlserializer/tst_qxmlserializer.cpp @@ -42,7 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS #include #include #include @@ -191,8 +190,5 @@ void tst_QXmlSerializer::cleanUpTestCase() const QTEST_MAIN(tst_QXmlSerializer) #include "tst_qxmlserializer.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/xmlpatterns.pri b/tests/auto/xmlpatterns.pri index d3e9625..631ed7f 100644 --- a/tests/auto/xmlpatterns.pri +++ b/tests/auto/xmlpatterns.pri @@ -1,4 +1,3 @@ -DEFINES += QTEST_XMLPATTERNS QT += core-private xmlpatterns xmlpatterns-private wince*: { diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index d52d3bc..ebe395a 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -43,8 +43,6 @@ #include #include -#ifdef QTEST_XMLPATTERNS - #include "../qxmlquery/TestFundament.h" #include "../network-settings.h" @@ -1015,8 +1013,5 @@ void tst_XmlPatterns::xsltSupport_data() const QTEST_MAIN(tst_XmlPatterns) #include "tst_xmlpatterns.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp index de8fd9d..cd0bd11 100644 --- a/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp +++ b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include "tst_suitetest.h" /*! @@ -73,8 +71,5 @@ void tst_XmlPatternsDiagnosticsTS::catalogPath(QString &write) const QTEST_MAIN(tst_XmlPatternsDiagnosticsTS) #include "tst_xmlpatternsdiagnosticsts.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp b/tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp index cca2ede..4be52e7 100644 --- a/tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp +++ b/tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp @@ -41,8 +41,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include "tst_suitetest.h" /*! @@ -71,8 +69,5 @@ void tst_XmlPatternsSchemaTS::catalogPath(QString &write) const QTEST_MAIN(tst_XmlPatternsSchemaTS) #include "tst_xmlpatternsschemats.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp index 817ea1a..cb94bcf 100644 --- a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp +++ b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp @@ -42,8 +42,6 @@ #include #include -#ifdef QTEST_XMLPATTERNS - #include "../qxmlquery/TestFundament.h" #include "../network-settings.h" @@ -227,8 +225,5 @@ void tst_XmlPatternsValidator::xsdSupport_data() const QTEST_MAIN(tst_XmlPatternsValidator) #include "tst_xmlpatternsvalidator.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp b/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp index aceda7e..ad21f0d 100644 --- a/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp +++ b/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - /*! \class tst_XmlPatternsView \internal @@ -69,6 +67,3 @@ void tst_XmlPatternsView::run() const QTEST_MAIN(tst_XmlPatternsView) #include "tst_xmlpatternsview.moc" -#else //QTEST_XMLPATTERNS -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp index 76b7893..53541ac 100644 --- a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp +++ b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include #include "TestSuite.h" #include "TestSuiteResult.h" @@ -172,7 +170,5 @@ bool tst_SuiteTest::dontRun() const { return m_abortRun; } -#endif - // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp index ec14872..adb1f28 100644 --- a/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp +++ b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include "tst_suitetest.h" /*! @@ -99,8 +97,5 @@ void tst_XmlPatternsXQTS::catalogPath(QString &write) const QTEST_MAIN(tst_XmlPatternsXQTS) #include "tst_xmlpatternsxqts.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 diff --git a/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp b/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp index 3f1e018..6c21f98 100644 --- a/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp +++ b/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp @@ -42,8 +42,6 @@ #include -#ifdef QTEST_XMLPATTERNS - #include "tst_suitetest.h" /*! @@ -73,8 +71,5 @@ void tst_XmlPatternsXSLTS::catalogPath(QString &write) const QTEST_MAIN(tst_XmlPatternsXSLTS) #include "tst_xmlpatternsxslts.moc" -#else -QTEST_NOOP_MAIN -#endif // vim: et:ts=4:sw=4:sts=4 -- 2.7.4