diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-26 18:25:06 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-29 14:33:23 +0200 |
| commit | dfeedc17a25d8d2fdc4e52927e7c34f1ff045c32 (patch) | |
| tree | b1f658fe3437db8a794520328845af18048688e0 /tests/auto/corelib | |
| parent | 57337f21c79f0478927a1f3a685af29883540e5e (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')
6 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp index 7060fc8b31..56319f215d 100644 --- a/tests/auto/corelib/global/qflags/tst_qflags.cpp +++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp @@ -27,6 +27,8 @@ ****************************************************************************/ #include <QtTest/QtTest> +QT_WARNING_DISABLE_DEPRECATED + class tst_QFlags: public QObject { Q_OBJECT diff --git a/tests/auto/corelib/global/qrand/tst_qrand.cpp b/tests/auto/corelib/global/qrand/tst_qrand.cpp index 6a4b2b322b..279f4e0a34 100644 --- a/tests/auto/corelib/global/qrand/tst_qrand.cpp +++ b/tests/auto/corelib/global/qrand/tst_qrand.cpp @@ -27,6 +27,8 @@ ****************************************************************************/ #include <QtTest/QtTest> +QT_WARNING_DISABLE_DEPRECATED + class tst_QRand: public QObject { Q_OBJECT diff --git a/tests/auto/corelib/serialization/json/tst_qtjson.cpp b/tests/auto/corelib/serialization/json/tst_qtjson.cpp index abe1b069e7..0cc38e0845 100644 --- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp +++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp @@ -28,6 +28,8 @@ #include <QtTest> +QT_WARNING_DISABLE_DEPRECATED + #include "qjsonarray.h" #include "qjsonobject.h" #include "qjsonvalue.h" 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() { diff --git a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp index 078351f388..964c68c9e9 100644 --- a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp +++ b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp @@ -29,6 +29,8 @@ #include "../../../../../src/corelib/tools/qalgorithms.h" #include <QtTest/QtTest> +QT_WARNING_DISABLE_DEPRECATED + #include <iostream> #include <iomanip> #include <sstream> diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp index 397e2b6ba6..b812eb89a1 100644 --- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp +++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp @@ -30,6 +30,7 @@ #include <QtTest/QtTest> #include <QDebug> +QT_WARNING_DISABLE_DEPRECATED class tst_QMap : public QObject { |