qiurui
/
qt5compat
mirror of https://github.com/qt/qt5compat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix QFile::open() Easter Egg 

Fix the delayed marking of QFile::open() as [[nodiscard]] in this
module, too.

Pick-to: 6.9 6.8 6.5
Change-Id: I7b1d76cc23c2ce1dfb8c03ca945dcecb6c54988f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2024-12-17 09:32:07 +01:00
parent 736f207cce
commit 2d8df31902
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/core5/serialization/json/tst_qtjson.cpp
View File

@ -45,7 +45,7 @@ void tst_QtJson::initTestCase()
void tst_QtJson::fromBinary() void tst_QtJson::fromBinary()
{ {
QFile file(testDataDir + "/test.json"); QFile file(testDataDir + "/test.json");
file.open(QFile::ReadOnly); QVERIFY(file.open(QFile::ReadOnly));
QByteArray testJson = file.readAll(); QByteArray testJson = file.readAll();
QJsonDocument doc = QJsonDocument::fromJson(testJson); QJsonDocument doc = QJsonDocument::fromJson(testJson);
@ -54,7 +54,7 @@ void tst_QtJson::fromBinary()
QCOMPARE(doc, outdoc); QCOMPARE(doc, outdoc);
QFile bfile(testDataDir + "/test.bjson"); QFile bfile(testDataDir + "/test.bjson");
bfile.open(QFile::ReadOnly); QVERIFY(bfile.open(QFile::ReadOnly));
QByteArray binary = bfile.readAll(); QByteArray binary = bfile.readAll();
QJsonDocument bdoc = QBinaryJson::fromBinaryData(binary); QJsonDocument bdoc = QBinaryJson::fromBinaryData(binary);
@ -102,7 +102,7 @@ void tst_QtJson::invalidBinaryData()
if (!files.at(i).isFile()) if (!files.at(i).isFile())
continue; continue;
QFile file(files.at(i).filePath()); QFile file(files.at(i).filePath());
file.open(QIODevice::ReadOnly); QVERIFY(file.open(QIODevice::ReadOnly));
QByteArray bytes = file.readAll(); QByteArray bytes = file.readAll();
bytes.squeeze(); bytes.squeeze();
QJsonDocument document = QBinaryJson::fromRawData(bytes.constData(), bytes.size()); QJsonDocument document = QBinaryJson::fromRawData(bytes.constData(), bytes.size());
@ -209,7 +209,7 @@ void tst_QtJson::validation()
QFile file2(testDataDir + "/test3.json"); QFile file2(testDataDir + "/test3.json");
file2.open(QFile::ReadOnly); QVERIFY(file2.open(QFile::ReadOnly));
testJson = file2.readAll(); testJson = file2.readAll();
QVERIFY(!testJson.isEmpty()); QVERIFY(!testJson.isEmpty());

8
tests/benchmarks/core5/text/qregexp/main.cpp
View File

@ -23,6 +23,8 @@ class tst_qregexp : public QObject
public: public:
tst_qregexp(); tst_qregexp();
private slots: private slots:
void initTestCase();
void escape_old(); void escape_old();
void escape_old_data() { escape_data(); } void escape_old_data() { escape_data(); }
void escape_new1(); void escape_new1();
@ -65,9 +67,13 @@ private:
tst_qregexp::tst_qregexp() tst_qregexp::tst_qregexp()
:QObject() :QObject()
,str1("We are all happy monkeys") ,str1("We are all happy monkeys")
{
}
void tst_qregexp::initTestCase()
{ {
QFile f(":/main.cpp"); QFile f(":/main.cpp");
f.open(QFile::ReadOnly); QVERIFY(f.open(QFile::ReadOnly));
str2=f.readAll(); str2=f.readAll();
} }