diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-16 15:34:50 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-17 16:12:08 +1000 |
commit | 2d67f6efc47986e8f6d69943f0986d18ae2ced96 (patch) | |
tree | 42b8e16e73c021ffabba0b82b12f0f533ce8aa11 | |
parent | 0cdf33e9acb00b8f3654e8268253a3fb7c5db92c (diff) |
Fixed compile of xmlpatterns tests with vcproj generator.
These tests were adding the same SUBDIR multiple times from different
projects. Don't do that.
-rw-r--r-- | tests/auto/auto.pro | 9 | ||||
-rw-r--r-- | tests/auto/xmlpatternsdiagnosticsts/test/test.pro | 32 | ||||
-rw-r--r-- | tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp (renamed from tests/auto/xmlpatternsdiagnosticsts/test/tst_xmlpatternsdiagnosticsts.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro | 30 | ||||
-rw-r--r-- | tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro | 14 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ASTItem.cpp (renamed from tests/auto/xmlpatternsxqts/lib/ASTItem.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ASTItem.h (renamed from tests/auto/xmlpatternsxqts/lib/ASTItem.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp (renamed from tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/DebugExpressionFactory.h (renamed from tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ErrorHandler.cpp (renamed from tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ErrorHandler.h (renamed from tests/auto/xmlpatternsxqts/lib/ErrorHandler.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ErrorItem.cpp (renamed from tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ErrorItem.h (renamed from tests/auto/xmlpatternsxqts/lib/ErrorItem.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ExitCode.h (renamed from tests/auto/xmlpatternsxqts/lib/ExitCode.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ExpressionInfo.cpp (renamed from tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ExpressionInfo.h (renamed from tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ExpressionNamer.cpp (renamed from tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ExpressionNamer.h (renamed from tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp (renamed from tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ExternalSourceLoader.h (renamed from tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/Global.cpp (renamed from tests/auto/xmlpatternsxqts/lib/Global.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/Global.h (renamed from tests/auto/xmlpatternsxqts/lib/Global.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ResultThreader.cpp (renamed from tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/ResultThreader.h (renamed from tests/auto/xmlpatternsxqts/lib/ResultThreader.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestBaseLine.cpp (renamed from tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestBaseLine.h (renamed from tests/auto/xmlpatternsxqts/lib/TestBaseLine.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestCase.cpp (renamed from tests/auto/xmlpatternsxqts/lib/TestCase.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestCase.h (renamed from tests/auto/xmlpatternsxqts/lib/TestCase.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestContainer.cpp (renamed from tests/auto/xmlpatternsxqts/lib/TestContainer.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestContainer.h (renamed from tests/auto/xmlpatternsxqts/lib/TestContainer.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestGroup.cpp (renamed from tests/auto/xmlpatternsxqts/lib/TestGroup.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestGroup.h (renamed from tests/auto/xmlpatternsxqts/lib/TestGroup.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestItem.h (renamed from tests/auto/xmlpatternsxqts/lib/TestItem.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestResult.cpp (renamed from tests/auto/xmlpatternsxqts/lib/TestResult.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestResult.h (renamed from tests/auto/xmlpatternsxqts/lib/TestResult.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestResultHandler.cpp (renamed from tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestResultHandler.h (renamed from tests/auto/xmlpatternsxqts/lib/TestResultHandler.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestSuite.cpp (renamed from tests/auto/xmlpatternsxqts/lib/TestSuite.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestSuite.h (renamed from tests/auto/xmlpatternsxqts/lib/TestSuite.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestSuiteHandler.cpp (renamed from tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestSuiteHandler.h (renamed from tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestSuiteResult.cpp (renamed from tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestSuiteResult.h (renamed from tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TreeItem.cpp (renamed from tests/auto/xmlpatternsxqts/lib/TreeItem.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TreeItem.h (renamed from tests/auto/xmlpatternsxqts/lib/TreeItem.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TreeModel.cpp (renamed from tests/auto/xmlpatternsxqts/lib/TreeModel.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TreeModel.h (renamed from tests/auto/xmlpatternsxqts/lib/TreeModel.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/Worker.cpp (renamed from tests/auto/xmlpatternsxqts/lib/Worker.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/Worker.h (renamed from tests/auto/xmlpatternsxqts/lib/Worker.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XMLWriter.cpp (renamed from tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XMLWriter.h (renamed from tests/auto/xmlpatternsxqts/lib/XMLWriter.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XQTSTestCase.cpp (renamed from tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XQTSTestCase.h (renamed from tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XSDTSTestCase.cpp (renamed from tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XSDTSTestCase.h (renamed from tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp (renamed from tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h (renamed from tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp (renamed from tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h (renamed from tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp (renamed from tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExample.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/docs/XMLIndenterExampleResult.xml (renamed from tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExampleResult.xml) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp (renamed from tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExample.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/docs/XMLWriterExampleResult.xml (renamed from tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExampleResult.xml) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp (renamed from tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/tests/XMLWriterTest.h (renamed from tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/xmlpatternssdk.pro (renamed from tests/auto/xmlpatternsxqts/lib/lib.pro) | 2 | ||||
-rw-r--r-- | tests/auto/xmlpatternsview/test/test.pro | 17 | ||||
-rw-r--r-- | tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp (renamed from tests/auto/xmlpatternsview/test/tst_xmlpatternsview.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternsview/xmlpatternsview.pro | 15 | ||||
-rw-r--r-- | tests/auto/xmlpatternsxqts/test/test.pro | 26 | ||||
-rw-r--r-- | tests/auto/xmlpatternsxqts/tst_suitetest.cpp (renamed from tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternsxqts/tst_suitetest.h (renamed from tests/auto/xmlpatternsxqts/test/tst_suitetest.h) | 2 | ||||
-rw-r--r-- | tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp (renamed from tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro | 26 | ||||
-rw-r--r-- | tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro | 14 |
75 files changed, 73 insertions, 114 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 9961e25d7b..af9832ceaf 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -518,15 +518,16 @@ SUBDIRS += checkxmlfiles \ xmlpatternsdiagnosticsts \ xmlpatternsschema \ xmlpatternsschemats \ + xmlpatternssdk \ xmlpatternsvalidator \ xmlpatternsview \ xmlpatternsxqts \ xmlpatternsxslts -xmlpatternsdiagnosticsts.depends = xmlpatternsxqts -xmlpatternsview.depends = xmlpatternsxqts -xmlpatternsxslts.depends = xmlpatternsxqts -xmlpatternsschemats.depends = xmlpatternsxqts +xmlpatternsdiagnosticsts.depends = xmlpatternssdk +xmlpatternsview.depends = xmlpatternssdk +xmlpatternsxslts.depends = xmlpatternssdk +xmlpatternsschemats.depends = xmlpatternssdk } unix:!embedded:contains(QT_CONFIG, dbus):SUBDIRS += \ diff --git a/tests/auto/xmlpatternsdiagnosticsts/test/test.pro b/tests/auto/xmlpatternsdiagnosticsts/test/test.pro deleted file mode 100644 index acd71e4382..0000000000 --- a/tests/auto/xmlpatternsdiagnosticsts/test/test.pro +++ /dev/null @@ -1,32 +0,0 @@ -load(qttest_p4) -SOURCES += tst_xmlpatternsdiagnosticsts.cpp \ - ../../qxmlquery/TestFundament.cpp - -include (../../xmlpatterns.pri) - -TARGET = tst_xmlpatternsdiagnosticsts -DESTDIR = .. -win32 { - CONFIG(debug, debug|release): DESTDIR = ../debug - else: DESTDIR = ../release -} - -contains(QT_CONFIG, xmlpatterns) { -HEADERS += ../../xmlpatternsxqts/test/tst_suitetest.h -SOURCES += ../../xmlpatternsxqts/test/tst_suitetest.cpp -LIBS += -l$$XMLPATTERNS_SDK -} - -QT += xml - -INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternsxqts/lib/ \ - $$(QTDIR)/include/QtXmlPatterns/private \ - $$(QTSRCDIR)/tests/auto/xmlpatternsxqts/test \ - ../../xmlpatternsxqts/test \ - ../../xmlpatternsxqts/lib - -wince*|symbian { - catalog.sources = ../TestSuite ../Baseline.xml - catalog.path = . - DEPLOYMENT += catalog -} diff --git a/tests/auto/xmlpatternsdiagnosticsts/test/tst_xmlpatternsdiagnosticsts.cpp b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp index 4a11404965..4a11404965 100644 --- a/tests/auto/xmlpatternsdiagnosticsts/test/tst_xmlpatternsdiagnosticsts.cpp +++ b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro index 3d82eaf438..981adab764 100644 --- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro +++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro @@ -1,5 +1,27 @@ -TEMPLATE = subdirs -CONFIG += ordered +load(qttest_p4) +SOURCES += tst_xmlpatternsdiagnosticsts.cpp \ + ../qxmlquery/TestFundament.cpp -SUBDIRS = ../xmlpatternsxqts test -requires(contains(QT_CONFIG,private_tests)) +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 + +INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternssdk \ + $$(QTDIR)/include/QtXmlPatterns/private \ + $$(QTSRCDIR)/tests/auto/xmlpatternsxqts \ + ../xmlpatternsxqts \ + ../xmlpatternssdk + +wince*|symbian { + catalog.sources = TestSuite Baseline.xml + catalog.path = . + DEPLOYMENT += catalog +} diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro index 0f55078f0a..f36211e13d 100644 --- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro +++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro @@ -5,8 +5,8 @@ SOURCES += tst_xmlpatternsschemats.cpp \ include (../xmlpatterns.pri) contains(QT_CONFIG,xmlpatterns) { -HEADERS += ../xmlpatternsxqts/test/tst_suitetest.h -SOURCES += ../xmlpatternsxqts/test/tst_suitetest.cpp +HEADERS += ../xmlpatternsxqts/tst_suitetest.h +SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp } PATTERNIST_SDK = QtXmlPatternsSDK @@ -20,8 +20,8 @@ LIBS += -l$$PATTERNIST_SDK QT += xml -INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto/xmlpatternsxqts/lib/ \ - $$QT_BUILD_TREE/include/QtXmlPatterns/private \ - $$QT_SOURCE_TREE/tests/auto/xmlpatternsxqts/test \ - ../xmlpatternsxqts/test \ - ../xmlpatternsxqts/lib +INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto/xmlpatternssdk/ \ + $$QT_BUILD_TREE/include/QtXmlPatterns/private \ + $$QT_SOURCE_TREE/tests/auto/xmlpatternsxqts \ + ../xmlpatternsxqts \ + ../xmlpatternssdk diff --git a/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp b/tests/auto/xmlpatternssdk/ASTItem.cpp index 3b4fbdc865..3b4fbdc865 100644 --- a/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp +++ b/tests/auto/xmlpatternssdk/ASTItem.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/ASTItem.h b/tests/auto/xmlpatternssdk/ASTItem.h index ca3ac8f199..ca3ac8f199 100644 --- a/tests/auto/xmlpatternsxqts/lib/ASTItem.h +++ b/tests/auto/xmlpatternssdk/ASTItem.h diff --git a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp index 1b5121e96b..1b5121e96b 100644 --- a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp +++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h index d5e676d0c6..d5e676d0c6 100644 --- a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h +++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp b/tests/auto/xmlpatternssdk/ErrorHandler.cpp index 3f07737fa4..3f07737fa4 100644 --- a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp +++ b/tests/auto/xmlpatternssdk/ErrorHandler.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h b/tests/auto/xmlpatternssdk/ErrorHandler.h index 25447a967e..25447a967e 100644 --- a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h +++ b/tests/auto/xmlpatternssdk/ErrorHandler.h diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp b/tests/auto/xmlpatternssdk/ErrorItem.cpp index 57edc1f764..57edc1f764 100644 --- a/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp +++ b/tests/auto/xmlpatternssdk/ErrorItem.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorItem.h b/tests/auto/xmlpatternssdk/ErrorItem.h index 1d05872c47..1d05872c47 100644 --- a/tests/auto/xmlpatternsxqts/lib/ErrorItem.h +++ b/tests/auto/xmlpatternssdk/ErrorItem.h diff --git a/tests/auto/xmlpatternsxqts/lib/ExitCode.h b/tests/auto/xmlpatternssdk/ExitCode.h index e1810b1dd3..e1810b1dd3 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExitCode.h +++ b/tests/auto/xmlpatternssdk/ExitCode.h diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp b/tests/auto/xmlpatternssdk/ExpressionInfo.cpp index abbc8b3db8..abbc8b3db8 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp +++ b/tests/auto/xmlpatternssdk/ExpressionInfo.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h b/tests/auto/xmlpatternssdk/ExpressionInfo.h index 2d9d398aeb..2d9d398aeb 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h +++ b/tests/auto/xmlpatternssdk/ExpressionInfo.h diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp b/tests/auto/xmlpatternssdk/ExpressionNamer.cpp index 605c754fe3..605c754fe3 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp +++ b/tests/auto/xmlpatternssdk/ExpressionNamer.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h b/tests/auto/xmlpatternssdk/ExpressionNamer.h index 129d8d7f68..129d8d7f68 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h +++ b/tests/auto/xmlpatternssdk/ExpressionNamer.h diff --git a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp index a83a100f6c..a83a100f6c 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp +++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h index 2d88222677..2d88222677 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h +++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h diff --git a/tests/auto/xmlpatternsxqts/lib/Global.cpp b/tests/auto/xmlpatternssdk/Global.cpp index f78e4211ae..f78e4211ae 100644 --- a/tests/auto/xmlpatternsxqts/lib/Global.cpp +++ b/tests/auto/xmlpatternssdk/Global.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/Global.h b/tests/auto/xmlpatternssdk/Global.h index 53c32cbb6a..53c32cbb6a 100644 --- a/tests/auto/xmlpatternsxqts/lib/Global.h +++ b/tests/auto/xmlpatternssdk/Global.h diff --git a/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp b/tests/auto/xmlpatternssdk/ResultThreader.cpp index 3296854dcc..3296854dcc 100644 --- a/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp +++ b/tests/auto/xmlpatternssdk/ResultThreader.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/ResultThreader.h b/tests/auto/xmlpatternssdk/ResultThreader.h index 19749f0ac7..19749f0ac7 100644 --- a/tests/auto/xmlpatternsxqts/lib/ResultThreader.h +++ b/tests/auto/xmlpatternssdk/ResultThreader.h diff --git a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp b/tests/auto/xmlpatternssdk/TestBaseLine.cpp index 6a46bcc81b..6a46bcc81b 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp +++ b/tests/auto/xmlpatternssdk/TestBaseLine.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.h b/tests/auto/xmlpatternssdk/TestBaseLine.h index e297128c5d..e297128c5d 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.h +++ b/tests/auto/xmlpatternssdk/TestBaseLine.h diff --git a/tests/auto/xmlpatternsxqts/lib/TestCase.cpp b/tests/auto/xmlpatternssdk/TestCase.cpp index 7b424d2e7b..7b424d2e7b 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestCase.cpp +++ b/tests/auto/xmlpatternssdk/TestCase.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/TestCase.h b/tests/auto/xmlpatternssdk/TestCase.h index 28df5f1e46..28df5f1e46 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestCase.h +++ b/tests/auto/xmlpatternssdk/TestCase.h diff --git a/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp b/tests/auto/xmlpatternssdk/TestContainer.cpp index ec6196c9fb..ec6196c9fb 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp +++ b/tests/auto/xmlpatternssdk/TestContainer.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/TestContainer.h b/tests/auto/xmlpatternssdk/TestContainer.h index 5b93491393..5b93491393 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestContainer.h +++ b/tests/auto/xmlpatternssdk/TestContainer.h diff --git a/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp b/tests/auto/xmlpatternssdk/TestGroup.cpp index f2cd2bd23d..f2cd2bd23d 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp +++ b/tests/auto/xmlpatternssdk/TestGroup.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/TestGroup.h b/tests/auto/xmlpatternssdk/TestGroup.h index 5f4798f9fd..5f4798f9fd 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestGroup.h +++ b/tests/auto/xmlpatternssdk/TestGroup.h diff --git a/tests/auto/xmlpatternsxqts/lib/TestItem.h b/tests/auto/xmlpatternssdk/TestItem.h index 0b3c606971..0b3c606971 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestItem.h +++ b/tests/auto/xmlpatternssdk/TestItem.h diff --git a/tests/auto/xmlpatternsxqts/lib/TestResult.cpp b/tests/auto/xmlpatternssdk/TestResult.cpp index 2374bc09ec..2374bc09ec 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestResult.cpp +++ b/tests/auto/xmlpatternssdk/TestResult.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/TestResult.h b/tests/auto/xmlpatternssdk/TestResult.h index 6951f90396..6951f90396 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestResult.h +++ b/tests/auto/xmlpatternssdk/TestResult.h diff --git a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp b/tests/auto/xmlpatternssdk/TestResultHandler.cpp index b87d481d4a..b87d481d4a 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp +++ b/tests/auto/xmlpatternssdk/TestResultHandler.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.h b/tests/auto/xmlpatternssdk/TestResultHandler.h index a786ac4dcf..a786ac4dcf 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.h +++ b/tests/auto/xmlpatternssdk/TestResultHandler.h diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp b/tests/auto/xmlpatternssdk/TestSuite.cpp index 2c3e49caaf..2c3e49caaf 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp +++ b/tests/auto/xmlpatternssdk/TestSuite.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuite.h b/tests/auto/xmlpatternssdk/TestSuite.h index d14dc629c5..d14dc629c5 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuite.h +++ b/tests/auto/xmlpatternssdk/TestSuite.h diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp index 7c687f3d51..7c687f3d51 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp +++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h b/tests/auto/xmlpatternssdk/TestSuiteHandler.h index 76156c07c2..76156c07c2 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h +++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.h diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp b/tests/auto/xmlpatternssdk/TestSuiteResult.cpp index 4e81859322..4e81859322 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp +++ b/tests/auto/xmlpatternssdk/TestSuiteResult.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h b/tests/auto/xmlpatternssdk/TestSuiteResult.h index 491c2b2123..491c2b2123 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h +++ b/tests/auto/xmlpatternssdk/TestSuiteResult.h diff --git a/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp b/tests/auto/xmlpatternssdk/TreeItem.cpp index b34262d9bd..b34262d9bd 100644 --- a/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp +++ b/tests/auto/xmlpatternssdk/TreeItem.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/TreeItem.h b/tests/auto/xmlpatternssdk/TreeItem.h index f5e051fec7..f5e051fec7 100644 --- a/tests/auto/xmlpatternsxqts/lib/TreeItem.h +++ b/tests/auto/xmlpatternssdk/TreeItem.h diff --git a/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp b/tests/auto/xmlpatternssdk/TreeModel.cpp index e27f8e00e7..e27f8e00e7 100644 --- a/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp +++ b/tests/auto/xmlpatternssdk/TreeModel.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/TreeModel.h b/tests/auto/xmlpatternssdk/TreeModel.h index 1d8ea7293d..1d8ea7293d 100644 --- a/tests/auto/xmlpatternsxqts/lib/TreeModel.h +++ b/tests/auto/xmlpatternssdk/TreeModel.h diff --git a/tests/auto/xmlpatternsxqts/lib/Worker.cpp b/tests/auto/xmlpatternssdk/Worker.cpp index 0121099635..0121099635 100644 --- a/tests/auto/xmlpatternsxqts/lib/Worker.cpp +++ b/tests/auto/xmlpatternssdk/Worker.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/Worker.h b/tests/auto/xmlpatternssdk/Worker.h index b3d7ae2328..b3d7ae2328 100644 --- a/tests/auto/xmlpatternsxqts/lib/Worker.h +++ b/tests/auto/xmlpatternssdk/Worker.h diff --git a/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp b/tests/auto/xmlpatternssdk/XMLWriter.cpp index 60a534477b..60a534477b 100644 --- a/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp +++ b/tests/auto/xmlpatternssdk/XMLWriter.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/XMLWriter.h b/tests/auto/xmlpatternssdk/XMLWriter.h index 2b629bb179..2b629bb179 100644 --- a/tests/auto/xmlpatternsxqts/lib/XMLWriter.h +++ b/tests/auto/xmlpatternssdk/XMLWriter.h diff --git a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp b/tests/auto/xmlpatternssdk/XQTSTestCase.cpp index 6a8645b8be..6a8645b8be 100644 --- a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp +++ b/tests/auto/xmlpatternssdk/XQTSTestCase.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h b/tests/auto/xmlpatternssdk/XQTSTestCase.h index 8872b3282f..8872b3282f 100644 --- a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h +++ b/tests/auto/xmlpatternssdk/XQTSTestCase.h diff --git a/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.cpp b/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp index 3cbb6811fb..3cbb6811fb 100644 --- a/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.cpp +++ b/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.h b/tests/auto/xmlpatternssdk/XSDTSTestCase.h index 947687abf1..947687abf1 100644 --- a/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.h +++ b/tests/auto/xmlpatternssdk/XSDTSTestCase.h diff --git a/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp index a868d1900f..a868d1900f 100644 --- a/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.cpp +++ b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h index 5493c7d272..5493c7d272 100644 --- a/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h +++ b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h diff --git a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp index cfc3b2b3dc..cfc3b2b3dc 100644 --- a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp +++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h index 86147894b7..86147894b7 100644 --- a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h +++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h diff --git a/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExample.cpp b/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp index 24ee1588cd..24ee1588cd 100644 --- a/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExample.cpp +++ b/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExampleResult.xml b/tests/auto/xmlpatternssdk/docs/XMLIndenterExampleResult.xml index c5e7312bc2..c5e7312bc2 100644 --- a/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExampleResult.xml +++ b/tests/auto/xmlpatternssdk/docs/XMLIndenterExampleResult.xml diff --git a/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExample.cpp b/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp index 24ee1588cd..24ee1588cd 100644 --- a/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExample.cpp +++ b/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExampleResult.xml b/tests/auto/xmlpatternssdk/docs/XMLWriterExampleResult.xml index c5e7312bc2..c5e7312bc2 100644 --- a/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExampleResult.xml +++ b/tests/auto/xmlpatternssdk/docs/XMLWriterExampleResult.xml diff --git a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp index a10c01ad9d..a10c01ad9d 100644 --- a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp +++ b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp diff --git a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h index f90aea2944..f90aea2944 100644 --- a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h +++ b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h diff --git a/tests/auto/xmlpatternsxqts/lib/lib.pro b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro index f5b0a06db4..6204f0178c 100644 --- a/tests/auto/xmlpatternsxqts/lib/lib.pro +++ b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro @@ -1,4 +1,4 @@ -include (../../xmlpatterns.pri) +include (../xmlpatterns.pri) TARGET = $$XMLPATTERNS_SDK TEMPLATE = lib diff --git a/tests/auto/xmlpatternsview/test/test.pro b/tests/auto/xmlpatternsview/test/test.pro deleted file mode 100644 index 6adff4d6da..0000000000 --- a/tests/auto/xmlpatternsview/test/test.pro +++ /dev/null @@ -1,17 +0,0 @@ -load(qttest_p4) -SOURCES += tst_xmlpatternsview.cpp - -include (../../xmlpatterns.pri) - -DESTDIR = .. -win32 { - CONFIG(debug, debug|release): DESTDIR = ../debug - else: DESTDIR = ../release -} -TARGET = tst_xmlpatternsview - -wince*: { - viewexe.sources = $$QT_BUILD_TREE/xmlpatternsview.exe - viewexe.path = . - DEPLOYMENT += viewexe -} diff --git a/tests/auto/xmlpatternsview/test/tst_xmlpatternsview.cpp b/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp index 91dee63fc5..91dee63fc5 100644 --- a/tests/auto/xmlpatternsview/test/tst_xmlpatternsview.cpp +++ b/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp diff --git a/tests/auto/xmlpatternsview/xmlpatternsview.pro b/tests/auto/xmlpatternsview/xmlpatternsview.pro index 04ee4d0efe..d93cba3cfb 100644 --- a/tests/auto/xmlpatternsview/xmlpatternsview.pro +++ b/tests/auto/xmlpatternsview/xmlpatternsview.pro @@ -1,9 +1,12 @@ -TEMPLATE = subdirs -CONFIG += ordered +load(qttest_p4) +SOURCES += tst_xmlpatternsview.cpp -SUBDIRS = ../xmlpatternsxqts test +include (../xmlpatterns.pri) -contains(QT_CONFIG,xmlpatterns) { - SUBDIRS += view +TARGET = tst_xmlpatternsview + +wince*: { + viewexe.sources = $$QT_BUILD_TREE/xmlpatternsview.exe + viewexe.path = . + DEPLOYMENT += viewexe } -requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/xmlpatternsxqts/test/test.pro b/tests/auto/xmlpatternsxqts/test/test.pro deleted file mode 100644 index a69838af5e..0000000000 --- a/tests/auto/xmlpatternsxqts/test/test.pro +++ /dev/null @@ -1,26 +0,0 @@ -load(qttest_p4) -SOURCES += tst_xmlpatternsxqts.cpp ../../qxmlquery/TestFundament.cpp tst_suitetest.cpp - -include(../../xmlpatterns.pri) - -contains(QT_CONFIG,xmlpatterns) { - 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. -INCLUDEPATH += $$(QTDIR)/include/QtXmlPatterns/private \ - $$(QTSRCDIR)/include/QtXmlPatterns/private \ - $$(QTSRCDIR)/tools/xmlpatterns \ - $$(QTDIR)/tools/xmlpatterns \ - ../lib/ - -CONFIG += testlib -QT += xml -DESTDIR = .. -win32 { - CONFIG(debug, debug|release): DESTDIR = ../debug - else: DESTDIR = ../release -} -TARGET = tst_xmlpatternsxqts diff --git a/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp index 64120c7c69..64120c7c69 100644 --- a/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp +++ b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp diff --git a/tests/auto/xmlpatternsxqts/test/tst_suitetest.h b/tests/auto/xmlpatternsxqts/tst_suitetest.h index 22e384a47e..70e56afcc2 100644 --- a/tests/auto/xmlpatternsxqts/test/tst_suitetest.h +++ b/tests/auto/xmlpatternsxqts/tst_suitetest.h @@ -44,7 +44,7 @@ #define Q_tst_SuiteTest #include <QtCore/QObject> -#include "../../qxmlquery/TestFundament.h" +#include "../qxmlquery/TestFundament.h" /*! \class tst_SuiteTest diff --git a/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp index 890234e7cc..890234e7cc 100644 --- a/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp +++ b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro index 3f49cccc41..e81888a276 100644 --- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro +++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro @@ -1,13 +1,21 @@ -TEMPLATE = subdirs +load(qttest_p4) +SOURCES += tst_xmlpatternsxqts.cpp ../qxmlquery/TestFundament.cpp tst_suitetest.cpp + +include(../xmlpatterns.pri) + contains(QT_CONFIG,xmlpatterns) { - SUBDIRS += lib - test.depends = lib + HEADERS += tst_suitetest.h + LIBS += -l$$XMLPATTERNS_SDK } -SUBDIRS += test - -# Needed on the win32-g++ setup and on the test machine arsia. -INCLUDEPATH += $$QT_BUILD_TREE/include/QtXmlPatterns/private \ - ../../../include/QtXmlPatterns/private -requires(contains(QT_CONFIG,private_tests)) +# syncqt doesn't copy headers in tools/ so let's manually ensure +# it works with shadow builds and source builds. +INCLUDEPATH += $$(QTDIR)/include/QtXmlPatterns/private \ + $$(QTSRCDIR)/include/QtXmlPatterns/private \ + $$(QTSRCDIR)/tools/xmlpatterns \ + $$(QTDIR)/tools/xmlpatterns \ + ../xmlpatternssdk/ +CONFIG += testlib +QT += xml +TARGET = tst_xmlpatternsxqts diff --git a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro index 9b63a52834..940cc3161f 100644 --- a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro +++ b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro @@ -5,17 +5,17 @@ SOURCES += tst_xmlpatternsxslts.cpp \ include (../xmlpatterns.pri) contains(QT_CONFIG,xmlpatterns) { -HEADERS += ../xmlpatternsxqts/test/tst_suitetest.h -SOURCES += ../xmlpatternsxqts/test/tst_suitetest.cpp +HEADERS += ../xmlpatternsxqts/tst_suitetest.h +SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp LIBS += -l$$XMLPATTERNS_SDK } QT += xml -INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternsxqts/lib/ \ - $$(QTDIR)/include/QtXmlPatterns/private \ - $$(QTSRCDIR)/tests/auto/xmlpatternsxqts/test \ - ../xmlpatternsxqts/test \ - ../xmlpatternsxqts/lib +INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternssdk \ + $$(QTDIR)/include/QtXmlPatterns/private \ + $$(QTSRCDIR)/tests/auto/xmlpatternsxqts \ + ../xmlpatternsxqts \ + ../xmlpatternssdk wince*: { testdata.sources = XSLTS Baseline.xml |