1 files changed, 6 insertions, 31 deletions

diff --git a/tests/auto/tools/qmakelib/parsertest.cpp b/tests/auto/tools/qmakelib/parsertest.cpp
index 3b0e47a5ac..a603f04b73 100644
--- a/tests/auto/tools/qmakelib/parsertest.cpp
+++ b/tests/auto/tools/qmakelib/parsertest.cpp
@@ -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
 
 #include "tst_qmakelib.h"
 
@@ -42,7 +17,7 @@ public:
     TokenStream &operator<<(uint n) { ts += QChar(n & 0xffff); ts += QChar(n >> 16); return *this; }
     TokenStream &operator<<(QStringView s) { ts += s; return *this; }
     TokenStream &operator<<(const ProString &s) { return *this << ushort(s.length()) << s.toQStringView(); }
-    TokenStream &operator<<(const ProKey &s) { return *this << s.hash() << s.toString(); }
+    TokenStream &operator<<(const ProKey &s) { return *this << uint(s.hash()) << s.toString(); }
 
 private:
     QString ts;
@@ -2031,14 +2006,14 @@ void tst_qmakelib::proParser()
     handler.setExpectedMessages(msgs.split('\n', Qt::SkipEmptyParts));
     QMakeVfs vfs;
     QMakeParser parser(0, &vfs, &handler);
-    ProFile *pro = parser.parsedProBlock(QStringRef(&in), 0, "in", 1, QMakeParser::FullGrammar);
+    ProFile *pro = parser.parsedProBlock(QStringView{ in }, 0, "in", 1, QMakeParser::FullGrammar);
     if (handler.printedMessages()) {
         qWarning("Got unexpected message(s)");
         verified = false;
     }
-    QStringList missingMsgs = handler.expectedMessages();
+    const QStringList missingMsgs = handler.expectedMessages();
     if (!missingMsgs.isEmpty()) {
-        foreach (const QString &msg, missingMsgs)
+        for (const QString &msg : missingMsgs)
             qWarning("Missing message: %s", qPrintable(msg));
         verified = false;
     }