diff options
Diffstat (limited to 'tests/auto/qml/qjsvalue/tst_qjsvalue.cpp')
| -rw-r--r-- | tests/auto/qml/qjsvalue/tst_qjsvalue.cpp | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp index bf9bd18807..859caf72c7 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.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$ ** @@ -540,7 +535,7 @@ void tst_QJSValue::toBoolean() // deprecated QCOMPARE(number.toBool(), false); QCOMPARE(qjsvalue_cast<bool>(number), false); - QJSValue number2 = eng.toScriptValue(qSNaN()); + QJSValue number2 = eng.toScriptValue(qQNaN()); QCOMPARE(number2.toBool(), false); QCOMPARE(qjsvalue_cast<bool>(number2), false); @@ -583,7 +578,7 @@ void tst_QJSValue::toBoolean() // deprecated QCOMPARE(number.toBool(), false); QCOMPARE(qjsvalue_cast<bool>(number), false); - QJSValue number2 = QJSValue(qSNaN()); + QJSValue number2 = QJSValue(qQNaN()); QCOMPARE(number2.toBool(), false); QCOMPARE(qjsvalue_cast<bool>(number2), false); @@ -633,7 +628,7 @@ void tst_QJSValue::toBool() QCOMPARE(number.toBool(), false); QCOMPARE(qjsvalue_cast<bool>(number), false); - QJSValue number2 = eng.toScriptValue(qSNaN()); + QJSValue number2 = eng.toScriptValue(qQNaN()); QCOMPARE(number2.toBool(), false); QCOMPARE(qjsvalue_cast<bool>(number2), false); @@ -676,7 +671,7 @@ void tst_QJSValue::toBool() QCOMPARE(number.toBool(), false); QCOMPARE(qjsvalue_cast<bool>(number), false); - QJSValue number2 = QJSValue(qSNaN()); + QJSValue number2 = QJSValue(qQNaN()); QCOMPARE(number2.toBool(), false); QCOMPARE(qjsvalue_cast<bool>(number2), false); @@ -714,7 +709,7 @@ void tst_QJSValue::toInt() QCOMPARE(number.toInt(), 123); QCOMPARE(qjsvalue_cast<qint32>(number), 123); - QJSValue number2 = eng.toScriptValue(qSNaN()); + QJSValue number2 = eng.toScriptValue(qQNaN()); QCOMPARE(number2.toInt(), 0); QCOMPARE(qjsvalue_cast<qint32>(number2), 0); @@ -776,7 +771,7 @@ void tst_QJSValue::toInt() QCOMPARE(number.toInt(), 123); QCOMPARE(qjsvalue_cast<qint32>(number), 123); - QJSValue number2 = QJSValue(qSNaN()); + QJSValue number2 = QJSValue(qQNaN()); QCOMPARE(number2.toInt(), 0); QCOMPARE(qjsvalue_cast<qint32>(number2), 0); @@ -850,7 +845,7 @@ void tst_QJSValue::toUInt() QCOMPARE(number.toUInt(), quint32(123)); QCOMPARE(qjsvalue_cast<quint32>(number), quint32(123)); - QJSValue number2 = eng.toScriptValue(qSNaN()); + QJSValue number2 = eng.toScriptValue(qQNaN()); QCOMPARE(number2.toUInt(), quint32(0)); QCOMPARE(qjsvalue_cast<quint32>(number2), quint32(0)); @@ -910,7 +905,7 @@ void tst_QJSValue::toUInt() QCOMPARE(number.toUInt(), quint32(123)); QCOMPARE(qjsvalue_cast<quint32>(number), quint32(123)); - QJSValue number2 = QJSValue(qSNaN()); + QJSValue number2 = QJSValue(qQNaN()); QCOMPARE(number2.toUInt(), quint32(0)); QCOMPARE(qjsvalue_cast<quint32>(number2), quint32(0)); @@ -1015,7 +1010,7 @@ void tst_QJSValue::toVariant() { QVariant var = qobject.toVariant(); QCOMPARE(var.userType(), int(QMetaType::QObjectStar)); - QCOMPARE(qVariantValue<QObject*>(var), (QObject *)&temp); + QCOMPARE(qvariant_cast<QObject*>(var), (QObject *)&temp); } { |