diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-02-03 16:18:20 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-02-28 08:57:57 +0100 |
| commit | 1ba46c9b632731d7d7e791de2b203d0d933245b9 (patch) | |
| tree | a7933031bde57f582181c2e9c185989ebdbb9470 /tests/auto/gui/kernel/qguivariant/test | |
| parent | d2068b24e4b2e96832af154d02e19b5333880c21 (diff) | |
Get rid of QMatrix
Task-number: QTBUG-81628
Change-Id: Iad66bfdf49b9ee65558a451108c086fc40dc3884
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/gui/kernel/qguivariant/test')
| -rw-r--r-- | tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp index 8b301c145a..12998add71 100644 --- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp +++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp @@ -36,7 +36,6 @@ #include <qcursor.h> #include <qimage.h> #include <qicon.h> -#include <qmatrix.h> #include <qmatrix4x4.h> #include <qpen.h> #include <qpolygon.h> @@ -87,8 +86,6 @@ private slots: void toBrush_data(); void toBrush(); - void matrix(); - void transform(); void matrix4x4(); @@ -402,24 +399,6 @@ void tst_QGuiVariant::toString() QCOMPARE( str, result ); } -#if QT_DEPRECATED_SINCE(5, 15) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -void tst_QGuiVariant::matrix() -{ - QVariant variant; - QMatrix matrix = qvariant_cast<QMatrix>(variant); - QVERIFY(matrix.isIdentity()); - variant.setValue(QMatrix().rotate(90)); - QCOMPARE(QMatrix().rotate(90), qvariant_cast<QMatrix>(variant)); - - void *mmatrix = QMetaType::create(QVariant::Matrix, 0); - QVERIFY(mmatrix); - QMetaType::destroy(QVariant::Matrix, mmatrix); -} -QT_WARNING_POP -#endif - void tst_QGuiVariant::matrix4x4() { QVariant variant; @@ -711,7 +690,6 @@ void tst_QGuiVariant::implicitConstruction() F(Pen) \ F(TextLength) \ F(TextFormat) \ - F(Matrix) \ F(Transform) \ F(Matrix4x4) \ F(Vector2D) \ |