Skip to content

Commit d4ae0d2

Browse files
committed
Add version to diagnostics
Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent ebf2d96 commit d4ae0d2

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

client/CDocSupport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ void DDCDocLogger::logMessage(libcdoc::LogLevel level, std::string_view file, in
342342
file = file.substr(pos);
343343

344344
ofs.write(QStringLiteral("%1 %2 %3:%4 %5\n")
345-
.arg(time, level2Str(level), file)
345+
.arg(time, level2Str(level), QLatin1String(file.data(), file.size()))
346346
.arg(line)
347347
.arg(message).toUtf8());
348348
}

client/Diagnostics_unix.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
#include "Common.h"
2323

24+
#include "CDoc.h"
25+
2426
#include <QtCore/QCoreApplication>
2527
#include <QtCore/QFile>
2628
#include <QtCore/QRegularExpression>
@@ -116,10 +118,13 @@ void Diagnostics::run()
116118
emit update( info );
117119
info.clear();
118120

121+
auto libcdocVer = libcdoc::getVersion();
122+
119123
s << "<b>" << tr("Libraries") << ":</b><br />"
120124
<< "QT (" << qVersion() << ")<br />"
121125
<< "OpenSSL build (" << QSslSocket::sslLibraryBuildVersionString() << ")<br />"
122126
<< "OpenSSL current (" << QSslSocket::sslLibraryVersionString() << ")<br />"
127+
<< "libcdoc (" << QLatin1String(libcdocVer.data(), libcdocVer.size()) << ")<br />"
123128
<< packages({
124129
#ifdef Q_OS_DARWIN
125130
"digidocpp"

client/Diagnostics_win.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
#include "Common.h"
2323

24+
#include <CDoc.h>
25+
2426
#include <QtCore/QCoreApplication>
2527
#include <QtCore/QProcess>
2628
#include <QtCore/QRegularExpression>
@@ -133,10 +135,12 @@ void Diagnostics::run()
133135
emit update( info );
134136
info.clear();
135137

138+
auto libcdocVer = libcdoc::getVersion();
136139
s << "<b>" << tr("Libraries") << ":</b><br />"
137140
<< "QT (" << qVersion() << ")<br />"
138141
<< "OpenSSL build (" << QSslSocket::sslLibraryBuildVersionString() << ")<br />"
139-
<< "OpenSSL current (" << QSslSocket::sslLibraryVersionString() << ")<br />";
142+
<< "OpenSSL current (" << QSslSocket::sslLibraryVersionString() << ")<br />"
143+
<< "libcdoc (" << QLatin1String(libcdocVer.data(), libcdocVer.size()) << ")<br />";
140144

141145
QByteArray path = qgetenv("PATH");
142146
qputenv("PATH", path

0 commit comments

Comments
 (0)