whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gcc warning about possible call of printf with nullptr 

Amends fe4794f70e

Depending on the types, the generic QTest::toString version might be
used, which returns nullptr.

Change-Id: Ic60675057181629d1cf9cb22e7508d57c026a0ad
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
bb10
Volker Hilsheimer 2020-09-02 15:04:09 +02:00
parent e3c08da307
commit 7f7b60d8d5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/testlib/qabstractitemmodeltester.cpp
View File

@ -822,7 +822,9 @@ bool QAbstractItemModelTesterPrivate::compare(const T1 &t1, const T2 &t2,
if (!result) {
auto t1string = QTest::toString(t1);
auto t2string = QTest::toString(t2);
qCWarning(lcModelTest, formatString, actual, t1string, expected, t2string, file, line);
qCWarning(lcModelTest, formatString, actual, t1string ? t1string : "(nullptr)",
expected, t2string ? t2string : "(nullptr)",
file, line);
delete [] t1string;
delete [] t2string;
}
@ -832,7 +834,9 @@ bool QAbstractItemModelTesterPrivate::compare(const T1 &t1, const T2 &t2,
if (!result) {
auto t1string = QTest::toString(t1);
auto t2string = QTest::toString(t2);
qFatal(formatString, actual, t1string, expected, t2string, file, line);
qFatal(formatString, actual, t1string ? t1string : "(nullptr)",
expected, t2string ? t2string : "(nullptr)",
file, line);
delete [] t1string;
delete [] t2string;
}