diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-07-02 06:58:32 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-07-02 06:58:32 (GMT) |
| commit | 16cf85e926baf627d5e10e05affa05f3e9755e9c (patch) | |
| tree | 31c034106d9d4ee4ec6fb8832912167924ff4a72 /tests/auto/declarative/qdeclarativeimage | |
| parent | 06e8acfd94d61b4239ac5d0ca3f71cc15da7367e (diff) | |
| download | Qt-16cf85e926baf627d5e10e05affa05f3e9755e9c.zip Qt-16cf85e926baf627d5e10e05affa05f3e9755e9c.tar.gz Qt-16cf85e926baf627d5e10e05affa05f3e9755e9c.tar.bz2 | |
Fix test for N900 (ARM-specific SVG results).
Diffstat (limited to 'tests/auto/declarative/qdeclarativeimage')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/data/heart-arm.png | bin | 0 -> 12596 bytes | |||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/data/heart-float.png | bin | 12621 -> 0 bytes | |||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/data/heart200-arm.png (renamed from tests/auto/declarative/qdeclarativeimage/data/heart200-float.png) | bin | 8063 -> 8063 bytes | |||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp | 14 |
4 files changed, 6 insertions, 8 deletions
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart-arm.png b/tests/auto/declarative/qdeclarativeimage/data/heart-arm.png Binary files differnew file mode 100644 index 0000000..3245027 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimage/data/heart-arm.png diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart-float.png b/tests/auto/declarative/qdeclarativeimage/data/heart-float.png Binary files differdeleted file mode 100644 index 65bd89f..0000000 --- a/tests/auto/declarative/qdeclarativeimage/data/heart-float.png +++ /dev/null diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200-float.png b/tests/auto/declarative/qdeclarativeimage/data/heart200-arm.png Binary files differindex 786e75d..b16db76 100644 --- a/tests/auto/declarative/qdeclarativeimage/data/heart200-float.png +++ b/tests/auto/declarative/qdeclarativeimage/data/heart200-arm.png diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index ace6712..df029f5 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -307,11 +307,10 @@ void tst_qdeclarativeimage::svg() QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart-mac.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 - if (sizeof(qreal) == sizeof(double)) - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart.png")); - else - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart-float.png")); + QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart.png")); #endif obj->setSourceSize(QSize(200,200)); @@ -324,11 +323,10 @@ void tst_qdeclarativeimage::svg() QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200-mac.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 - if (sizeof(qreal) == sizeof(double)) - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200.png")); - else - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200-float.png")); + QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200.png")); #endif delete obj; } |
