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>

diff --git a/tests/auto/quick/examples/examples.pro b/tests/auto/quick/examples/examples.pro
index 6543aa1b2b1f0b549657252ddd6e87b0c4107066..3d821fc13dd19998cf5b9c54cd8559ed7ef6c906 100644 (file)
--- 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 175955d663fd7e477a4eebcee9f8063c2f2cdf73..90c78ec9424052d330a7dde585be4a1bed42a622 100644 (file)
--- 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
 
 }