Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (64 commits)
  Mac: pixmaps dont treat alpha exactly the same as other platforms
  Doc: Fixing typo
  QProcessManager: minor optimization
  use qBinaryFind instead of bsearch
  use qBinaryFind instead of bsearch
  fix two more "comparison between signed and unsigned integer expressions" warnings
  fix 'QChar::QChar(char)' is deprecated
  fix another "comparison between signed and unsigned integer expressions"
  fix warning "comparison between signed and unsigned integer expressions"
  fix warning "missing braces around initializer for 'in_addr::<anonymous union>'"
  fix warning "'SeedStorage* randTLS()' defined but not used"
  remove unused header include
  make the modifySemaphore() signal-safe on linux
  fix/stabilizate the year sign change test
  deal with utcOffset in a correct way
  handle O_NONBLOCK'ed pipes specific error on write()
  move POSIX-specific debug to qprocess_unix.cpp
  Only test control character handling in X11
  BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
  qmake: fix wrong case label in toString(subSystemOption)
  ...

1 files changed, 7 insertions, 8 deletions

diff --git a/tests/arthur/baselineserver/src/baselineserver.cpp b/tests/arthur/baselineserver/src/baselineserver.cpp
index 6351dff..f59600f 100644
--- a/tests/arthur/baselineserver/src/baselineserver.cpp
+++ b/tests/arthur/baselineserver/src/baselineserver.cpp
@@ -267,6 +267,13 @@ void BaselineHandler::storeImage(const QByteArray &itemBlock, bool isBaseline)
     QString prefix = pathForItem(item, isBaseline);
     qDebug() << runId << logtime() << "Received" << (isBaseline ? "baseline" : "mismatched") << "image for:" << item.itemName << "Storing in" << prefix;
 
+    QString msg;
+    if (isBaseline)
+        msg = QLS("New baseline image stored: ") + pathForItem(item, true, true) + QLS(FileFormat);
+    else
+        msg = BaselineServer::baseUrl() + report.filePath();
+    proto.sendBlock(BaselineProtocol::Ack, msg.toLatin1());
+
     QString dir = prefix.section(QLC('/'), 0, -2);
     QDir cwd;
     if (!cwd.exists(dir))
@@ -282,14 +289,6 @@ void BaselineHandler::storeImage(const QByteArray &itemBlock, bool isBaseline)
 
     if (!isBaseline)
         report.addMismatch(item);
-
-    QString msg;
-    if (isBaseline)
-        msg = QLS("New baseline image stored: ") + pathForItem(item, true, true) + QLS(FileFormat);
-    else
-        msg = BaselineServer::baseUrl() + report.filePath();
-
-    proto.sendBlock(BaselineProtocol::Ack, msg.toLatin1());
 }