summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/gui/painting/qtransform/tst_qtransform.cpp')
-rw-r--r--tests/auto/gui/painting/qtransform/tst_qtransform.cpp40
1 files changed, 8 insertions, 32 deletions
diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
index 2dcb564e2b..428174bfc6 100644
--- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
+++ b/tests/auto/gui/painting/qtransform/tst_qtransform.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 <qpainterpath.h>
#include <qpolygon.h>
#include <qtransform.h>
@@ -384,8 +359,9 @@ void tst_QTransform::types()
QCOMPARE(m1.inverted().type(), QTransform::TxScale);
m1.rotate(45.0f);
- QCOMPARE(m1.type(), QTransform::TxRotate);
- QCOMPARE(m1.inverted().type(), QTransform::TxRotate);
+ // Rotation after non-uniform scaling -> shearing. Uniform scale + rotate tested below.
+ QCOMPARE(m1.type(), QTransform::TxShear);
+ QCOMPARE(m1.inverted().type(), QTransform::TxShear);
m1.shear(0.5f, 0.25f);
QCOMPARE(m1.type(), QTransform::TxShear);