summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/text
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-07-26 18:25:06 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-07-29 14:33:23 +0200
commitdfeedc17a25d8d2fdc4e52927e7c34f1ff045c32 (patch)
treeb1f658fe3437db8a794520328845af18048688e0 /tests/auto/corelib/text
parent57337f21c79f0478927a1f3a685af29883540e5e (diff)
Disable deprecation warnings in some tests
The tests are testing deprecated functionality, which we still want to test. Change-Id: Iad6ed35800896170c17fe019c7a6ecda22398ac3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/corelib/text')
-rw-r--r--tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp b/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp
index 5de3beff77..9c2f5badc6 100644
--- a/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp
+++ b/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp
@@ -1262,6 +1262,8 @@ void tst_QStringConverter::utf8Codec()
QCOMPARE(str, res);
}
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
void tst_QStringConverter::utf8bom_data()
{
QTest::addColumn<QByteArray>("data");
@@ -1312,6 +1314,7 @@ void tst_QStringConverter::utf8bom_data()
<< QString::fromUtf16(data, sizeof(data)/sizeof(short));
}
}
+QT_WARNING_POP
void tst_QStringConverter::utf8bom()
{