Tagged v2.5.0beta5 release

2025-10-19 05:12:18 +02:00 · 2010-11-20 19:49:53 +00:00
22 changed files with 4832 additions and 4843 deletions
--- a/src/geoip/geoip.pri
+++ b/src/geoip/geoip.pri
@@ -7,7 +7,7 @@ SOURCES += $$PWD/geoipmanager.cpp
 # Add GeoIP resource file if the GeoIP database
 # should be embedded in qBittorrent executable
 contains(DEFINES, WITH_GEOIP_EMBEDDED) {
-  exists("GeoIP.dat") {
+  exists("geoip/GeoIP.dat") {
    message("GeoIP.dat was found in src/geoip/.")
    RESOURCES += $$PWD/geoip.qrc
  } else {
--- a/src/lang/qbittorrent_ar.ts
+++ b/src/lang/qbittorrent_ar.ts
--- a/src/lang/qbittorrent_bg.ts
+++ b/src/lang/qbittorrent_bg.ts
--- a/src/lang/qbittorrent_ca.ts
+++ b/src/lang/qbittorrent_ca.ts
--- a/src/lang/qbittorrent_cs.ts
+++ b/src/lang/qbittorrent_cs.ts
--- a/src/lang/qbittorrent_da.ts
+++ b/src/lang/qbittorrent_da.ts
--- a/src/lang/qbittorrent_de.ts
+++ b/src/lang/qbittorrent_de.ts
--- a/src/lang/qbittorrent_el.ts
+++ b/src/lang/qbittorrent_el.ts
--- a/src/lang/qbittorrent_en.ts
+++ b/src/lang/qbittorrent_en.ts
--- a/src/lang/qbittorrent_es.ts
+++ b/src/lang/qbittorrent_es.ts
--- a/src/lang/qbittorrent_fi.ts
+++ b/src/lang/qbittorrent_fi.ts
--- a/src/lang/qbittorrent_fr.qm
+++ b/src/lang/qbittorrent_fr.qm
--- a/src/lang/qbittorrent_fr.ts
+++ b/src/lang/qbittorrent_fr.ts
--- a/src/lang/qbittorrent_hu.ts
+++ b/src/lang/qbittorrent_hu.ts
--- a/src/lang/qbittorrent_it.ts
+++ b/src/lang/qbittorrent_it.ts
--- a/src/lang/qbittorrent_ja.ts
+++ b/src/lang/qbittorrent_ja.ts
--- a/src/lang/qbittorrent_ko.ts
+++ b/src/lang/qbittorrent_ko.ts
--- a/src/lang/qbittorrent_nb.ts
+++ b/src/lang/qbittorrent_nb.ts
--- a/src/lang/qbittorrent_zh.qm
+++ b/src/lang/qbittorrent_zh.qm
--- a/src/lang/qbittorrent_zh.ts
+++ b/src/lang/qbittorrent_zh.ts
--- a/src/qtlibtorrent/qbtsession.cpp
+++ b/src/qtlibtorrent/qbtsession.cpp
@@ -65,7 +65,6 @@
 #include <libtorrent/identify_client.hpp>
 #include <libtorrent/alert_types.hpp>
 #include <libtorrent/torrent_info.hpp>
-#include <libtorrent/version.hpp>
 #include <boost/filesystem/exception.hpp>
 #include <queue>

@@ -1861,15 +1860,7 @@ void QBtSession::setSessionSettings(const session_settings &sessionSettings) {
 // Set Proxy
 void QBtSession::setProxySettings(const proxy_settings &proxySettings) {
  qDebug() << Q_FUNC_INFO;
-
-#if (LIBTORRENT_VERSION_MINOR > 15) || (LIBTORRENT_VERSION_MINOR == 15 && LIBTORRENT_VERSION_TINY > 4)
  s->set_proxy(proxySettings);
-#else
-  s->set_peer_proxy(proxySettings);
-  s->set_web_seed_proxy(proxySettings);
-  s->set_tracker_proxy(proxySettings);
-  s->set_dht_proxy(proxySettings);
-#endif
  // Define environment variable
  QString proxy_str;
  switch(proxySettings.type) {
--- a/version.pri
+++ b/version.pri
@@ -1,7 +1,7 @@
 os2 {
-    DEFINES += VERSION=\'\"v2.5.0beta6\"\'
+    DEFINES += VERSION=\'\"v2.5.0beta5\"\'
 } else {
-    DEFINES += VERSION=\\\"v2.5.0beta6\\\"
+    DEFINES += VERSION=\\\"v2.5.0beta5\\\"
 }
 DEFINES += VERSION_MAJOR=2
 DEFINES += VERSION_MINOR=5