mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-24 02:06:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2990 from LazyBui/master

Browse source 
Removing the confusion caused by moving GeoIP code/.dat
This commit is contained in:
sledgehammer999 2015-05-13 22:58:32 +03:00
commit 2a2cb313cf
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -1390,7 +1390,7 @@ Optional Packages:
--with-geoip-database-embedded --with-geoip-database-embedded
Embed the GeoIP database in the qBittorrent Embed the GeoIP database in the qBittorrent
executable (please follow instructions in executable (please follow instructions in
src/geoip/README) (default=no) src/gui/geoip/README) (default=no)
--with-qtsingleapplication=[system|shipped] --with-qtsingleapplication=[system|shipped]
Use the shipped qtsingleapplication library or the Use the shipped qtsingleapplication library or the
system one (default=shipped) system one (default=shipped)

2
configure.ac
View file

@ -26,7 +26,7 @@ AC_ARG_WITH(libtorrent-rasterbar0.16,
AC_ARG_WITH(geoip-database-embedded, AC_ARG_WITH(geoip-database-embedded,
[AS_HELP_STRING([--with-geoip-database-embedded], [AS_HELP_STRING([--with-geoip-database-embedded],
[Embed the GeoIP database in the qBittorrent executable (please follow instructions in src/geoip/README) (default=no)])], [Embed the GeoIP database in the qBittorrent executable (please follow instructions in src/gui/geoip/README) (default=no)])],
[], [],
[with_geoip_database_embedded=no]) [with_geoip_database_embedded=no])

4
src/gui/geoip/geoip.pri
View file

@ -8,11 +8,11 @@ SOURCES += $$PWD/geoipmanager.cpp
# should be embedded in qBittorrent executable # should be embedded in qBittorrent executable
contains(DEFINES, WITH_GEOIP_EMBEDDED) { contains(DEFINES, WITH_GEOIP_EMBEDDED) {
exists("GeoIP.dat") { exists("GeoIP.dat") {
message("GeoIP.dat was found in src/geoip/.") message("GeoIP.dat was found in src/gui/geoip/.")
RESOURCES += $$PWD/geoip.qrc RESOURCES += $$PWD/geoip.qrc
} else { } else {
DEFINES -= WITH_GEOIP_EMBEDDED DEFINES -= WITH_GEOIP_EMBEDDED
error("GeoIP.dat was not found in src/geoip/ folder, please follow instructions in src/geoip/README.") error("GeoIP.dat was not found in src/gui/geoip/ folder, please follow instructions in src/gui/geoip/README.")
} }
} else { } else {
message("GeoIP database will not be embedded in qBittorrent executable.") message("GeoIP database will not be embedded in qBittorrent executable.")