1 files changed, 11 insertions, 31 deletions

diff --git a/tests/auto/corelib/text/qstring/tst_qstring_mac.mm b/tests/auto/corelib/text/qstring/tst_qstring_mac.mm
index aad4a580cf..f9d35d938a 100644
--- a/tests/auto/corelib/text/qstring/tst_qstring_mac.mm
+++ b/tests/auto/corelib/text/qstring/tst_qstring_mac.mm
@@ -1,48 +1,28 @@
-/****************************************************************************
-**
-** 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 <QtCore/QString>
 #include <QTest>
 
+#include <QtCore/private/qcore_mac_p.h>
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
 
+using namespace Qt::StringLiterals;
+
 void tst_QString_macTypes()
 {
+    const QLatin1StringView testString("test string");
     // QString <-> CFString
     {
-        QString qtString("test string");
+        QString qtString = testString;
         const CFStringRef cfString = qtString.toCFString();
         QCOMPARE(QString::fromCFString(cfString), qtString);
         CFRelease(cfString);
     }
     {
-        QString qtString("test string");
+        QString qtString = testString;
         const CFStringRef cfString = qtString.toCFString();
         QString qtStringCopy(qtString);
         qtString = qtString.toUpper(); // modify
@@ -52,14 +32,14 @@ void tst_QString_macTypes()
     {
         QMacAutoReleasePool pool;
 
-        QString qtString("test string");
+        QString qtString = testString;
         const NSString *nsString = qtString.toNSString();
         QCOMPARE(QString::fromNSString(nsString), qtString);
     }
     {
         QMacAutoReleasePool pool;
 
-        QString qtString("test string");
+        QString qtString = testString;
         const NSString *nsString = qtString.toNSString();
         QString qtStringCopy(qtString);
         qtString = qtString.toUpper(); // modify