From 4bb897a3841f0f79150787e29fe122e1410bc119 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 10 Jan 2020 10:08:37 +0100
Subject: Deprecate all methods that use QMatrix

Don't use QMatrix in implementation classes anymore.

Task-number: QTBUG-46653
Fixes: QTBUG-81627
Change-Id: I4806c1302e42645dc6a608062c8d9c336ae8629b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp')

diff --git a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
index 3ce65a6785..81f0183728 100644
--- a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
+++ b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
@@ -193,9 +193,14 @@ template<> struct TestValueFactory<QMetaType::QTextLength> {
 template<> struct TestValueFactory<QMetaType::QTextFormat> {
     static QTextFormat *create() { return new QTextFormat(QTextFormat::FrameFormat); }
 };
+#if QT_DEPRECATED_SINCE(5, 15)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
 template<> struct TestValueFactory<QMetaType::QMatrix> {
     static QMatrix *create() { return new QMatrix(10, 20, 30, 40, 50, 60); }
 };
+QT_WARNING_POP
+#endif
 template<> struct TestValueFactory<QMetaType::QTransform> {
     static QTransform *create() { return new QTransform(10, 20, 30, 40, 50, 60); }
 };
-- 
cgit v1.2.3