1 files changed, 4 insertions, 29 deletions
diff --git a/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp
index e9e2eac268..6b56e7c727 100644
--- a/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp
+++ b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** 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: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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** 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$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <QTextDocument>
@@ -104,7 +79,7 @@ QString tst_QTextOdfWriter::getContentFromXml()
     if (index > 0) {
         index = stringContent.indexOf('>', index);
         if (index > 0)
-            ret = stringContent.mid(index+1, stringContent.length() - index - 10);
+            ret = stringContent.mid(index+1, stringContent.size() - index - 10);
     }
     return ret;
 }
@@ -304,7 +279,7 @@ file.open(QIODevice::WriteOnly);
 file.write(buffer->data());
 file.close();
 */
-    QVERIFY(buffer->data().length() > 80);
+    QVERIFY(buffer->data().size() > 80);
     QCOMPARE(buffer->data()[0], 'P'); // its a zip :)
     QCOMPARE(buffer->data()[1], 'K');
     QString mimetype(buffer->data().mid(38, 39));