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:
  Silence warning in qvector with MSVC
  QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle
  QStyleSheetStyle: add a way to style the up arrow
  QPointer: assert when using QPointer on destroyed QObject
  Add missing Q_ENUMS to QAbstractSocket
  Fix QMenu rendering in the unified toolbar
  Add even more platform info, and make it expandable.
  Hide nonfunctional links, and improve html

1 files changed, 15 insertions, 11 deletions

diff --git a/tests/arthur/common/baselineprotocol.h b/tests/arthur/common/baselineprotocol.h
index a0ae028..162a19f 100644
--- a/tests/arthur/common/baselineprotocol.h
+++ b/tests/arthur/common/baselineprotocol.h
@@ -45,25 +45,29 @@
 #include <QTcpSocket>
 #include <QImage>
 #include <QVector>
+#include <QMap>
 
 #define QLS QLatin1String
 #define QLC QLatin1Char
 
 #define FileFormat "png"
 
-struct PlatformInfo
+const QString PI_HostName(QLS("HostName"));
+const QString PI_HostAddress(QLS("HostAddress"));
+const QString PI_OSName(QLS("OSName"));
+const QString PI_OSVersion(QLS("OSVersion"));
+const QString PI_QtVersion(QLS("QtVersion"));
+const QString PI_BuildKey(QLS("BuildKey"));
+const QString PI_GitCommit(QLS("GitCommit"));
+const QString PI_QMakeSpec(QLS("QMakeSpec"));
+const QString PI_PulseGitBranch(QLS("PulseGitBranch"));
+const QString PI_PulseTestrBranch(QLS("PulseTestrBranch"));
+
+class PlatformInfo : public QMap<QString, QString>
 {
+public:
     PlatformInfo(bool useLocal = false);
-
-    QString hostName;
-    QString osName;
-    int     osVersion;
-    QString qtVersion;
-    QString buildKey;
-    QString gitCommit;
 };
-QDataStream & operator<< (QDataStream &stream, const PlatformInfo &p);
-QDataStream & operator>> (QDataStream& stream, PlatformInfo& p);
 
 struct ImageItem
 {
@@ -117,7 +121,7 @@ public:
     // Important constants here
     // ****************************************************
     enum Constant {
-        ProtocolVersion = 1,
+        ProtocolVersion = 2,
         ServerPort = 54129,
         Timeout = 10000
     };