1 files changed, 8 insertions, 31 deletions

diff --git a/src/linguist/lupdate-pro/main.cpp b/src/linguist/lupdate-pro/main.cpp
index bd3aa5f2b..b33d7015a 100644
--- a/src/linguist/lupdate-pro/main.cpp
+++ b/src/linguist/lupdate-pro/main.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Linguist 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) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <profileutils.h>
 #include <runqttool.h>
@@ -42,6 +17,8 @@
 
 #include <iostream>
 
+using namespace Qt::StringLiterals;
+
 static void printOut(const QString & out)
 {
     std::cout << qPrintable(out);
@@ -75,7 +52,7 @@ Options:
            Trace processing .pro files. Specify twice for more verbosity.
     -version
            Display the version of lupdate-pro and exit.
-)"_qs);
+)"_s);
 }
 
 int main(int argc, char **argv)
@@ -121,7 +98,7 @@ int main(int argc, char **argv)
         } else if (arg == QLatin1String("-pro")) {
             ++i;
             if (i == argc) {
-                printErr(u"The -pro option should be followed by a filename of .pro file.\n"_qs);
+                printErr(u"The -pro option should be followed by a filename of .pro file.\n"_s);
                 return 1;
             }
             lprodumpOptions << arg << args[i];
@@ -129,7 +106,7 @@ int main(int argc, char **argv)
         } else if (arg == QLatin1String("-pro-out")) {
             ++i;
             if (i == argc) {
-                printErr(u"The -pro-out option should be followed by a directory name.\n"_qs);
+                printErr(u"The -pro-out option should be followed by a directory name.\n"_s);
                 return 1;
             }
             lprodumpOptions << arg << args[i];
@@ -142,7 +119,7 @@ int main(int argc, char **argv)
     } // for args
 
     if (!hasProFiles) {
-        printErr(u"lupdate-pro: No .pro/.pri files given.\n"_qs);
+        printErr(u"lupdate-pro: No .pro/.pri files given.\n"_s);
         return 1;
     }