diff options
author | aavit <qt-info@nokia.com> | 2010-09-03 12:59:19 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2010-09-03 12:59:19 (GMT) |
commit | 01bc165834ed9dbe7e9c97a7ae988509d86a9312 (patch) | |
tree | ab3ae89f8d224992e9f20b2018af4128953bd848 /tests/arthur/common | |
parent | 5322e029863f0085c5cd58f8241d34be22231d27 (diff) | |
parent | 22293fb1c19e7ff7c8f3bec8c97729fb2816c96d (diff) | |
download | Qt-01bc165834ed9dbe7e9c97a7ae988509d86a9312.zip Qt-01bc165834ed9dbe7e9c97a7ae988509d86a9312.tar.gz Qt-01bc165834ed9dbe7e9c97a7ae988509d86a9312.tar.bz2 |
Merge branch 'lancelot' of scm.dev.nokia.troll.no:qt/aavits-graphicsstuff into lancelot
Diffstat (limited to 'tests/arthur/common')
-rw-r--r-- | tests/arthur/common/baselineprotocol.cpp | 15 | ||||
-rw-r--r-- | tests/arthur/common/baselineprotocol.h | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/tests/arthur/common/baselineprotocol.cpp b/tests/arthur/common/baselineprotocol.cpp index f2b719f..7a423d2 100644 --- a/tests/arthur/common/baselineprotocol.cpp +++ b/tests/arthur/common/baselineprotocol.cpp @@ -72,6 +72,21 @@ quint64 ImageItem::computeChecksum(const QImage &image) return (quint64(h1) << 32) | h2; } +QString ImageItem::engineAsString() const +{ + switch (engine) { + case Raster: + return QLatin1String("Raster"); + break; + case OpenGL: + return QLatin1String("OpenGL"); + break; + default: + break; + } + return QLatin1String("Unknown"); +} + QDataStream & operator<< (QDataStream &stream, const ImageItem &ii) { stream << ii.scriptName << ii.scriptChecksum << quint8(ii.status) << quint8(ii.renderFormat) diff --git a/tests/arthur/common/baselineprotocol.h b/tests/arthur/common/baselineprotocol.h index 749b623..9ec1ef4 100644 --- a/tests/arthur/common/baselineprotocol.h +++ b/tests/arthur/common/baselineprotocol.h @@ -31,6 +31,7 @@ public: {} ImageItem &operator=(const ImageItem &other); static quint64 computeChecksum(const QImage& image); + QString engineAsString() const; enum ItemStatus { Ok = 0, |