diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-10-07 01:27:33 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-10-07 01:27:33 (GMT) |
| commit | 75b371c4445739540f135b4cbe099ebf5a182ead (patch) | |
| tree | c75c5ba1c7381035be5f4f80b1bd3779d900fa59 /tools | |
| parent | 9e2776a4088bc3153eccc00943013a2f5097443e (diff) | |
| parent | 0d0d1691f8c73f9040a0d7020bda96fc7673536a (diff) | |
| download | Qt-75b371c4445739540f135b4cbe099ebf5a182ead.zip Qt-75b371c4445739540f135b4cbe099ebf5a182ead.tar.gz Qt-75b371c4445739540f135b4cbe099ebf5a182ead.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlviewer/qfxtester.cpp | 4 | ||||
| -rw-r--r-- | tools/qmlviewer/qfxtester.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/qmlviewer/qfxtester.cpp b/tools/qmlviewer/qfxtester.cpp index 7903fa9..a6a46eb 100644 --- a/tools/qmlviewer/qfxtester.cpp +++ b/tools/qmlviewer/qfxtester.cpp @@ -285,9 +285,9 @@ void QFxTester::updateCurrentTime(int msec) } if (options & QmlViewer::TestImages && !frame->image().isEmpty()) { - QImage goodImage(frame->image()); + QImage goodImage(frame->image().toLocalFile()); if (goodImage != img) { - QString reject(frame->image() + ".reject.png"); + QString reject(frame->image().toLocalFile() + ".reject.png"); qWarning() << "QFxTester: Image mismatch. Reject saved to:" << reject; img.save(reject); diff --git a/tools/qmlviewer/qfxtester.h b/tools/qmlviewer/qfxtester.h index bb027f6..52987db 100644 --- a/tools/qmlviewer/qfxtester.h +++ b/tools/qmlviewer/qfxtester.h @@ -44,7 +44,7 @@ class QFxVisualTestFrame : public QObject Q_OBJECT Q_PROPERTY(int msec READ msec WRITE setMsec) Q_PROPERTY(QString hash READ hash WRITE setHash) - Q_PROPERTY(QString image READ image WRITE setImage) + Q_PROPERTY(QUrl image READ image WRITE setImage) public: QFxVisualTestFrame() : m_msec(-1) {} @@ -54,13 +54,13 @@ public: QString hash() const { return m_hash; } void setHash(const QString &hash) { m_hash = hash; } - QString image() const { return m_image; } - void setImage(const QString &image) { m_image = image; } + QUrl image() const { return m_image; } + void setImage(const QUrl &image) { m_image = image; } private: int m_msec; QString m_hash; - QString m_image; + QUrl m_image; }; QML_DECLARE_TYPE(QFxVisualTestFrame) |