1 files changed, 11 insertions, 35 deletions
diff --git a/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp
index 7d7c1e79a9..39087aeaaf 100644
--- a/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp
+++ b/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp
@@ -1,33 +1,8 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-
-#include <QtTest/QtTest>
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+
+#include <QTest>
 #include <qpixmap.h>
 #include <private/qpixmapfilter_p.h>
 #include <qpainter.h>
@@ -59,7 +34,8 @@ public:
 
     CustomFilter() : QPixmapFilter((QPixmapFilter::FilterType) Type, 0) { };
 
-    void draw(QPainter *p, const QPointF &pt, const QPixmap &src, const QRectF &srcRect = QRectF()) const {
+    void draw(QPainter *p, const QPointF &pt, const QPixmap &src, const QRectF &srcRect = QRectF()) const override
+    {
         p->drawPixmap(QRectF(pt, srcRect.size()), src, srcRect);
     }
 };
@@ -400,13 +376,13 @@ void tst_QPixmapFilter::blurIndexed8()
     QImage original = img;
     qt_blurImage(img, 10, true, false);
     QCOMPARE(original.size(), img.size());
-    QVERIFY2(qFuzzyCompare(img.devicePixelRatioF(), qreal(2)),
-             QByteArray::number(img.devicePixelRatioF()).constData());
+    QVERIFY2(qFuzzyCompare(img.devicePixelRatio(), qreal(2)),
+             QByteArray::number(img.devicePixelRatio()).constData());
 
     original = img;
     qt_blurImage(img, 10, true, true);
-    QVERIFY2(qFuzzyCompare(img.devicePixelRatioF(), qreal(2)),
-             QByteArray::number(img.devicePixelRatioF()).constData());
+    QVERIFY2(qFuzzyCompare(img.devicePixelRatio(), qreal(2)),
+             QByteArray::number(img.devicePixelRatio()).constData());
     QCOMPARE(original.size(), QSize(img.height(), img.width()));
 }