From 386b4900912d8d784860e60c17838a7b61d387a5 Mon Sep 17 00:00:00 2001 From: Joona Petrell Date: Thu, 19 Aug 2010 16:30:07 +1000 Subject: Fix Image element svg autotest Also, reduced some platform-specific test as the test case is not meant to test regression in the painting routines, but that Image's svg support works. Task-number: Reviewed-by: Martin Jones --- .../qdeclarativeimage/data/heart-arm.png | Bin 12596 -> 0 bytes .../qdeclarativeimage/data/heart-mac.png | Bin 12621 -> 0 bytes .../qdeclarativeimage/data/heart-win32.png | Bin 12621 -> 12457 bytes .../declarative/qdeclarativeimage/data/heart.png | Bin 12577 -> 12424 bytes .../qdeclarativeimage/data/heart200-arm.png | Bin 8063 -> 0 bytes .../qdeclarativeimage/data/heart200-mac.png | Bin 8062 -> 0 bytes .../qdeclarativeimage/data/heart200-win32.png | Bin 8062 -> 7939 bytes .../declarative/qdeclarativeimage/data/heart200.png | Bin 8063 -> 7943 bytes .../qdeclarativeimage/tst_qdeclarativeimage.cpp | 16 ++++------------ 9 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 tests/auto/declarative/qdeclarativeimage/data/heart-arm.png delete mode 100644 tests/auto/declarative/qdeclarativeimage/data/heart-mac.png delete mode 100644 tests/auto/declarative/qdeclarativeimage/data/heart200-arm.png delete mode 100644 tests/auto/declarative/qdeclarativeimage/data/heart200-mac.png diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart-arm.png b/tests/auto/declarative/qdeclarativeimage/data/heart-arm.png deleted file mode 100644 index 3245027..0000000 Binary files a/tests/auto/declarative/qdeclarativeimage/data/heart-arm.png and /dev/null differ diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart-mac.png b/tests/auto/declarative/qdeclarativeimage/data/heart-mac.png deleted file mode 100644 index d7df0e4..0000000 Binary files a/tests/auto/declarative/qdeclarativeimage/data/heart-mac.png and /dev/null differ diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart-win32.png b/tests/auto/declarative/qdeclarativeimage/data/heart-win32.png index 351da13..5992e79 100644 Binary files a/tests/auto/declarative/qdeclarativeimage/data/heart-win32.png and b/tests/auto/declarative/qdeclarativeimage/data/heart-win32.png differ diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart.png b/tests/auto/declarative/qdeclarativeimage/data/heart.png index 372b224..ff93f6c 100644 Binary files a/tests/auto/declarative/qdeclarativeimage/data/heart.png and b/tests/auto/declarative/qdeclarativeimage/data/heart.png differ diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200-arm.png b/tests/auto/declarative/qdeclarativeimage/data/heart200-arm.png deleted file mode 100644 index b16db76..0000000 Binary files a/tests/auto/declarative/qdeclarativeimage/data/heart200-arm.png and /dev/null differ diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200-mac.png b/tests/auto/declarative/qdeclarativeimage/data/heart200-mac.png deleted file mode 100644 index df22325..0000000 Binary files a/tests/auto/declarative/qdeclarativeimage/data/heart200-mac.png and /dev/null differ diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png b/tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png index 4976ff9..19b20a8 100644 Binary files a/tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png and b/tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png differ diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200.png b/tests/auto/declarative/qdeclarativeimage/data/heart200.png index 786e75d..5a31ae8 100644 Binary files a/tests/auto/declarative/qdeclarativeimage/data/heart200.png and b/tests/auto/declarative/qdeclarativeimage/data/heart200.png differ diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index b8d2828..0f1050e 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -274,14 +274,10 @@ void tst_qdeclarativeimage::svg() QCOMPARE(obj->pixmap().height(), 300); QCOMPARE(obj->width(), 550.0); QCOMPARE(obj->height(), 500.0); -#if defined(Q_OS_MAC) - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart-mac.png")); +#if defined(Q_OS_LINUX) + QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart.png")); #elif defined(Q_OS_WIN32) QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart-win32.png")); -#elif defined(QT_ARCH_ARM) - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart-arm.png")); -#else - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart.png")); #endif obj->setSourceSize(QSize(200,200)); @@ -290,14 +286,10 @@ void tst_qdeclarativeimage::svg() QCOMPARE(obj->pixmap().height(), 200); QCOMPARE(obj->width(), 550.0); QCOMPARE(obj->height(), 500.0); -#if defined(Q_OS_MAC) - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200-mac.png")); +#if defined(Q_OS_LINUX) + QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200.png")); #elif defined(Q_OS_WIN32) QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200-win32.png")); -#elif defined(QT_ARCH_ARM) - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200-arm.png")); -#else - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200.png")); #endif delete obj; } -- cgit v0.12