Remove all font examples from qpa platform tests

Remove all font examples, and re-enable all platform example tests.

Task-number: QTBUG-21415

Change-Id: I87448cedd7f03b9483e8ec4d90474afa4d62b9c2
Reviewed-on: http://codereview.qt-project.org/5417
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 35e3cac..9cc8dbc 100644 (file)
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -5,7 +5,7 @@ METATYPETESTS += \
     qmetaobjectbuilder
 
 PUBLICTESTS += \
-#   examples \
+    examples \
     geometry \
     nodes \
     parserstress \

diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index c286673..58f16a4 100644 (file)
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -69,7 +69,7 @@ tst_examples::tst_examples()
 {
     // Add directories you want excluded here
 #ifdef Q_WS_QPA
-    excludedDirs << "examples/declarative/text/fonts/fonts.qml"; // QTBUG-21415
+    excludedDirs << "examples/declarative/text/fonts"; // QTBUG-21415
 #endif
 
     // Not run in QSGView