1 files changed, 20 insertions, 25 deletions
diff --git a/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
index b77e1fe9ef..cee33be3df 100644
--- a/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
+++ b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** 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:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/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 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.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company 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 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$
 **
@@ -201,9 +196,9 @@ void tst_QSqlField::name()
 {
     QSqlField field( "test", QVariant::String );
     QFETCH( QString, val );
-    QVERIFY( field.name() == "test" );
+    QCOMPARE(field.name(), QLatin1String("test"));
     field.setName( val );
-    QVERIFY( field.name() == val );
+    QCOMPARE(field.name(), val);
 }
 
 void tst_QSqlField::operator_Assign()
@@ -253,9 +248,9 @@ void tst_QSqlField::setName()
 {
     QSqlField field( "test", QVariant::String );
     QFETCH( QString, val );
-    QVERIFY( field.name() == "test" );
+    QCOMPARE(field.name(), QLatin1String("test"));
     field.setName( val );
-    QVERIFY( field.name() == val );
+    QCOMPARE(field.name(), val);
 }
 
 void tst_QSqlField::setNull()
@@ -273,16 +268,16 @@ void tst_QSqlField::setReadOnly()
     field.setValue( "test" );
     field.setReadOnly( true );
     field.setValue( "Harry" );
-    QVERIFY( field.value() == "test" );
+    QCOMPARE(field.value().toString(), QLatin1String("test"));
     field.clear();
-    QVERIFY( field.value() == "test" );
+    QCOMPARE(field.value().toString(), QLatin1String("test"));
     QVERIFY( !field.isNull() );
     field.clear();
-    QVERIFY( field.value() == "test" );
+    QCOMPARE(field.value().toString(), QLatin1String("test"));
     QVERIFY( !field.isNull() );
     field.setReadOnly( false );
     field.setValue( "Harry" );
-    QVERIFY( field.value() == "Harry" );
+    QCOMPARE(field.value().toString(), QLatin1String("Harry"));
     field.clear();
     QVERIFY( field.value() == QVariant().toString() );
     QVERIFY( field.isNull() );