1 files changed, 46 insertions, 46 deletions

diff --git a/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/main.cpp b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/main.cpp
index 6b92d678f..8bb614c78 100644
--- a/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/main.cpp
@@ -1,46 +1,46 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
-** 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 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 #ifndef MYOBJECT_H
 #define MYOBJECT_H
 
-#include <QtCore/QObject>
-
-QT_TRANSLATE_NOOP("scope", "string")
-QT_TRANSLATE_NOOP_ALIAS("scope", "string_alias")
-QT_TRANSLATE_NOOP_UTF8("scope", "utf8_string")
-QT_TRANSLATE_NOOP_UTF8_ALIAS("scope", "utf8_string_alias")
-QT_TRANSLATE_NOOP3("scope", "string_with_comment", "comment")
-QT_TRANSLATE_NOOP3_ALIAS("scope", "string_with_comment_alias", "comment")
-QT_TRANSLATE_NOOP3_UTF8("scope", "utf8_string_with_comment", "comment")
-QT_TRANSLATE_NOOP3_UTF8_ALIAS("scope", "utf8_string_with_comment_alias", "comment")
-QT_TRID_NOOP("this_a_id")
-QT_TRID_NOOP_ALIAS("this_a_id_alias")
+#include <QtCore>
+
+const char *c_1 = QT_TRANSLATE_NOOP("scope", "string");
+const char *c_2 = QT_TRANSLATE_NOOP_ALIAS("scope", "string_alias");
+const char *c_3 = QT_TRANSLATE_NOOP_UTF8("scope", "utf8_string");
+const char *c_4 = QT_TRANSLATE_NOOP_UTF8_ALIAS("scope", "utf8_string_alias");
+const char *c_5[2] = QT_TRANSLATE_NOOP3("scope", "string_with_comment", "comment");
+const char *c_6[2] = QT_TRANSLATE_NOOP3_ALIAS("scope", "string_with_comment_alias", "comment");
+const char *c_7[2] = QT_TRANSLATE_NOOP3_UTF8("scope", "utf8_string_with_comment", "comment");
+const char *c_8[2] = QT_TRANSLATE_NOOP3_UTF8_ALIAS("scope", "utf8_string_with_comment_alias", "comment");
+const char *c_9 = QT_TRID_NOOP("this_a_id");
+const char *c_10 = QT_TRID_NOOP_ALIAS("this_a_id_alias");
 QString test = qtTrId("yet_another_id");
 QString test_alias = qtTrId_alias("yet_another_id_alias");
 
@@ -53,7 +53,7 @@ class Bogus : QObject {
 const char * const Bogus::s_strings[] = {
     QT_TR_NOOP("this should be in Bogus"),
     QT_TR_NOOP_ALIAS("this should be in Bogus Alias"),
-    QT_TR_NOOP_UTF8("this should be utf8 in Bogus")
+    QT_TR_NOOP_UTF8("this should be utf8 in Bogus"),
     QT_TR_NOOP_UTF8_ALIAS("this should be utf8 in Bogus Alias")
 };
 
@@ -64,10 +64,10 @@ class MyObject : public QObject
     {
         tr("Boo", "nsF::D");
         tr_alias("Boo_alias", "nsB::C");
-        trUtf8("utf8_Boo", "nsF::D");
+        tr("utf8_Boo", "nsF::D"); // trUtf8 is now obsolete
         trUtf8_alias("utf8_Boo_alias", "nsF::D");
-        translate("QTranslator", "Simple");
-        translate_alias("QTranslator", "Simple with comment alias", "with comment")
+        QCoreApplication::translate("QTranslator", "Simple");
+        translate_alias("QTranslator", "Simple with comment alias", "with comment");
     }
 };
 
@@ -79,10 +79,10 @@ struct NonQObject
     {
         tr("NonQObject_Boo", "nsF::NonQObject_D");
         tr_alias("NonQObject_Boo_alias", "nsB::NonQObject_C");
-        trUtf8("utf_NonQObject_Boo", "nsF::D");
+        tr("utf_NonQObject_Boo", "nsF::D");
         trUtf8_alias("utf8_NonQObject_Boo_alias", "nsF::D");
-        translate("NonQObject_QTranslator", "Simple");
-        translate_alias("NonQObject_QTranslator", "Simple with comment alias", "with comment")
+        QCoreApplication::translate("NonQObject_QTranslator", "Simple");
+        translate_alias("NonQObject_QTranslator", "Simple with comment alias", "with comment");
     }
 };