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 <andrei.golubev@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
parent
e711eb35f5
commit
9585500539
@ -385,7 +385,10 @@ void tst_QScopedPointer::comparison()
|
|||||||
scopedPointerComparisonTest(pa2, pa2, pb);
|
scopedPointerComparisonTest(pa2, pa2, pb);
|
||||||
scopedPointerComparisonTest(pa1, pa2, pb);
|
scopedPointerComparisonTest(pa1, pa2, pb);
|
||||||
|
|
||||||
|
QT_WARNING_PUSH
|
||||||
|
QT_WARNING_DISABLE_DEPRECATED
|
||||||
pa2.take();
|
pa2.take();
|
||||||
|
QT_WARNING_POP
|
||||||
|
|
||||||
QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
|
QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
|
||||||
}
|
}
|
||||||
@ -404,7 +407,10 @@ void tst_QScopedPointer::comparison()
|
|||||||
|
|
||||||
scopedPointerComparisonTest(pa1, pa2, pb);
|
scopedPointerComparisonTest(pa1, pa2, pb);
|
||||||
|
|
||||||
|
QT_WARNING_PUSH
|
||||||
|
QT_WARNING_DISABLE_DEPRECATED
|
||||||
pa2.take();
|
pa2.take();
|
||||||
|
QT_WARNING_POP
|
||||||
|
|
||||||
QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 85 );
|
QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 85 );
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user