Browse Source

Create helper function to get OS name

adaptive-webui-19844
Chocobo1 9 years ago
parent
commit
498f5e3877
  1. 7
      src/app/stacktrace_win_dlg.h
  2. 16
      src/base/utils/misc.cpp
  3. 2
      src/base/utils/misc.h

7
src/app/stacktrace_win_dlg.h

@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
#include <QDialog>
#include "boost/version.hpp"
#include "libtorrent/version.hpp"
#include "base/utils/misc.h"
#include "ui_stacktrace_win_dlg.h"
class StraceDlg : public QDialog, private Ui::errorDialog
@ -67,13 +68,15 @@ public: @@ -67,13 +68,15 @@ public:
"qBittorrent version: " VERSION "<br/>"
"Libtorrent version: " LIBTORRENT_VERSION "<br/>"
"Qt version: " QT_VERSION_STR "<br/>"
"Boost version: %1.%2.%3"
"Boost version: %1.%2.%3<br/>"
"OS version: %4"
"</font></p><br/>"
"<pre><code>%4</code></pre>"
"<pre><code>%5</code></pre>"
"<br/><hr><br/><br/>")
.arg(boostVerMajor)
.arg(boostVerMinor)
.arg(boostVerSubMin)
.arg(Utils::Misc::osName())
.arg(trace);
errorText->setHtml(htmlStr);

16
src/base/utils/misc.cpp

@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
#include <QProcess>
#include <QSettings>
#include <QThread>
#include <QSysInfo>
#ifdef DISABLE_GUI
#include <QCoreApplication>
@ -634,3 +635,18 @@ QSize Utils::Misc::smallIconSize() @@ -634,3 +635,18 @@ QSize Utils::Misc::smallIconSize()
return QSize(s, s);
}
#endif
QString Utils::Misc::osName()
{
// static initialization for usage in signal handler
static const QString name =
#ifdef QBT_USES_QT5
QString("%1 %2 %3")
.arg(QSysInfo::prettyProductName())
.arg(QSysInfo::kernelVersion())
.arg(QSysInfo::currentCpuArchitecture());
#else
"<Input OS name here>";
#endif
return name;
}

2
src/base/utils/misc.h

@ -56,6 +56,8 @@ namespace Utils @@ -56,6 +56,8 @@ namespace Utils
QPoint screenCenter(QWidget *win);
QSize smallIconSize();
#endif
QString osName();
int pythonVersion();
QString pythonExecutable();
QString pythonVersionComplete();

Loading…
Cancel
Save