tagged v2.5.0beta6 release

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/GeoIP.dat") {
+  exists("GeoIP.dat") {
     message("GeoIP.dat was found in src/geoip/.")
     RESOURCES += $$PWD/geoip.qrc
   } else {

src/qtlibtorrent/qbtsession.cpp

@@ -65,6 +65,7 @@
 #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>
 
@@ -1860,7 +1861,15 @@ 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) {

src/src.pro

@@ -2,7 +2,7 @@
 TEMPLATE = app
 CONFIG += qt thread
 
-unix:macx {
+unix:!macx {
   exists(../conf.pri) {
     # generated by configure
     include(../conf.pri)

version.pri

@@ -1,7 +1,7 @@
 os2 {
-    DEFINES += VERSION=\'\"v2.5.0beta5\"\'
+    DEFINES += VERSION=\'\"v2.5.0beta6\"\'
 } else {
-    DEFINES += VERSION=\\\"v2.5.0beta5\\\"
+    DEFINES += VERSION=\\\"v2.5.0beta6\\\"
 }
 DEFINES += VERSION_MAJOR=2
 DEFINES += VERSION_MINOR=5