1 files changed, 6 insertions, 46 deletions

diff --git a/tests/baseline/shared/baselineprotocol.h b/tests/baseline/shared/baselineprotocol.h
index 4151d30c9c..598a0cd3af 100644
--- a/tests/baseline/shared/baselineprotocol.h
+++ b/tests/baseline/shared/baselineprotocol.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #ifndef BASELINEPROTOCOL_H
 #define BASELINEPROTOCOL_H
@@ -43,6 +18,7 @@
 #define FileFormat "png"
 
 extern const QString PI_Project;
+extern const QString PI_ProjectImageKeys;
 extern const QString PI_TestCase;
 extern const QString PI_HostName;
 extern const QString PI_HostAddress;
@@ -56,12 +32,6 @@ extern const QString PI_GitBranch;
 class PlatformInfo : public QMap<QString, QString>
 {
 public:
-    PlatformInfo();
-    PlatformInfo(const PlatformInfo &other);
-    ~PlatformInfo()
-    {}
-    PlatformInfo &operator=(const PlatformInfo &other);
-
     static PlatformInfo localHostInfo();
 
     void addOverride(const QString& key, const QString& value);
@@ -71,7 +41,7 @@ public:
 
 private:
     QStringList orides;
-    bool adHoc;
+    bool adHoc = true;
     friend QDataStream & operator<< (QDataStream &stream, const PlatformInfo &pi);
     friend QDataStream & operator>> (QDataStream &stream, PlatformInfo& pi);
 };
@@ -81,16 +51,6 @@ QDataStream & operator>> (QDataStream &stream, PlatformInfo& pi);
 
 struct ImageItem
 {
-public:
-    ImageItem()
-        : status(Ok), itemChecksum(0)
-    {}
-    ImageItem(const ImageItem &other)
-    { *this = other; }
-    ~ImageItem()
-    {}
-    ImageItem &operator=(const ImageItem &other);
-
     static quint64 computeChecksum(const QImage& image);
 
     enum ItemStatus {
@@ -104,10 +64,10 @@ public:
 
     QString testFunction;
     QString itemName;
-    ItemStatus status;
+    ItemStatus status = Ok;
     QImage image;
     QList<quint64> imageChecksums;
-    quint16 itemChecksum;
+    quint16 itemChecksum = 0;
     QByteArray misc;
 
     void writeImageToStream(QDataStream &stream) const;