1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable deprecation warnings in some tests

Browse Source 
The tests are testing deprecated functionality, which we
still want to test.

Change-Id: Iad6ed35800896170c17fe019c7a6ecda22398ac3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-07-26 18:25:06 +02:00
parent 57337f21c7
commit dfeedc17a2
8 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/global/qflags/tst_qflags.cpp
View File

@ -27,6 +27,8 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QtTest/QtTest>
QT_WARNING_DISABLE_DEPRECATED
class tst_QFlags: public QObject class tst_QFlags: public QObject
{ {
Q_OBJECT Q_OBJECT

2
tests/auto/corelib/global/qrand/tst_qrand.cpp
View File

@ -27,6 +27,8 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QtTest/QtTest>
QT_WARNING_DISABLE_DEPRECATED
class tst_QRand: public QObject class tst_QRand: public QObject
{ {
Q_OBJECT Q_OBJECT

2
tests/auto/corelib/serialization/json/tst_qtjson.cpp
View File

@ -28,6 +28,8 @@
#include <QtTest> #include <QtTest>
QT_WARNING_DISABLE_DEPRECATED
#include "qjsonarray.h" #include "qjsonarray.h"
#include "qjsonobject.h" #include "qjsonobject.h"
#include "qjsonvalue.h" #include "qjsonvalue.h"

3
tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp
View File

@ -1262,6 +1262,8 @@ void tst_QStringConverter::utf8Codec()
QCOMPARE(str, res); QCOMPARE(str, res);
} }
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
void tst_QStringConverter::utf8bom_data() void tst_QStringConverter::utf8bom_data()
{ {
QTest::addColumn<QByteArray>("data"); QTest::addColumn<QByteArray>("data");
@ -1312,6 +1314,7 @@ void tst_QStringConverter::utf8bom_data()
<< QString::fromUtf16(data, sizeof(data)/sizeof(short)); << QString::fromUtf16(data, sizeof(data)/sizeof(short));
} }
} }
QT_WARNING_POP
void tst_QStringConverter::utf8bom() void tst_QStringConverter::utf8bom()
{ {

2
tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
View File

@ -29,6 +29,8 @@
#include "../../../../../src/corelib/tools/qalgorithms.h" #include "../../../../../src/corelib/tools/qalgorithms.h"
#include <QtTest/QtTest> #include <QtTest/QtTest>
QT_WARNING_DISABLE_DEPRECATED
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
#include <sstream> #include <sstream>

1
tests/auto/corelib/tools/qmap/tst_qmap.cpp
View File

@ -30,6 +30,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QDebug> #include <QDebug>
QT_WARNING_DISABLE_DEPRECATED
class tst_QMap : public QObject class tst_QMap : public QObject
{ {

2
tests/auto/xml/sax/qxml/tst_qxml.cpp
View File

@ -28,6 +28,8 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
QT_WARNING_DISABLE_DEPRECATED
#include <qcoreapplication.h> #include <qcoreapplication.h>
#include <qdebug.h> #include <qdebug.h>
#include <qxml.h> #include <qxml.h>

2
tests/auto/xml/sax/qxmlsimplereader/parser/parser.h
View File

@ -30,6 +30,8 @@
#include <qglobal.h> #include <qglobal.h>
QT_WARNING_DISABLE_DEPRECATED
#if QT_DEPRECATED_SINCE(5, 15) #if QT_DEPRECATED_SINCE(5, 15)
#include <qfile.h> #include <qfile.h>