diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-21 16:16:18 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-21 16:16:18 (GMT) |
| commit | fe1a44a850e61d8b64626424b45ef7592ec66589 (patch) | |
| tree | 5cceb6849ddebd37f3098664c52bdb629543cca1 /tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro | |
| parent | ef01812875f0dfc8e032fefb90f1afeb57aaa821 (diff) | |
| parent | 2181a341839b72a627a7ef641de58d1d2411f123 (diff) | |
| download | Qt-fe1a44a850e61d8b64626424b45ef7592ec66589.zip Qt-fe1a44a850e61d8b64626424b45ef7592ec66589.tar.gz Qt-fe1a44a850e61d8b64626424b45ef7592ec66589.tar.bz2 | |
Merge branch 'master' of git:qt/qt
Conflicts:
doc/src/declarative/advtutorial1.qdoc
doc/src/declarative/advtutorial2.qdoc
doc/src/declarative/advtutorial3.qdoc
doc/src/declarative/advtutorial4.qdoc
doc/src/declarative/tutorial1.qdoc
doc/src/declarative/tutorial2.qdoc
doc/src/declarative/tutorial3.qdoc
Diffstat (limited to 'tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro')
| -rw-r--r-- | tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro index 3d82eaf..981adab 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 +} |