From 862cee05849ab7f069d204b089d55d4449841e16 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 12 May 2011 09:25:35 +1000 Subject: [PATCH] tests: remove contains(QT_CONFIG,xmlpatterns) conditional Tests which live within xmlpatterns should not test if xmlpatterns is enabled. It's confusing and unnecessary. Reviewed-by: Jason McDonald Change-Id: Icd459841f7480118502cf5d2cb57cca2d4e600fe --- tests/auto/headersclean/headersclean.pro | 4 +--- tests/auto/xmlpatterns.pri | 6 ++---- tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro | 2 -- tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro | 2 -- tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro | 6 ++---- tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro | 2 -- 6 files changed, 5 insertions(+), 17 deletions(-) diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index dd7fa09..737edce 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,5 +1,3 @@ load(qttest_p4) SOURCES += tst_headersclean.cpp -QT = core - -contains(QT_CONFIG,xmlpatterns): QT += xmlpatterns +QT = core xmlpatterns diff --git a/tests/auto/xmlpatterns.pri b/tests/auto/xmlpatterns.pri index 57b8517..67a2d44 100644 --- a/tests/auto/xmlpatterns.pri +++ b/tests/auto/xmlpatterns.pri @@ -1,7 +1,5 @@ -contains(QT_CONFIG,xmlpatterns) { - DEFINES += QTEST_XMLPATTERNS - QT += xmlpatterns -} +DEFINES += QTEST_XMLPATTERNS +QT += xmlpatterns wince*: { patternsdk.files = $$QT_BUILD_TREE/lib/QtXmlPatternsSDK*.dll diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro index 3e252f6..2db9dbd 100644 --- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro +++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro @@ -6,11 +6,9 @@ include (../xmlpatterns.pri) TARGET = tst_xmlpatternsdiagnosticsts -contains(QT_CONFIG, xmlpatterns) { HEADERS += ../xmlpatternsxqts/tst_suitetest.h SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp LIBS += -l$$XMLPATTERNS_SDK -} QT += xml diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro index f36211e..44766a9 100644 --- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro +++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro @@ -4,10 +4,8 @@ SOURCES += tst_xmlpatternsschemats.cpp \ include (../xmlpatterns.pri) -contains(QT_CONFIG,xmlpatterns) { HEADERS += ../xmlpatternsxqts/tst_suitetest.h SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp -} PATTERNIST_SDK = QtXmlPatternsSDK if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro index e81888a..1fb7539 100644 --- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro +++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro @@ -3,10 +3,8 @@ SOURCES += tst_xmlpatternsxqts.cpp ../qxmlquery/TestFundament.cpp tst_suitetest. include(../xmlpatterns.pri) -contains(QT_CONFIG,xmlpatterns) { - HEADERS += tst_suitetest.h - LIBS += -l$$XMLPATTERNS_SDK -} +HEADERS += tst_suitetest.h +LIBS += -l$$XMLPATTERNS_SDK # syncqt doesn't copy headers in tools/ so let's manually ensure # it works with shadow builds and source builds. diff --git a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro index 44c4754..2bb8844 100644 --- a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro +++ b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro @@ -4,11 +4,9 @@ SOURCES += tst_xmlpatternsxslts.cpp \ include (../xmlpatterns.pri) -contains(QT_CONFIG,xmlpatterns) { HEADERS += ../xmlpatternsxqts/tst_suitetest.h SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp LIBS += -l$$XMLPATTERNS_SDK -} QT += xml INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternssdk \ -- 2.7.4