Compare commits
1 Commits
release-2.
...
release-2.
Author | SHA1 | Date | |
---|---|---|---|
![]() |
5ec0900b84 |
12
AUTHORS
@@ -2,7 +2,6 @@ Author:
|
|||||||
* Christophe Dumez <chris@qbittorrent.org>
|
* Christophe Dumez <chris@qbittorrent.org>
|
||||||
|
|
||||||
Contributors:
|
Contributors:
|
||||||
* Vladimir Golovnev <glassez@yandex.ru>
|
|
||||||
* Stefanos Antaris <santaris@csd.auth.gr>
|
* Stefanos Antaris <santaris@csd.auth.gr>
|
||||||
* Mohammad Dib <mdib@qbittorrent.org>
|
* Mohammad Dib <mdib@qbittorrent.org>
|
||||||
* Mirco Chinelli <infinity89@fastwebmail.it>
|
* Mirco Chinelli <infinity89@fastwebmail.it>
|
||||||
@@ -50,10 +49,6 @@ Images Authors:
|
|||||||
copyright: Greg Houston <gregory.houston@gmail.com>
|
copyright: Greg Houston <gregory.houston@gmail.com>
|
||||||
license: MIT
|
license: MIT
|
||||||
|
|
||||||
* file: src/Icons/skin/qbittorrent_mono.svg
|
|
||||||
copyright: Daniel Eguren <deguren@gmail.com>
|
|
||||||
license: LGPL
|
|
||||||
|
|
||||||
* file: src/search_engine/engines/btjunkie.png
|
* file: src/search_engine/engines/btjunkie.png
|
||||||
copyright: Downloaded from btjunkie.org
|
copyright: Downloaded from btjunkie.org
|
||||||
|
|
||||||
@@ -73,7 +68,6 @@ Translations authors:
|
|||||||
* files: src/lang/*.ts
|
* files: src/lang/*.ts
|
||||||
copyright:
|
copyright:
|
||||||
- Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
|
- Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
|
||||||
- Armenian: Hrant Ohanyan (hrantohanyan@mail.am)
|
|
||||||
- Brazilian: Nick Marinho (nickmarinho@gmail.com)
|
- Brazilian: Nick Marinho (nickmarinho@gmail.com)
|
||||||
- Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
|
- Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
|
||||||
- Catalan: Francisco Luque Contreras (frannoe@ya.com)
|
- Catalan: Francisco Luque Contreras (frannoe@ya.com)
|
||||||
@@ -82,19 +76,17 @@ Translations authors:
|
|||||||
- Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
|
- Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
|
||||||
- Czech: Jirka Vilim (web@tets.cz)
|
- Czech: Jirka Vilim (web@tets.cz)
|
||||||
- Danish: Mathias Nielsen (comoneo@gmail.com)
|
- Danish: Mathias Nielsen (comoneo@gmail.com)
|
||||||
- Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com)
|
- Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
|
||||||
- English: Christophe Dumez (chris@qbittorrent.org)
|
- English: Christophe Dumez (chris@qbittorrent.org)
|
||||||
- Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
|
- Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
|
||||||
- French: Christophe Dumez (chris@qbittorrent.org)
|
- French: Christophe Dumez (chris@qbittorrent.org)
|
||||||
- Galician: Marcos Lans (marcoslansgarza@gmail.com)
|
|
||||||
- German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
|
- German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
|
||||||
- Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
|
- Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
|
||||||
- Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
|
- Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
|
||||||
- Italian: Matteo Sechi (bu17714@gmail.com)
|
- Italian: Matteo Sechi (bu17714@gmail.com)
|
||||||
- Japanese: Nardog (alphisation@gmail.com)
|
- Japanese: Nardog (alphisation@gmail.com)
|
||||||
- Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
|
- Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
|
||||||
- Lithuanian: Naglis Jonaitis (njonaitis@gmail.com)
|
- Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)
|
||||||
- Norwegian: Tomaso
|
|
||||||
- Polish: Mariusz Fik (fisiu@opensuse.org)
|
- Polish: Mariusz Fik (fisiu@opensuse.org)
|
||||||
- Portuguese: Nick Marinho (nickmarinho@gmail.com)
|
- Portuguese: Nick Marinho (nickmarinho@gmail.com)
|
||||||
- Romanian: Obada Denis (obadadenis@users.sourceforge.net)
|
- Romanian: Obada Denis (obadadenis@users.sourceforge.net)
|
||||||
|
49
Changelog
@@ -1,40 +1,4 @@
|
|||||||
* Sun Mar 20 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.7.0
|
* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
|
||||||
- FEATURE: Added search field for torrent content
|
|
||||||
- FEATURE: Added auto-shutdown confirmation dialog
|
|
||||||
- FEATURE: Added option to skip torrent deletion confirmation (Ville Kiiskinen)
|
|
||||||
- FEATURE: IP address reported to trackers is now customizable
|
|
||||||
- FEATURE: Inhibit system sleep when torrents are active (Vladimir Golovnev)
|
|
||||||
- FEATURE: Added option to bypass Web UI authentication for localhost
|
|
||||||
- FEATURE: Added option to disable program exit confirmation
|
|
||||||
- FEATURE: Added per-torrent ratio limiting (Christian Kandeler)
|
|
||||||
- FEATURE: Torrent content list is now sortable
|
|
||||||
- BUGFIX: Fix compilation with namespaced Qt (Christian Kandeler)
|
|
||||||
- BUGFIX: Added length restriction on UI lock password
|
|
||||||
- COSMETIC: Added monochrome tray icon
|
|
||||||
- COSMETIC: Improved status bar's style
|
|
||||||
- OTHER: Make QtDBus dependency optional (X11)
|
|
||||||
|
|
||||||
* Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
|
|
||||||
- FEATURE: Use system icons (Linux, Qt >= 4.6)
|
|
||||||
- FEATURE: Improved ETA calculation
|
|
||||||
- FEATURE: Simplify program preferences
|
|
||||||
- FEATURE: Software update check can now be disabled (Mac OS X / Windows)
|
|
||||||
- FEATURE: Display pieces size in torrent properties
|
|
||||||
- FEATURE: Added "Time Active/Seeded" column to transfer list
|
|
||||||
- FEATURE: Give feedback regarding the IP filter parsing
|
|
||||||
- FEATURE: Added a button to reload the IP filter
|
|
||||||
- FEATURE: Search engine results can now be opened in a Web browser
|
|
||||||
- FEATURE: Added a search engine plugin to extratorrent.com
|
|
||||||
- FEATURE: Added a search engine plugin for kickasstorrents.com
|
|
||||||
- FEATURE: Added auto-suspend upon downloads completion feature
|
|
||||||
- BUGFIX: Hide unwanted files that have to be partly downloaded
|
|
||||||
- BUGFIX: Do not allocate space for unwanted files (preallocation mode)
|
|
||||||
- I18N: Added Galician translation
|
|
||||||
- COSMETIC: Same deletion confirmation dialog in the GUI and Web UI
|
|
||||||
- COSMETIC: Simplified the top toolbar
|
|
||||||
- COSMETIC: Display execution log as a tab instead of a modal window
|
|
||||||
|
|
||||||
* Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
|
|
||||||
- FEATURE: qBittorrent can now act as a tracker
|
- FEATURE: qBittorrent can now act as a tracker
|
||||||
- FEATURE: New and improved RSS feed automated downloader
|
- FEATURE: New and improved RSS feed automated downloader
|
||||||
- FEATURE: Added feature to shutdown qbittorrent on torrents completion
|
- FEATURE: Added feature to shutdown qbittorrent on torrents completion
|
||||||
@@ -48,20 +12,9 @@
|
|||||||
- FEATURE: Added "Amount downloaded/left" columns to transfer list
|
- FEATURE: Added "Amount downloaded/left" columns to transfer list
|
||||||
- FEATURE: Simplified proxy settings
|
- FEATURE: Simplified proxy settings
|
||||||
- FEATURE: Optimized and improved the peer country resolution code
|
- FEATURE: Optimized and improved the peer country resolution code
|
||||||
- FEATURE: Download first/last pieces first when sequential download is
|
|
||||||
enabled (Thanks Ahmad)
|
|
||||||
- FEATURE: Download first/last pieces first now applies to all media files
|
|
||||||
in the torrent (Thanks Ahmad)
|
|
||||||
- BUGFIX: Fix SOCKS5 proxy authentication in search engine(closes #680072)
|
|
||||||
- BUGFIX: Fix two advanced settings (ignore limits on LAN and protocol
|
|
||||||
overhead inclusion in rate limiter)
|
|
||||||
- BUGFIX: Fix strict super seeding (was not working)
|
|
||||||
- BUGFIX: Improve magnet save path handling (closes #683395)
|
|
||||||
- BUGFIX: Disable overwrite confirmation in torrent addition dialog (closes # 685269)
|
|
||||||
- COSMETIC: Replaced message box by on-screen notification for download errors
|
- COSMETIC: Replaced message box by on-screen notification for download errors
|
||||||
- COSMETIC: Improved the torrent creation tool appearance
|
- COSMETIC: Improved the torrent creation tool appearance
|
||||||
- COSMETIC: Use country flags by Mark James (Thanks to Dmytro Pukha)
|
- COSMETIC: Use country flags by Mark James (Thanks to Dmytro Pukha)
|
||||||
- COSMETIC: Use bigger alternative speed icon
|
|
||||||
- OTHERS: Dropped support for Qt <= 4.4
|
- OTHERS: Dropped support for Qt <= 4.4
|
||||||
|
|
||||||
* Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
|
* Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
|
||||||
|
4
INSTALL
@@ -18,9 +18,9 @@ qBittorrent - A BitTorrent client in C++ / Qt4
|
|||||||
-> http://www.libtorrent.net
|
-> http://www.libtorrent.net
|
||||||
Be careful: another library (the one used by rTorrent) uses a similar name.
|
Be careful: another library (the one used by rTorrent) uses a similar name.
|
||||||
|
|
||||||
- libboost 1.34.x (libboost-filesystem, libboost-date-time) + libasio
|
- libboost 1.34.x (libboost-filesystem, libboost-thread, libboost-date-time) + libasio
|
||||||
or
|
or
|
||||||
- libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-date-time)
|
- libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time)
|
||||||
|
|
||||||
- python >= 2.3 (needed by search engine)
|
- python >= 2.3 (needed by search engine)
|
||||||
* Run time only dependency
|
* Run time only dependency
|
||||||
|
128
configure
vendored
@@ -18,12 +18,9 @@ Main options:
|
|||||||
--help This help text.
|
--help This help text.
|
||||||
|
|
||||||
Dependency options:
|
Dependency options:
|
||||||
--enable-debug Enable debug mode
|
|
||||||
--disable-gui Disable qBittorrent
|
--disable-gui Disable qBittorrent
|
||||||
Graphical user interface for
|
Graphical user interface for
|
||||||
headless running
|
headless running
|
||||||
--disable-qt-dbus Disable use of qt-dbus
|
|
||||||
--disable-qt-svg Disable use of qt-svg
|
|
||||||
--with-libboost-inc=[path] Path to libboost include
|
--with-libboost-inc=[path] Path to libboost include
|
||||||
files
|
files
|
||||||
--with-libboost-lib=[path] Path to libboost library
|
--with-libboost-lib=[path] Path to libboost library
|
||||||
@@ -35,6 +32,7 @@ Dependency options:
|
|||||||
executable (please follow
|
executable (please follow
|
||||||
instructions in
|
instructions in
|
||||||
src/geoip/README)
|
src/geoip/README)
|
||||||
|
--disable-qtsingleapplication Disable use of libboost
|
||||||
--with-qtsingleapplication=[system|shipped] Use the shipped
|
--with-qtsingleapplication=[system|shipped] Use the shipped
|
||||||
qtsingleapplication library
|
qtsingleapplication library
|
||||||
or the system one
|
or the system one
|
||||||
@@ -154,26 +152,11 @@ while [ $# -gt 0 ]; do
|
|||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
|
||||||
--enable-debug)
|
|
||||||
QC_ENABLE_DEBUG="Y"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
|
|
||||||
--disable-gui)
|
--disable-gui)
|
||||||
QC_DISABLE_GUI="Y"
|
QC_DISABLE_GUI="Y"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
|
||||||
--disable-qt-dbus)
|
|
||||||
QC_DISABLE_qt_dbus="Y"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
|
|
||||||
--disable-qt-svg)
|
|
||||||
QC_DISABLE_qt_svg="Y"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
|
|
||||||
--with-libboost-inc=*)
|
--with-libboost-inc=*)
|
||||||
QC_WITH_LIBBOOST_INC=$optarg
|
QC_WITH_LIBBOOST_INC=$optarg
|
||||||
shift
|
shift
|
||||||
@@ -199,6 +182,11 @@ while [ $# -gt 0 ]; do
|
|||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
--disable-qtsingleapplication)
|
||||||
|
QC_DISABLE_qtsingleapplication="Y"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
|
||||||
--with-qtsingleapplication=*)
|
--with-qtsingleapplication=*)
|
||||||
QC_WITH_QTSINGLEAPPLICATION=$optarg
|
QC_WITH_QTSINGLEAPPLICATION=$optarg
|
||||||
shift
|
shift
|
||||||
@@ -225,15 +213,13 @@ echo PREFIX=$PREFIX
|
|||||||
echo BINDIR=$BINDIR
|
echo BINDIR=$BINDIR
|
||||||
echo DATADIR=$DATADIR
|
echo DATADIR=$DATADIR
|
||||||
echo EX_QTDIR=$EX_QTDIR
|
echo EX_QTDIR=$EX_QTDIR
|
||||||
echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
|
|
||||||
echo QC_DISABLE_GUI=$QC_DISABLE_GUI
|
echo QC_DISABLE_GUI=$QC_DISABLE_GUI
|
||||||
echo QC_DISABLE_qt_dbus=$QC_DISABLE_qt_dbus
|
|
||||||
echo QC_DISABLE_qt_svg=$QC_DISABLE_qt_svg
|
|
||||||
echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
|
echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
|
||||||
echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB
|
echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB
|
||||||
echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
|
echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
|
||||||
echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database
|
echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database
|
||||||
echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED
|
echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED
|
||||||
|
echo QC_DISABLE_qtsingleapplication=$QC_DISABLE_qtsingleapplication
|
||||||
echo QC_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION
|
echo QC_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
@@ -340,7 +326,6 @@ cat >$1/modules.cpp <<EOT
|
|||||||
/*
|
/*
|
||||||
-----BEGIN QCMOD-----
|
-----BEGIN QCMOD-----
|
||||||
name: Qt >= 4.5
|
name: Qt >= 4.5
|
||||||
arg: enable-debug, Enable debug mode
|
|
||||||
arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
|
arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
|
||||||
-----END QCMOD-----
|
-----END QCMOD-----
|
||||||
*/
|
*/
|
||||||
@@ -352,87 +337,12 @@ public:
|
|||||||
QString shortname() const { return "Qt 4.5"; }
|
QString shortname() const { return "Qt 4.5"; }
|
||||||
bool exec()
|
bool exec()
|
||||||
{
|
{
|
||||||
// NOX mode
|
|
||||||
if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
||||||
conf->addExtra("CONFIG += nox");
|
conf->addExtra("CONFIG += nox");
|
||||||
}
|
}
|
||||||
// Debug mode
|
|
||||||
if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
|
|
||||||
conf->addExtra("CONFIG += debug");
|
|
||||||
}
|
|
||||||
#ifdef Q_OS_FREEBSD
|
|
||||||
conf->addLib("-lexecinfo");
|
|
||||||
conf->addExtra("MANPREFIX = \$\$PREFIX");
|
|
||||||
#else
|
|
||||||
conf->addExtra("MANPREFIX = \$\$PREFIX/share");
|
|
||||||
#endif
|
|
||||||
return(QT_VERSION >= 0x040500);
|
return(QT_VERSION >= 0x040500);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
#line 1 "qt-dbus.qcm"
|
|
||||||
/*
|
|
||||||
-----BEGIN QCMOD-----
|
|
||||||
name: qt-dbus
|
|
||||||
-----END QCMOD-----
|
|
||||||
*/
|
|
||||||
// see Conf::findPkgConfig
|
|
||||||
class qc_qt_dbus : public ConfObj
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
qc_qt_dbus(Conf *c) : ConfObj(c) {}
|
|
||||||
QString name() const { return "QtDBus >= 4.5"; }
|
|
||||||
QString shortname() const { return "qt-dbus"; }
|
|
||||||
QString checkString() const {
|
|
||||||
if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
|
|
||||||
return "";
|
|
||||||
return ConfObj::checkString();
|
|
||||||
}
|
|
||||||
bool exec(){
|
|
||||||
if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
|
|
||||||
return false;
|
|
||||||
QStringList incs;
|
|
||||||
QString req_ver = "4.5.0";
|
|
||||||
QString version, libs, other;
|
|
||||||
VersionMode mode = VersionMin;
|
|
||||||
if(conf->findPkgConfig("QtDBus", mode, req_ver, &version, &incs, &libs, &other)) {
|
|
||||||
conf->addExtra("CONFIG += dbus");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
#line 1 "qt-svg.qcm"
|
|
||||||
/*
|
|
||||||
-----BEGIN QCMOD-----
|
|
||||||
name: qt-svg
|
|
||||||
-----END QCMOD-----
|
|
||||||
*/
|
|
||||||
// see Conf::findPkgConfig
|
|
||||||
class qc_qt_svg : public ConfObj
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
qc_qt_svg(Conf *c) : ConfObj(c) {}
|
|
||||||
QString name() const { return "QtSvg >= 4.5"; }
|
|
||||||
QString shortname() const { return "qt-svg"; }
|
|
||||||
QString checkString() const {
|
|
||||||
if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
|
|
||||||
return "";
|
|
||||||
return ConfObj::checkString();
|
|
||||||
}
|
|
||||||
bool exec(){
|
|
||||||
if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
|
|
||||||
return false;
|
|
||||||
QStringList incs;
|
|
||||||
QString req_ver = "4.5.0";
|
|
||||||
QString version, libs, other;
|
|
||||||
VersionMode mode = VersionMin;
|
|
||||||
if(conf->findPkgConfig("QtSvg", mode, req_ver, &version, &incs, &libs, &other)) {
|
|
||||||
conf->addExtra("CONFIG += svg");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
#line 1 "pkg-config.qcm"
|
#line 1 "pkg-config.qcm"
|
||||||
/*
|
/*
|
||||||
-----BEGIN QCMOD-----
|
-----BEGIN QCMOD-----
|
||||||
@@ -529,6 +439,9 @@ public:
|
|||||||
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
|
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if(!conf->checkHeader(s, "boost/thread.hpp")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}else{
|
}else{
|
||||||
QStringList sl;
|
QStringList sl;
|
||||||
sl << "/usr/include";
|
sl << "/usr/include";
|
||||||
@@ -549,6 +462,9 @@ public:
|
|||||||
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
|
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if(!conf->checkHeader(s, "boost/thread.hpp")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
conf->addIncludePath(s);
|
conf->addIncludePath(s);
|
||||||
// Find library
|
// Find library
|
||||||
@@ -559,7 +475,7 @@ public:
|
|||||||
#endif
|
#endif
|
||||||
if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
||||||
// Not required by nox
|
// Not required by nox
|
||||||
required_libs << "filesystem" ;
|
required_libs << "filesystem" << "thread";
|
||||||
}
|
}
|
||||||
QStringList libDirs;
|
QStringList libDirs;
|
||||||
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
|
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
|
||||||
@@ -693,7 +609,7 @@ public:
|
|||||||
#line 1 "qtsingleapplication.qcm"
|
#line 1 "qtsingleapplication.qcm"
|
||||||
/*
|
/*
|
||||||
-----BEGIN QCMOD-----
|
-----BEGIN QCMOD-----
|
||||||
name: qtsingleapplication
|
name: libboost
|
||||||
arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
|
arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
|
||||||
-----END QCMOD-----
|
-----END QCMOD-----
|
||||||
*/
|
*/
|
||||||
@@ -723,12 +639,6 @@ cat >$1/modules_new.cpp <<EOT
|
|||||||
o = new qc_qt4(conf);
|
o = new qc_qt4(conf);
|
||||||
o->required = true;
|
o->required = true;
|
||||||
o->disabled = false;
|
o->disabled = false;
|
||||||
o = new qc_qt_dbus(conf);
|
|
||||||
o->required = false;
|
|
||||||
o->disabled = false;
|
|
||||||
o = new qc_qt_svg(conf);
|
|
||||||
o->required = false;
|
|
||||||
o->disabled = false;
|
|
||||||
o = new qc_pkg_config(conf);
|
o = new qc_pkg_config(conf);
|
||||||
o->required = true;
|
o->required = true;
|
||||||
o->disabled = false;
|
o->disabled = false;
|
||||||
@@ -745,7 +655,7 @@ cat >$1/modules_new.cpp <<EOT
|
|||||||
o->required = false;
|
o->required = false;
|
||||||
o->disabled = false;
|
o->disabled = false;
|
||||||
o = new qc_qtsingleapplication(conf);
|
o = new qc_qtsingleapplication(conf);
|
||||||
o->required = true;
|
o->required = false;
|
||||||
o->disabled = false;
|
o->disabled = false;
|
||||||
|
|
||||||
EOT
|
EOT
|
||||||
@@ -1692,15 +1602,13 @@ export PREFIX
|
|||||||
export BINDIR
|
export BINDIR
|
||||||
export DATADIR
|
export DATADIR
|
||||||
export EX_QTDIR
|
export EX_QTDIR
|
||||||
export QC_ENABLE_DEBUG
|
|
||||||
export QC_DISABLE_GUI
|
export QC_DISABLE_GUI
|
||||||
export QC_DISABLE_qt_dbus
|
|
||||||
export QC_DISABLE_qt_svg
|
|
||||||
export QC_WITH_LIBBOOST_INC
|
export QC_WITH_LIBBOOST_INC
|
||||||
export QC_WITH_LIBBOOST_LIB
|
export QC_WITH_LIBBOOST_LIB
|
||||||
export QC_DISABLE_libnotify
|
export QC_DISABLE_libnotify
|
||||||
export QC_DISABLE_geoip_database
|
export QC_DISABLE_geoip_database
|
||||||
export QC_WITH_GEOIP_DATABASE_EMBEDDED
|
export QC_WITH_GEOIP_DATABASE_EMBEDDED
|
||||||
|
export QC_DISABLE_qtsingleapplication
|
||||||
export QC_WITH_QTSINGLEAPPLICATION
|
export QC_WITH_QTSINGLEAPPLICATION
|
||||||
export QC_VERBOSE
|
export QC_VERBOSE
|
||||||
rm -rf .qconftemp
|
rm -rf .qconftemp
|
||||||
|
136
install.os2
@@ -1,136 +0,0 @@
|
|||||||
QBittorrent installation
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
0. CONTENTS OF THIS FILE
|
|
||||||
========================
|
|
||||||
|
|
||||||
1. INTRODUCTION
|
|
||||||
|
|
||||||
2. REQUIREMENTS
|
|
||||||
|
|
||||||
3. INSTALLATION
|
|
||||||
|
|
||||||
4. CONTACT
|
|
||||||
|
|
||||||
5. CREDITS
|
|
||||||
|
|
||||||
6. SUPPORT AND DONATIONS
|
|
||||||
|
|
||||||
7. HISTORY
|
|
||||||
|
|
||||||
|
|
||||||
1. INTRODUCTION
|
|
||||||
===============
|
|
||||||
|
|
||||||
Welcome to QBittorrent port for OS/2 and eComStation.
|
|
||||||
|
|
||||||
|
|
||||||
2. REQUIREMENTS
|
|
||||||
===============
|
|
||||||
|
|
||||||
* klibc 0.6.3 or later
|
|
||||||
|
|
||||||
ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi
|
|
||||||
|
|
||||||
* openssl 1.0
|
|
||||||
|
|
||||||
ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip
|
|
||||||
|
|
||||||
* Qt4 dll
|
|
||||||
|
|
||||||
see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
|
|
||||||
|
|
||||||
|
|
||||||
3. INSTALLATION
|
|
||||||
===============
|
|
||||||
|
|
||||||
To install QBittorrent, do the following:
|
|
||||||
|
|
||||||
klibc
|
|
||||||
-----
|
|
||||||
|
|
||||||
1. Download klibc 0.6.3 csd3 or later.
|
|
||||||
2. Install the package by double-clicking on the WPI file.
|
|
||||||
|
|
||||||
|
|
||||||
openssl 1.0
|
|
||||||
-----------
|
|
||||||
|
|
||||||
1. Download the zip file
|
|
||||||
2. Install the files to your libpath eg. x:\ecs\dll
|
|
||||||
|
|
||||||
Qt4 dll
|
|
||||||
-------
|
|
||||||
|
|
||||||
1. Download the package
|
|
||||||
2. Install the package by double-clicking on the wpi file.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
QBittorrent
|
|
||||||
-----------
|
|
||||||
|
|
||||||
1. Create a directory for QBittorrent.
|
|
||||||
2. Extract the QBittorrent package to the new directory.
|
|
||||||
3. Create a WPS object for QBittorrent.exe.
|
|
||||||
4. Start QBittorrent
|
|
||||||
5. Happy torrenting
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
4. CONTACT
|
|
||||||
==========
|
|
||||||
|
|
||||||
Please send bugreports to:
|
|
||||||
|
|
||||||
ecs@aroa.ch
|
|
||||||
|
|
||||||
Only bug reports with a reproducable bug are accepted. :-)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
5. CREDITS
|
|
||||||
==========
|
|
||||||
|
|
||||||
The port was done by:
|
|
||||||
|
|
||||||
Silvan Scherrer aka _diver
|
|
||||||
|
|
||||||
Thanks go to:
|
|
||||||
|
|
||||||
* Dmitry A. Kuminov
|
|
||||||
|
|
||||||
They either helped me when I had some nasty questions or did some testing for
|
|
||||||
me.
|
|
||||||
|
|
||||||
|
|
||||||
6. SUPPORT AND DONATIONS
|
|
||||||
========================
|
|
||||||
|
|
||||||
QBittorrent port is based on volunteer work. If you would like to support further
|
|
||||||
development, you can do so in one of the following ways:
|
|
||||||
|
|
||||||
|
|
||||||
* Donate to the Qt4 project: see qt.netlabs.org for more information
|
|
||||||
|
|
||||||
* Contribute to the project: Besides actual development, this also includes
|
|
||||||
maintaining the documentation and the project web site as well as help
|
|
||||||
for users.
|
|
||||||
|
|
||||||
|
|
||||||
7. HISTORY
|
|
||||||
==========
|
|
||||||
|
|
||||||
2010-12-23
|
|
||||||
|
|
||||||
* updated to 2.5.2 code level of QBittorrent
|
|
||||||
|
|
||||||
2010-11-22
|
|
||||||
|
|
||||||
* updated to 2.4.11 code level of QBittorrent
|
|
||||||
|
|
||||||
2010-xx-xx
|
|
||||||
|
|
||||||
* initial port
|
|
||||||
|
|
@@ -1,8 +1,3 @@
|
|||||||
exists(conf.pri) {
|
|
||||||
# to the conf.pri goes all system dependent stuff
|
|
||||||
include(conf.pri)
|
|
||||||
}
|
|
||||||
|
|
||||||
LIBS += -ltorrent-rasterbar \
|
LIBS += -ltorrent-rasterbar \
|
||||||
-lboost_thread \
|
-lboost_thread \
|
||||||
-lboost_system \
|
-lboost_system \
|
||||||
|
@@ -6,10 +6,6 @@
|
|||||||
<dep type='qt4'>
|
<dep type='qt4'>
|
||||||
<required/>
|
<required/>
|
||||||
</dep>
|
</dep>
|
||||||
<dep type='qt-dbus'>
|
|
||||||
</dep>
|
|
||||||
<dep type='qt-svg'>
|
|
||||||
</dep>
|
|
||||||
<dep type='pkg-config'>
|
<dep type='pkg-config'>
|
||||||
<required/>
|
<required/>
|
||||||
</dep>
|
</dep>
|
||||||
@@ -24,6 +20,5 @@
|
|||||||
<dep type='geoip-database'>
|
<dep type='geoip-database'>
|
||||||
</dep>
|
</dep>
|
||||||
<dep type='qtsingleapplication'>
|
<dep type='qtsingleapplication'>
|
||||||
<required/>
|
|
||||||
</dep>
|
</dep>
|
||||||
</qconf>
|
</qconf>
|
||||||
|
@@ -48,6 +48,9 @@ public:
|
|||||||
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
|
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if(!conf->checkHeader(s, "boost/thread.hpp")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}else{
|
}else{
|
||||||
QStringList sl;
|
QStringList sl;
|
||||||
sl << "/usr/include";
|
sl << "/usr/include";
|
||||||
@@ -68,6 +71,9 @@ public:
|
|||||||
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
|
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if(!conf->checkHeader(s, "boost/thread.hpp")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
conf->addIncludePath(s);
|
conf->addIncludePath(s);
|
||||||
// Find library
|
// Find library
|
||||||
@@ -78,7 +84,7 @@ public:
|
|||||||
#endif
|
#endif
|
||||||
if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
||||||
// Not required by nox
|
// Not required by nox
|
||||||
required_libs << "filesystem" ;
|
required_libs << "filesystem" << "thread";
|
||||||
}
|
}
|
||||||
QStringList libDirs;
|
QStringList libDirs;
|
||||||
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
|
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
|
||||||
|
@@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
-----BEGIN QCMOD-----
|
|
||||||
name: qt-dbus
|
|
||||||
-----END QCMOD-----
|
|
||||||
*/
|
|
||||||
// see Conf::findPkgConfig
|
|
||||||
class qc_qt_dbus : public ConfObj
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
qc_qt_dbus(Conf *c) : ConfObj(c) {}
|
|
||||||
QString name() const { return "QtDBus >= 4.5"; }
|
|
||||||
QString shortname() const { return "qt-dbus"; }
|
|
||||||
QString checkString() const {
|
|
||||||
if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
|
|
||||||
return "";
|
|
||||||
return ConfObj::checkString();
|
|
||||||
}
|
|
||||||
bool exec(){
|
|
||||||
if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
|
|
||||||
return false;
|
|
||||||
QStringList incs;
|
|
||||||
QString req_ver = "4.5.0";
|
|
||||||
QString version, libs, other;
|
|
||||||
VersionMode mode = VersionMin;
|
|
||||||
if(conf->findPkgConfig("QtDBus", mode, req_ver, &version, &incs, &libs, &other)) {
|
|
||||||
conf->addExtra("CONFIG += dbus");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
@@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
-----BEGIN QCMOD-----
|
|
||||||
name: qt-svg
|
|
||||||
-----END QCMOD-----
|
|
||||||
*/
|
|
||||||
// see Conf::findPkgConfig
|
|
||||||
class qc_qt_svg : public ConfObj
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
qc_qt_svg(Conf *c) : ConfObj(c) {}
|
|
||||||
QString name() const { return "QtSvg >= 4.5"; }
|
|
||||||
QString shortname() const { return "qt-svg"; }
|
|
||||||
QString checkString() const {
|
|
||||||
if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
|
|
||||||
return "";
|
|
||||||
return ConfObj::checkString();
|
|
||||||
}
|
|
||||||
bool exec(){
|
|
||||||
if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
|
|
||||||
return false;
|
|
||||||
QStringList incs;
|
|
||||||
QString req_ver = "4.5.0";
|
|
||||||
QString version, libs, other;
|
|
||||||
VersionMode mode = VersionMin;
|
|
||||||
if(conf->findPkgConfig("QtSvg", mode, req_ver, &version, &incs, &libs, &other)) {
|
|
||||||
conf->addExtra("CONFIG += svg");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
14
qcm/qt4.qcm
@@ -1,7 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
-----BEGIN QCMOD-----
|
-----BEGIN QCMOD-----
|
||||||
name: Qt >= 4.5
|
name: Qt >= 4.5
|
||||||
arg: enable-debug, Enable debug mode
|
|
||||||
arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
|
arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
|
||||||
-----END QCMOD-----
|
-----END QCMOD-----
|
||||||
*/
|
*/
|
||||||
@@ -13,20 +12,9 @@ public:
|
|||||||
QString shortname() const { return "Qt 4.5"; }
|
QString shortname() const { return "Qt 4.5"; }
|
||||||
bool exec()
|
bool exec()
|
||||||
{
|
{
|
||||||
// NOX mode
|
|
||||||
if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
||||||
conf->addExtra("CONFIG += nox");
|
conf->addExtra("CONFIG += nox");
|
||||||
}
|
}
|
||||||
// Debug mode
|
|
||||||
if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
|
|
||||||
conf->addExtra("CONFIG += debug");
|
|
||||||
}
|
|
||||||
#ifdef Q_OS_FREEBSD
|
|
||||||
conf->addLib("-lexecinfo");
|
|
||||||
conf->addExtra("MANPREFIX = $$PREFIX");
|
|
||||||
#else
|
|
||||||
conf->addExtra("MANPREFIX = $$PREFIX/share");
|
|
||||||
#endif
|
|
||||||
return(QT_VERSION >= 0x040500);
|
return(QT_VERSION >= 0x040500);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
-----BEGIN QCMOD-----
|
-----BEGIN QCMOD-----
|
||||||
name: qtsingleapplication
|
name: libboost
|
||||||
arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
|
arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
|
||||||
-----END QCMOD-----
|
-----END QCMOD-----
|
||||||
*/
|
*/
|
||||||
|
BIN
src/Icons/downarrow.png
Normal file
After Width: | Height: | Size: 722 B |
Before Width: | Height: | Size: 423 B After Width: | Height: | Size: 439 B |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.8 KiB |
BIN
src/Icons/oxygen/browse.png
Normal file
After Width: | Height: | Size: 796 B |
BIN
src/Icons/oxygen/bt_settings.png
Normal file
After Width: | Height: | Size: 3.2 KiB |
BIN
src/Icons/oxygen/bug.png
Normal file
After Width: | Height: | Size: 733 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
src/Icons/oxygen/button_ok.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 873 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.2 KiB |