summaryrefslogtreecommitdiffstats
path: root/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-02-18 23:24:24 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-02-18 23:24:24 (GMT)
commit9fbbd3146c42869d56da8c82501be1e6a6595f36 (patch)
tree092af029342fa1c5a59bc30c85d7257c88718609 /tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
parent4baa9dfb5273d7b501dcb3f456983262c53cc8d1 (diff)
parent52e517b50aafd6cc0bec597abd50d8b3f7e982dd (diff)
downloadQt-9fbbd3146c42869d56da8c82501be1e6a6595f36.zip
Qt-9fbbd3146c42869d56da8c82501be1e6a6595f36.tar.gz
Qt-9fbbd3146c42869d56da8c82501be1e6a6595f36.tar.bz2
Merge remote branch 'origin/4.6' into integration-master-from-4.6
Conflicts: src/corelib/codecs/qtextcodec.h
Diffstat (limited to 'tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro')
-rw-r--r--tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro26
1 files changed, 17 insertions, 9 deletions
diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
index 3f49ccc..e81888a 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