1 files changed, 22 insertions, 77 deletions

diff --git a/tests/baseline/shared/baselineprotocol.cpp b/tests/baseline/shared/baselineprotocol.cpp
index 33620fbe5c..6a38e71831 100644
--- a/tests/baseline/shared/baselineprotocol.cpp
+++ b/tests/baseline/shared/baselineprotocol.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 #include "baselineprotocol.h"
 #include <QLibraryInfo>
 #include <QImage>
@@ -42,6 +17,7 @@
 #include <QRegularExpression>
 
 const QString PI_Project(QLS("Project"));
+const QString PI_ProjectImageKeys(QLS("ProjectImageKeys"));
 const QString PI_TestCase(QLS("TestCase"));
 const QString PI_HostName(QLS("HostName"));
 const QString PI_HostAddress(QLS("HostAddress"));
@@ -52,11 +28,6 @@ const QString PI_QtBuildMode(QLS("QtBuildMode"));
 const QString PI_GitCommit(QLS("GitCommit"));
 const QString PI_GitBranch(QLS("GitBranch"));
 
-PlatformInfo::PlatformInfo()
-    : QMap<QString, QString>(), adHoc(true)
-{
-}
-
 PlatformInfo PlatformInfo::localHostInfo()
 {
     PlatformInfo pi;
@@ -74,24 +45,26 @@ PlatformInfo PlatformInfo::localHostInfo()
 #endif
     pi.insert(PI_OSVersion, QSysInfo::kernelVersion());
 
+    QString gc = qEnvironmentVariable("BASELINE_GIT_COMMIT");
 #if QT_CONFIG(process)
-    QProcess git;
-    QString cmd;
-    QStringList args;
-#if defined(Q_OS_WIN)
-    cmd = QLS("cmd.exe");
-    args << QLS("/c") << QLS("git");
-#else
-    cmd = QLS("git");
-#endif
-    args << QLS("log") << QLS("--max-count=1") << QLS("--pretty=%H [%an] [%ad] %s");
-    git.start(cmd, args);
-    git.waitForFinished(3000);
-    if (!git.exitCode())
-        pi.insert(PI_GitCommit, QString::fromLocal8Bit(git.readAllStandardOutput().constData()).simplified());
-    else
-        pi.insert(PI_GitCommit, QLS("Unknown"));
+    if (gc.isEmpty()) {
+        QProcess git;
+        QString cmd;
+        QStringList args;
+    #if defined(Q_OS_WIN)
+        cmd = QLS("cmd.exe");
+        args << QLS("/c") << QLS("git");
+    #else
+        cmd = QLS("git");
+    #endif
+        args << QLS("log") << QLS("--max-count=1") << QLS("--pretty=%H [%an] [%ad] %s");
+        git.start(cmd, args);
+        git.waitForFinished(3000);
+        if (!git.exitCode())
+            gc = QString::fromLocal8Bit(git.readAllStandardOutput().constData()).simplified();
+    }
 #endif // QT_CONFIG(process)
+    pi.insert(PI_GitCommit, gc.isEmpty() ? QLS("Unknown") : gc);
 
     if (qEnvironmentVariableIsSet("JENKINS_HOME"))
         pi.setAdHocRun(false);
@@ -104,23 +77,6 @@ PlatformInfo PlatformInfo::localHostInfo()
 }
 
 
-PlatformInfo::PlatformInfo(const PlatformInfo &other)
-    : QMap<QString, QString>(other)
-{
-    orides = other.orides;
-    adHoc = other.adHoc;
-}
-
-
-PlatformInfo &PlatformInfo::operator=(const PlatformInfo &other)
-{
-    QMap<QString, QString>::operator=(other);
-    orides = other.orides;
-    adHoc = other.adHoc;
-    return *this;
-}
-
-
 void PlatformInfo::addOverride(const QString& key, const QString& value)
 {
     orides.append(key);
@@ -162,17 +118,6 @@ QDataStream & operator>> (QDataStream &stream, PlatformInfo &pi)
 }
 
 
-ImageItem &ImageItem::operator=(const ImageItem &other)
-{
-    testFunction = other.testFunction;
-    itemName = other.itemName;
-    itemChecksum = other.itemChecksum;
-    status = other.status;
-    image = other.image;
-    imageChecksums = other.imageChecksums;
-    return *this;
-}
-
 // Defined in lookup3.c:
 void hashword2 (
 const quint32 *k,         /* the key, an array of quint32 values */
@@ -325,7 +270,7 @@ bool BaselineProtocol::connect(const QString &testCase, bool *dryrun, const Plat
 
     socket.connectToHost(serverName, ServerPort);
     if (!socket.waitForConnected(Timeout)) {
-        QThread::msleep(3000);  // Wait a bit and try again, the server might just be restarting
+        QThread::sleep(std::chrono::seconds{3});  // Wait a bit and try again, the server might just be restarting
         if (!socket.waitForConnected(Timeout)) {
             errMsg += QLS("TCP connectToHost failed. Host:") + QLS(serverName) + QLS(" port:") + QString::number(ServerPort);
             return false;