d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-30 08:24:22 +00:00
Code Issues Projects Releases Wiki Activity

Create helper function to get libtorrent version

Browse Source
This commit is contained in:
Chocobo1 2016-02-27 08:38:52 +08:00
parent 12627bbc10
commit d0e31adaf7
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/stacktrace_win_dlg.h
View File

@ -32,7 +32,6 @@
#include <QString> #include <QString>
#include <QDialog> #include <QDialog>
#include "libtorrent/version.hpp"
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "ui_stacktrace_win_dlg.h" #include "ui_stacktrace_win_dlg.h"
@ -62,13 +61,14 @@ public:
"<br/><hr><br/>" "<br/><hr><br/>"
"<p align=center><font size=4>" "<p align=center><font size=4>"
"qBittorrent version: " VERSION "<br/>" "qBittorrent version: " VERSION "<br/>"
"Libtorrent version: " LIBTORRENT_VERSION "<br/>" "Libtorrent version: %1<br/>"
"Qt version: " QT_VERSION_STR "<br/>" "Qt version: " QT_VERSION_STR "<br/>"
"Boost version: %1<br/>" "Boost version: %2<br/>"
"OS version: %2" "OS version: %3"
"</font></p><br/>" "</font></p><br/>"
"<pre><code>%3</code></pre>" "<pre><code>%4</code></pre>"
"<br/><hr><br/><br/>") "<br/><hr><br/><br/>")
.arg(Utils::Misc::libtorrentVersionString())
.arg(Utils::Misc::boostVersionString()) .arg(Utils::Misc::boostVersionString())
.arg(Utils::Misc::osName()) .arg(Utils::Misc::osName())
.arg(trace); .arg(trace);

8
src/base/utils/misc.cpp
View File

@ -39,6 +39,7 @@
#include <QThread> #include <QThread>
#include <QSysInfo> #include <QSysInfo>
#include <boost/version.hpp> #include <boost/version.hpp>
#include <libtorrent/version.hpp>
#ifdef DISABLE_GUI #ifdef DISABLE_GUI
#include <QCoreApplication> #include <QCoreApplication>
@ -661,3 +662,10 @@ QString Utils::Misc::boostVersionString()
.arg(BOOST_VERSION % 100); .arg(BOOST_VERSION % 100);
return ver; return ver;
} }
QString Utils::Misc::libtorrentVersionString()
{
// static initialization for usage in signal handler
static const QString ver = LIBTORRENT_VERSION;
return ver;
}

1
src/base/utils/misc.h
View File

@ -58,6 +58,7 @@ namespace Utils
#endif #endif
QString osName(); QString osName();
QString boostVersionString(); QString boostVersionString();
QString libtorrentVersionString();
int pythonVersion(); int pythonVersion();
QString pythonExecutable(); QString pythonExecutable();

3
src/gui/about_imp.h
View File

@ -33,7 +33,6 @@
#include "ui_about.h" #include "ui_about.h"
#include <QFile> #include <QFile>
#include <libtorrent/version.hpp>
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "base/unicodestrings.h" #include "base/unicodestrings.h"
@ -91,7 +90,7 @@ public:
// Libraries // Libraries
label_11->setText(QT_VERSION_STR); label_11->setText(QT_VERSION_STR);
label_12->setText(LIBTORRENT_VERSION); label_12->setText(Utils::Misc::libtorrentVersionString());
label_13->setText(Utils::Misc::boostVersionString()); label_13->setText(Utils::Misc::boostVersionString());
show(); show();