Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Stream raw image data instead of PNG: more info, and faster.
  Generate thumbnails for faster loading of the web reports
  Separate reports from adhoc and pulse runs
  Add cmd to simulate testfail. Misc server improvements.
  Added command to clear all baselines

1 files changed, 5 insertions, 2 deletions

diff --git a/tests/arthur/common/baselineprotocol.h b/tests/arthur/common/baselineprotocol.h
index 9f59454..baffb4a 100644
--- a/tests/arthur/common/baselineprotocol.h
+++ b/tests/arthur/common/baselineprotocol.h
@@ -84,6 +84,9 @@ public:
     QString engineAsString() const;
     QString formatAsString() const;
 
+    void writeImageToStream(QDataStream &stream) const;
+    void readImageFromStream(QDataStream &stream);
+
     enum ItemStatus {
         Ok = 0,
         BaselineNotFound = 1,
@@ -105,7 +108,7 @@ public:
     quint16 scriptChecksum;
 };
 QDataStream & operator<< (QDataStream &stream, const ImageItem &ii);
-QDataStream & operator>> (QDataStream& stream, ImageItem& ii);
+QDataStream & operator>> (QDataStream &stream, ImageItem& ii);
 
 Q_DECLARE_METATYPE(ImageItem);
 
@@ -121,7 +124,7 @@ public:
     // Important constants here
     // ****************************************************
     enum Constant {
-        ProtocolVersion = 2,
+        ProtocolVersion = 3,
         ServerPort = 54129,
         Timeout = 5000
     };