Don't do run svg tests when no svg is available

Change-Id: I6625a9e1542ffc962d5b2c414832575e450a9e61
Reviewed-on: http://codereview.qt-project.org/5690
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/tests/auto/declarative/qsgimage/tst_qsgimage.cpp b/tests/auto/declarative/qsgimage/tst_qsgimage.cpp
index a5f135f..ccea5ca 100644 (file)
--- a/tests/auto/declarative/qsgimage/tst_qsgimage.cpp
+++ b/tests/auto/declarative/qsgimage/tst_qsgimage.cpp
@@ -54,6 +54,7 @@
 #include <QtDeclarative/qdeclarativeexpression.h>
 #include <QtTest/QSignalSpy>
 #include <QtGui/QPainter>
+#include <QtGui/QImageReader>
 
 #include "../../../shared/util.h"
 #include "../shared/testhttpserver.h"
@@ -140,7 +141,9 @@ void tst_qsgimage::imageSource_data()
         << true << true << "file::2:1: QML Image: Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString();
     QTest::newRow("remote") << SERVER_ADDR "/colors.png" << 120.0 << 120.0 << true << false << true << "";
     QTest::newRow("remote redirected") << SERVER_ADDR "/oldcolors.png" << 120.0 << 120.0 << true << false << false << "";
-    QTest::newRow("remote svg") << SERVER_ADDR "/heart.svg" << 550.0 << 500.0 << true << false << false << "";
+    if (QImageReader::supportedImageFormats().contains("svg"))
+        QTest::newRow("remote svg") << SERVER_ADDR "/heart.svg" << 550.0 << 500.0 << true << false << false << "";
+
     QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << 0.0 << 0.0 << true
         << false << true << "file::2:1: QML Image: Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found";
 
@@ -353,6 +356,9 @@ void tst_qsgimage::mirror()
 
 void tst_qsgimage::svg()
 {
+    if (!QImageReader::supportedImageFormats().contains("svg"))
+        QSKIP("svg support not available", SkipAll);
+
     QString src = QUrl::fromLocalFile(SRCDIR "/data/heart.svg").toString();
     QString componentStr = "import QtQuick 2.0\nImage { source: \"" + src + "\"; sourceSize.width: 300; sourceSize.height: 300 }";
     QDeclarativeComponent component(&engine);