diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-30 12:57:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-30 14:43:02 +0200 |
| commit | 99cdd5fc67386fb3361299b9ec493e081043097d (patch) | |
| tree | 2c1d41d3d71f671f104e93b87bf11bdd169ba746 /src/testlib | |
| parent | 86876744f07cbaa01daca6869b896741878c39a3 (diff) | |
| parent | 46201f0e82a7b1629adad196dfa8f7ff1cf4dffd (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/corelib/global/qrandom.cpp
src/corelib/io/qfileinfo.cpp
src/corelib/kernel/qeventdispatcher_win.cpp
src/corelib/kernel/qeventdispatcher_win_p.h
src/gui/text/qfontdatabase.cpp
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
src/plugins/platforms/windows/qwindowsglcontext.cpp
src/testlib/qtestcase.cpp
Done-With: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I4893212471aa24be804c989a581810e2f714545c
Diffstat (limited to 'src/testlib')
| -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 990fc5679d..908155e8b5 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2774,8 +2774,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); } |