diff options
author | Sune Vuorela <sune@vuorela.dk> | 2015-07-16 20:36:31 +0200 |
---|---|---|
committer | Sune Vuorela <sune@vuorela.dk> | 2015-07-16 19:53:03 +0000 |
commit | 71c357e416c37c7b7d7cd2efa95635018bd105f5 (patch) | |
tree | d7908f04f03ecc92988067ee172141e0c9c1a269 | |
parent | e1141c858c397d2c27e4a6681b9300f65cf396f2 (diff) |
Let unit tests pass if xmlpatterns is not around
The blacklist for xmlpatterns tests is not applied unless xmlpatterns
specifically has been disabled, but code builds anyways.
Fix up the blacklist.
Change-Id: I013701e787e8ec28f1282a911270dd7a158d6f01
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r-- | tests/auto/quick/examples/examples.pro | 2 | ||||
-rw-r--r-- | tests/auto/quick/examples/tst_examples.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/quick/examples/examples.pro b/tests/auto/quick/examples/examples.pro index 6543aa1b2b..3d821fc13d 100644 --- a/tests/auto/quick/examples/examples.pro +++ b/tests/auto/quick/examples/examples.pro @@ -10,3 +10,5 @@ CONFIG += parallel_test #temporary QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +!qtHaveModule(xmlpatterns): DEFINES += QT_NO_XMLPATTERNS + diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp index 175955d663..90c78ec942 100644 --- a/tests/auto/quick/examples/tst_examples.cpp +++ b/tests/auto/quick/examples/tst_examples.cpp @@ -104,7 +104,9 @@ tst_examples::tst_examples() excludedDirs << "demos/twitter"; excludedDirs << "demos/flickr"; excludedDirs << "demos/photoviewer"; - excludedDirs << "snippets/qml/xmlrole.qml"; + excludedFiles << "snippets/qml/xmlrole.qml"; + excludedFiles << "particles/itemparticle/particleview.qml"; + excludedFiles << "views/visualdatamodel/slideshow.qml"; #endif } |