diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 01:01:20 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 01:01:20 +0200 |
| commit | 4e40c54a3caabb6bced27e18e040ee88b739a3c8 (patch) | |
| tree | bf33b7207326f516a119e72ca1c5e02e248206e0 /src/testlib/qtestcase.cpp | |
| parent | fbda189e081e6c7abf82334c0ac71b16ec2c37dd (diff) | |
| parent | 9e59024bf80124dbf301e8b3dca3dc4548fee428 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I77ba01f09b3dbcaf13cb265a70d9da661c32a61f
Diffstat (limited to 'src/testlib/qtestcase.cpp')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 5c87844fcd..fdc909e7e9 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2805,8 +2805,11 @@ template <> Q_TESTLIB_EXPORT char *QTest::toString<char>(const char &t) */ char *QTest::toString(const char *str) { - if (!str) - return nullptr; + if (!str) { + char *msg = new char[1]; + *msg = '\0'; + return msg; + } char *msg = new char[strlen(str) + 1]; return qstrcpy(msg, str); } |