diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-16 05:34:50 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-17 06:12:08 (GMT) |
| commit | 2d67f6efc47986e8f6d69943f0986d18ae2ced96 (patch) | |
| tree | 42b8e16e73c021ffabba0b82b12f0f533ce8aa11 /tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro | |
| parent | 0cdf33e9acb00b8f3654e8268253a3fb7c5db92c (diff) | |
| download | Qt-2d67f6efc47986e8f6d69943f0986d18ae2ced96.zip Qt-2d67f6efc47986e8f6d69943f0986d18ae2ced96.tar.gz Qt-2d67f6efc47986e8f6d69943f0986d18ae2ced96.tar.bz2 | |
Fixed compile of xmlpatterns tests with vcproj generator.
These tests were adding the same SUBDIR multiple times from different
projects. Don't do that.
Diffstat (limited to 'tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro')
| -rw-r--r-- | tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro | 26 |
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 |