1 files changed, 20 insertions, 20 deletions

diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 992d2f2..42ea3b1 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -7,29 +7,29 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
 ** 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.
+** 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.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
+** rights. These rights are described in the Nokia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
+** 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.
 **
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
 **
 **
 **
@@ -317,7 +317,7 @@ void tst_QTextEdit::getSetCheck()
     // void QTextEdit::setFontPointSize(qreal)
     obj1.setFontPointSize(qreal(1.1));
     QCOMPARE(qreal(1.1), obj1.fontPointSize());
-    // we currently Q_ASSERT_X in QFont::setPointSizeF for that
+    // we currently assert in QFont::setPointSizeF for that
     //obj1.setFontPointSize(0.0);
     //QCOMPARE(1.1, obj1.fontPointSize()); // Should not accept 0.0 => keep old
 
@@ -327,7 +327,7 @@ void tst_QTextEdit::getSetCheck()
     QCOMPARE(1, obj1.fontWeight()); // Range<1, 99>
     obj1.setFontWeight(99);
     QCOMPARE(99, obj1.fontWeight()); // Range<1, 99>
-    /* Q_ASSERT_X in qfont.cpp
+    /* assertion in qfont.cpp
     obj1.setFontWeight(INT_MIN);
     QCOMPARE(1, obj1.fontWeight()); // Range<1, 99>
     obj1.setFontWeight(INT_MAX);
@@ -2064,7 +2064,7 @@ void tst_QTextEdit::compareWidgetAndImage(QTextEdit &widget, const QString &imag
 
     QCOMPARE(original.isNull(), false);
     QCOMPARE(original.size(), image.size());
-    Q_ASSERT(image.depth() == 32);
+    QCOMPARE(image.depth(), 32);
     QCOMPARE(original.depth(), image.depth());
 
     const int bytesPerLine = image.bytesPerLine();