1 files changed, 18 insertions, 26 deletions

diff --git a/tests/auto/qndefrecord/tst_qndefrecord.cpp b/tests/auto/qndefrecord/tst_qndefrecord.cpp
index 000ff017..5e776423 100644
--- a/tests/auto/qndefrecord/tst_qndefrecord.cpp
+++ b/tests/auto/qndefrecord/tst_qndefrecord.cpp
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtNfc module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** 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 Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -164,7 +156,7 @@ void tst_QNdefRecord::tst_record()
     {
         QNdefRecord record;
         record.setTypeNameFormat(QNdefRecord::ExternalRtd);
-        record.setType("qt.nokia.com:test-rtd");
+        record.setType("qt-project.org:test-rtd");
         record.setId("test id");
         record.setPayload("test payload");
 
@@ -196,13 +188,13 @@ void tst_QNdefRecord::tst_record()
     {
         QNdefRecord record;
         record.setTypeNameFormat(QNdefRecord::ExternalRtd);
-        record.setType("qt.nokia.com:test-rtd");
+        record.setType("qt-project.org:test-rtd");
         record.setId("test id");
         record.setPayload("test payload");
 
         QNdefRecord other;
         other.setTypeNameFormat(QNdefRecord::ExternalRtd);
-        other.setType("qt.nokia.com:test-other-rtd");
+        other.setType("qt-project.org:test-other-rtd");
         other.setId("test other id");
         other.setPayload("test other payload");
 
@@ -301,14 +293,14 @@ void tst_QNdefRecord::tst_uriRecord_data()
     QTest::addColumn<QByteArray>("payload");
 
 
-    QTest::newRow("http") << QString::fromLatin1("http://qt.nokia.com/")
-                                << QByteArray::fromHex("0371742E6E6F6B69612E636F6D2F");
+    QTest::newRow("http") << QString::fromLatin1("http://qt-project.org/")
+                                << QByteArray::fromHex("0371742d70726f6a6563742e6f72672f");
     QTest::newRow("tel") << QString::fromLatin1("tel:+1234567890")
                          << QByteArray::fromHex("052B31323334353637383930");
     QTest::newRow("mailto") << QString::fromLatin1("mailto:test@example.com")
                             << QByteArray::fromHex("0674657374406578616D706C652E636F6D");
-    QTest::newRow("urn") << QString::fromLatin1("urn:nfc:ext:qt.nokia.com:test")
-                         << QByteArray::fromHex("136E66633A6578743A71742E6E6F6B69612E636F6D3A74657374");
+    QTest::newRow("urn") << QString::fromLatin1("urn:nfc:ext:qt-project.org:test")
+                         << QByteArray::fromHex("136E66633A6578743A71742D70726F6A6563742E6F72673A74657374");
 }
 
 void tst_QNdefRecord::tst_uriRecord()