diff options
| author | Sami Lempinen <sami.lempinen@nokia.com> | 2011-08-23 11:33:16 (GMT) |
|---|---|---|
| committer | Sami Lempinen <sami.lempinen@nokia.com> | 2011-08-23 11:33:16 (GMT) |
| commit | a28832bb61e7e60ac0fb856daf27b78ff1728520 (patch) | |
| tree | d8ecd2387568814a68bf8b8713f3abed9ff9f275 /tests/arthur/baselineserver/src/baselineserver.h | |
| parent | 59f33898919391d3aa4baa6849556965ae7d08ce (diff) | |
| parent | 2f5855e8d891a7e93bdb721243f1c0b10fcb5ad9 (diff) | |
| download | Qt-a28832bb61e7e60ac0fb856daf27b78ff1728520.zip Qt-a28832bb61e7e60ac0fb856daf27b78ff1728520.tar.gz Qt-a28832bb61e7e60ac0fb856daf27b78ff1728520.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'tests/arthur/baselineserver/src/baselineserver.h')
| -rw-r--r-- | tests/arthur/baselineserver/src/baselineserver.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/arthur/baselineserver/src/baselineserver.h b/tests/arthur/baselineserver/src/baselineserver.h index d73bb97..333d9ed 100644 --- a/tests/arthur/baselineserver/src/baselineserver.h +++ b/tests/arthur/baselineserver/src/baselineserver.h @@ -125,13 +125,14 @@ private: void storeImage(const QByteArray &itemBlock, bool isBaseline); void storeItemMetadata(const PlatformInfo &metadata, const QString &path); PlatformInfo fetchItemMetadata(const QString &path); - void mapPlatformInfo() const; + PlatformInfo mapPlatformInfo(const PlatformInfo& orig) const; const char *logtime(); QString computeMismatchScore(const QImage& baseline, const QImage& rendered); BaselineProtocol proto; - PlatformInfo plat; - mutable PlatformInfo mapped; + PlatformInfo clientInfo; + mutable PlatformInfo mappedClientInfo; + mutable PlatformInfo overriddenMappedClientInfo; QString runId; bool connectionEstablished; Report report; |