diff options
Diffstat (limited to 'tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp')
-rw-r--r-- | tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp index 98e3a53b81..f12656c5fe 100644 --- a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp +++ b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.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$ ** @@ -97,8 +92,8 @@ void tst_qqmlconsole::tracing() QUrl testUrl = testFileUrl("tracing.qml"); QString traceText = - QString::fromLatin1("tracing (%1:%2)\n").arg(testUrl.toString()).arg(42) + - QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(46); + QString::fromLatin1("tracing (%1:%2)\n").arg(testUrl.toString()).arg(37) + + QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(41); QTest::ignoreMessage(QtDebugMsg, qPrintable(traceText)); @@ -128,11 +123,11 @@ void tst_qqmlconsole::testAssert() // assert() QString assert1 = "This will fail\n" + - QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(46); + QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(41); QString assert2 = "This will fail too\n" + - QString::fromLatin1("assertFail (%1:%2)\n").arg(testUrl.toString()).arg(39) + - QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(51); + QString::fromLatin1("assertFail (%1:%2)\n").arg(testUrl.toString()).arg(34) + + QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(46); QTest::ignoreMessage(QtCriticalMsg, qPrintable(assert1)); QTest::ignoreMessage(QtCriticalMsg, qPrintable(assert2)); @@ -149,11 +144,11 @@ void tst_qqmlconsole::exception() // exception() QString exception1 = "Exception 1\n" + - QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(43); + QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(38); QString exception2 = "Exception 2\n" + - QString::fromLatin1("exceptionFail (%1:%2)\n").arg(testUrl.toString()).arg(38) + - QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(48); + QString::fromLatin1("exceptionFail (%1:%2)\n").arg(testUrl.toString()).arg(33) + + QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(43); QTest::ignoreMessage(QtCriticalMsg, qPrintable(exception1)); QTest::ignoreMessage(QtCriticalMsg, qPrintable(exception2)); |