From 9585500539b3674296c61b884fe3f12363efb848 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 11 Feb 2021 16:22:45 +0100 Subject: [PATCH] Disable warnings from using deprecated QScopedPointer::take It's the QScopedPointer test, so we want to test deprecated APIs. Change-Id: I029103b3150c576cba9b395aafc571b9fccc914a Reviewed-by: Andrei Golubev Reviewed-by: Edward Welbourne --- .../corelib/tools/qscopedpointer/tst_qscopedpointer.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp index 0cb6b59c023..967a3ccf554 100644 --- a/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp +++ b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp @@ -385,7 +385,10 @@ void tst_QScopedPointer::comparison() scopedPointerComparisonTest(pa2, pa2, pb); scopedPointerComparisonTest(pa1, pa2, pb); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED pa2.take(); +QT_WARNING_POP QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 ); } @@ -404,7 +407,10 @@ void tst_QScopedPointer::comparison() scopedPointerComparisonTest(pa1, pa2, pb); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED pa2.take(); +QT_WARNING_POP QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 85 ); }