diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-11-24 10:07:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-11-24 10:07:10 +0100 |
| commit | 9698ae50c51cc3ec8c5a1ab57d45e3d60c2abe80 (patch) | |
| tree | eb34973adf4913413315c77bfe08eb7b870e389d /src/plugins/valgrind | |
| parent | b01b44a6b2213439b4aff68b98a232f022b2d3cd (diff) | |
| parent | 5841e95123785d8b578e717c0e120ea434e6421b (diff) | |
Merge remote-tracking branch 'origin/12.0'
Conflicts:
src/plugins/valgrind/xmlprotocol/parser.cpp
Change-Id: I905a5c4f7334f733e99359fbfccd1572b4007696
Diffstat (limited to 'src/plugins/valgrind')
| -rw-r--r-- | src/plugins/valgrind/xmlprotocol/parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/valgrind/xmlprotocol/parser.cpp b/src/plugins/valgrind/xmlprotocol/parser.cpp index 72a393fe7c5..2bab91fa710 100644 --- a/src/plugins/valgrind/xmlprotocol/parser.cpp +++ b/src/plugins/valgrind/xmlprotocol/parser.cpp @@ -711,7 +711,7 @@ public: m_errorString = data.m_internalError; }); QObject::connect(m_watcher.get(), &QFutureWatcherBase::finished, q, [this] { - emit q->done(toDoneResult(!m_errorString), *m_errorString); + emit q->done(toDoneResult(!m_errorString), m_errorString.value_or(QString())); m_watcher.release()->deleteLater(); m_thread.reset(); m_socket.reset(); |