Bump to 3.1.9.2

This is an excuse to produce new builds with an OpenSSL version that isn't affected by the heartbleed bug for Windows and Mac. This bug should only affect the WebUI and only if HTTPS/SSL authentication was enabled.

.gitignore

@@ -0,0 +1,15 @@
+src/geoip/GeoIP.dat
+src/qbittorrent
+qbittorrent.pro.user*
+conf.pri
+Makefile
+*.pyc
+*.log
+# Compiled object files
+*.o
+# Generated MOC, resource and UI files
+moc_*.cpp
+qrc_*.cpp
+ui_*.h
+*.moc
+src/lang/qbittorrent_*.qm

.travis.yml

@@ -0,0 +1,53 @@
+language:
+  - cpp
+
+env:
+  # use libtorrent 0.15.10
+  - lt_source=from_dist gui=true
+  - lt_source=from_dist gui=false
+  # use libtorrent 0.16.X from RC_0_16 svn branch
+  - lt_source=from_svn gui=true
+  - lt_source=from_svn gui=false
+
+branches:
+  except:
+    - search_encoding_windows
+    - v2_9_x
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change 
+
+before_install:
+  - shopt -s expand_aliases
+  - alias sudo="sudo "
+  # Using nprocs/2 sometimes may fail (gcc is killed by system), just use two threads
+  - alias make="colormake -j2 "
+
+  # Also setup a virtual display for after_success target when gui == true
+  - if ! $gui; then qbtconf="$qbtconf --disable-gui"; else export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi
+  - ltconf=" --with-libgeoip=system"
+
+  - echo settings
+  - echo $lt_source
+  - echo $ltconf
+  - echo $gui
+  - echo $qbtconf
+
+  - sudo apt-get -qq update
+  # Travis can stall during heavy load if these packages are installed in one step - split the command
+  - sudo apt-get -qq install debhelper qconf colormake libssl-dev libgeoip-dev
+  - sudo apt-get -qq install libboost-dev libboost-filesystem-dev libboost-system-dev
+  - sudo apt-get -qq install libqt4-dev 
+
+install:
+  - if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
+  - if [[ "$lt_source" == "from_svn" ]]; then cd .. && svn co http://libtorrent.googlecode.com/svn/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
+
+script:
+  - qt-qconf
+  - ./configure $qbtconf && sudo make install
+  
+after_success:
+  - if $gui ; then qbittorrent --version ; else qbittorrent-nox --version ; fi

.tx/config

@@ -0,0 +1,18 @@
+[main]
+host = https://www.transifex.com
+
+[qbittorrent.qbittorrent_v3_1_x]
+file_filter = src/lang/qbittorrent_<lang>.ts
+source_file = src/lang/qbittorrent_en.ts
+source_lang = en
+type = QT
+minimum_perc = 23
+mode = developer
+
+
+[qbittorrent.qbittorrentdesktop_master]
+source_file = src/Icons/qBittorrent.desktop
+source_lang = en
+type = DESKTOP
+minimum_perc = 23
+mode = developer

AUTHORS

@@ -1,7 +1,11 @@
-Author:
+Current maintainer:
+* Sledgehammer999 <sledgehammer999@qbittorrent.org>
+
+Original author:
 * Christophe Dumez <chris@qbittorrent.org>
 
 Contributors:
+* Vladimir Golovnev <glassez@yandex.ru>
 * Stefanos Antaris <santaris@csd.auth.gr>
 * Mohammad Dib <mdib@qbittorrent.org>
 * Mirco Chinelli <infinity89@fastwebmail.it>
@@ -10,9 +14,10 @@ Contributors:
 * Grigis Gaëtan <cipher16@gmail.com>
 * Christian Kandeler <zambesi@users.sourceforge.net>
 * Silvan Scherrer <silvan.scherrer@aroa.ch>
+* Nick Tiskov <daymansmail@gmail.com>
 
 Code from other projects:
-* files src/qtsingleapp/*
+* files src/qtsingleapp/* src/lineedit/*
   copyright: Nokia Corporation
   license: LGPL
 
@@ -24,6 +29,10 @@ Code from other projects:
   copyright: Dan Haim <negativeiq@users.sourceforge.net>
   license: BSD
 
+* file src/stacktrace_win.h
+  copyright: Quassel Project
+  license: GPLv2/3
+
 Images Authors:
 * files: src/Icons/*.png
   copyright: Gnome Icon Theme
@@ -36,9 +45,9 @@ Images Authors:
   url: http://www.oxygen-icons.org
 
 * files: src/Icons/flags/*.png
-  copyright: Open Clip Art Library
+  copyright: Mark James <mjames@gmail.com>
-  license: Creative Commons Public Domain Dedication
+  license: Public Domain
-  url: http://www.openclipart.org
+  url: http://www.famfamfam.com
 
 * files: src/Icons/skin/*.png
   files: src/menuicons/YYxYY/*.png
@@ -49,6 +58,10 @@ Images Authors:
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
+* file: src/Icons/skin/qbittorrent_mono*
+  copyright: Daniel Eguren <deguren@gmail.com>
+  license: LGPL
+
 * file: src/search_engine/engines/btjunkie.png
   copyright: Downloaded from btjunkie.org
 
@@ -66,35 +79,46 @@ Images Authors:
 
 Translations authors:
 * files: src/lang/*.ts
+* file: src/Icons/qBittorrent.desktop
   copyright:
-  - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
+  - Arabic: SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and  Ibrahim Saed ibraheem_alex(Transifex)
-  - Brazilian: Nick Marinho (nickmarinho@gmail.com)
+  - Armenian: Hrant Ohanyan (hrantohanyan@mail.am)
+  - Basque: Xabier Aramendi (azpidatziak@gmail.com)
+  - Belarusian: Mihas Varantsou (meequz@gmail.com)
   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
   - Catalan: Francisco Luque Contreras (frannoe@ya.com)
   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
-  - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
+  - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com) and 冥王歐西里斯 s8321414(Transifex)
   - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
-  - Czech: Jirka Vilim (web@tets.cz)
+  - Czech: Jirka Vilim (web@tets.cz) and Petr Cernobila abr(Transifex)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
-  - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
+  - Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com)
   - English: Christophe Dumez (chris@qbittorrent.org)
-  - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
+  - English(Australia): Robert Readman readmanr(Transifex)
+  - English(United Kingdom): Robert Readman readmanr(Transifex)
+  - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net), Pekka Niemi (pekka.niemi@iki.fi) and Jiri Grönroos artnay(Transifex)
   - French: Christophe Dumez (chris@qbittorrent.org)
+  - Galician: Marcos Lans (marcoslansgarza@gmail.com) and antiparvos(Transifex)
+  - Georgian: Beqa Arabuli (arabulibeqa@yahoo.com)
   - 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), Stephanos Antaris (santaris@csd.auth.gr), sledgehammer999(hammered999@gmail.com) and Γιάννης Ανθυμίδης Evropi(Transifex)
+  - Hebrew: David Deutsch (d.deffo@gmail.com)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
-  - Italian: Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)
+  - Italian: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)
-  - Japanese: Nardog (alphisation@gmail.com)
+  - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
-  - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)
+  - Lithuanian: Naglis Jonaitis (njonaitis@gmail.com)
+  - Norwegian: Tomaso
   - Polish: Mariusz Fik (fisiu@opensuse.org)
-  - Portuguese: Nick Marinho (nickmarinho@gmail.com)
+  - Portuguese: Sérgio Marques smarquespt(Transifex)
-  - Romanian: Obada Denis (obadadenis@users.sourceforge.net)
+  - Portuguese(Brazil): Nick Marinho (nickmarinho@gmail.com)
-  - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net)
+  - Romanian: Obada Denis (obadadenis@users.sourceforge.net), Adrian Gabor Adriannho(Transifex) and Mihai Coman z0id(Transifex)
+  - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net), Alexey Morsov (samurai@ricom.ru), Nick Tiskov Dayman(daymansmail (at) gmail (dot) com), Dmitry DmitryKX(Transifex) and kraleksandr kraleksandr(Transifex)
   - Serbian: Anaximandar Milet (anaximandar at operamail.com)
   - Slovak:  helix84
-  - Spanish: Francisco Luque Contreras (frannoe@ya.com)
+  - Spanish: Francisco Luque Contreras (frannoe@ya.com), Alfredo Monclus alfrix(Transifex) and José Antonio Moray moray33(Transifex)
-  - Swedish: Daniel Nylander (po@danielnylander.se)
+  - Swedish: Daniel Nylander (po@danielnylander.se) and Emil Hammarberg Ooglogput(Transifex)
   - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
-  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)
+  - Ukrainian: Oleh Prypin (blaxpirit@gmail.com) and zubr139(Transifex)
+  - Vietnamese: Anh Phan ppanhh(Transifex)
   license: GPLv2

COPYING

@@ -69,7 +69,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -124,7 +124,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -182,7 +182,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -239,7 +239,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -292,7 +292,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest

Changelog

@@ -1,4 +1,288 @@
-* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
+* Tue Apr 29 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9.2
+    - OTHER: The v3.1.9.1 Windows build was broken
+
+* Mon Apr 28 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9.1
+    - OTHER: This is an excuse to produce new builds with an OpenSSL version that isn't affected by the heartbleed bug for Windows and Mac. This bug should only affect the WebUI and only if HTTPS/SSL authentication was enabled.
+
+* Sat Mar 01 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9
+    - BUGFIX: Fix nox build. Closes #1368 (bob23450)
+    - BUGFIX: Fix build with libtorrent 0.15.x (sledgehammer999)
+    - BUGFIX: Fix missing percentage signs. Closes #1392. (sledgehammer999)
+    - BUGFIX: Fix queue sorting order. (alfrix)
+    - BUGFIX: Fix build using qt < 4.7 Closes #1385. (Evgeny Lensky)
+    - BUGFIX: Fix autoupdater. Send our user-agent to sourceforge.net (sledgehammer999)
+    - FEATURE: Add button for links in toolbar (alfrix)
+
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.8
+    - BUGFIX: Really fix build of v3.1.6
+
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.7
+    - BUGFIX: Fix build of v3.1.6
+
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.6
+    - BUGFIX: Fix 'preview file' regression. Closes #1285. (sledgehammer999)
+    - BUGFIX: Fix peers and seeds sorting in transfer list. (Angel Alonso)
+    - BUGFIX: Fix btdigg search engine. (BTDigg research team)
+    - BUGFIX: Save statistics every 15min and only if there was new traffic. Fixes #1288 and partially #1272. (sledgehammer999)
+    - BUGFIX: Fix share ratio text in the 'general' tab. (sledgehammer999)
+    - BUGFIX: Output a more generic message when blocking IPs and don't use italics in the log. (sledgehammer999)
+    - BUGFIX: Allow 2 decimals when setting the share ratio. Closes #1303. (sledgehammer999)
+    - BUGFIX: Fix extratorrents search plugin. (sledgehammer999)
+    - BUGFIX: Use shorter names for amount columns in main UI (Gelmir)
+    - BUGFIX: Fix overstretched options dialog. Closes #1293. (sledgehammer999)
+    - BUGFIX: Don't show a popup menu when no torrent is selected. (sledgehammer999)
+    - BUGFIX: Launch external programs async and don't block. Closes #1252. (sledgehammer999)
+    - BUGFIX: Don't re-announce to trackers when torrent is paused. Closes #1310. (sledgehammer999)
+    - BUGFIX: Bring dialog boxes in the front when qbt doesn't have focus. (sledgehammer999)
+    - BUGFIX: Correctly resize 'name' column of the content tab. Closes #1360. (sledgehammer999)
+    - BUGFIX: Correctly restore 'name' column width when loading magnet links in the 'Add new torrent dialog'. Closes #1334. (sledgehammer999)
+    - WEBUI: Fix sorting by size in WebUI when non-default locale used. (Vladimir Golovnev)
+    - UI: Reposition statistics menu item. (sledgehammer999)
+    - UI: Convert more accurately decimal numbers to text. (sledgehammer999)
+    - WINDOWS/OSX: Improvements on the behavior of the program updater(closes #1282) (sledgehammer999)
+    - LINUX: Explicitle tell that we don't support freedesktop's startup notify standard. Fixes GNOME issues. Closes #1217. (sledgehammer999)
+    - LINUX: Add our WM_CLASS in the .desktop file so window managers know how to group our windows. (sledgehammer999)
+    - OTHER: Sync translations from Transifex.
+
+* Thu 16 Jan 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.5
+    - BUGFIX: Fix compilation with Qt 4.7. Closes #1215. (sledgehammer999)
+    - BUGFIX: Third attempt at fixing saving settings on OS shutdown. (sledgehammer999)
+    - BUGFIX: Preview now correctly uses the selected file. Closes #1222 #1182. (sledgehammer999)
+    - BUGFIX: Allow to resize the columns in Add New Torrent dialog. Closes #1207 #676 (sledgehammer999)
+    - BUGFIX: Ensure that at least one column in the tranferlist is always visible. Closes #1165. (sledgehammer999)
+    - BUGFIX: Ensure that the options window will always be placed onscreen. Closes #1226. (sledgehammer999)
+    - BUGFIX: Delete temporary files after they aren't needed. Closes #1188. (sledgehammer999)
+    - BUGFIX: Correctly detect libtorrent version. (sledgehammer999)
+    - BUGFIX: Various code cppcheck fixes (Konstantin Goncharik)
+    - BUGFIX: Remove isohunt search engine and update thepiratebay url (sledgehammer999)
+    - BUGFIX: Fix rss settings corruption when checking regexp and going to other rule. (Gelmir)
+    - BUGFIX: Don't count paused torrents for the autoshutdown. Closes #1280. (sledgehammer999)
+    - LINUX: Fix notifications with xfce4-notifyd.
+    - OSX: Added basic retina support. Closes #1251. (Sébastien Lavoie)
+    - OTHER: Sync translations from Transifex.
+
+* Sun 29 Dec 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.4
+    - FEATURE: Statistics dialog (Gelmir)
+    - FEATURE: Tooltips explaining each peer's connection flags (sledgehammer999)
+    - FEATURE: Win/Mac Check for program updates every 15min and allow the user to manually check for updates through the help menu. (sledgehammer999)
+    - BUGFIX: Better dialog message for torrent delete confirmation (sledgehammer999)
+    - BUGFIX: Fix resizing grip location. Closes #1146. (sledgehammer999)
+    - BUGFIX: Lock toolbar in place. Closes #1144. (sledgehammer999)
+    - BUGFIX: Second attempt at fixing saving settings on shutdown. (sledgehammer999)
+    - BUGFIX: Sort labels in 'Add new torrent' dialog. Closes #1150 #411. (sledgehammer999)
+    - LINUX: Fix build under Ubuntu 13.10 (sledgehammer999)
+    - LINUX: Make sleep and shutdown functions work on systemd's logind (Faheem Pervez)
+
+* Mon Nov 20 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.3
+    - FEATURE: Add a key shortcut to "Add link to torrent..." (Angel Alonso)
+    - BUGFIX: Make all columns and headers use the same text alignment in the transferlist. (sledgehammer999)
+    - BUGFIX: Fix build system for Unix/Linux. (sledgehammer999)
+    - BUGFIX: Case insensitive sort in Peers list. Closes #1066. (sledgehammer999)
+    - BUGFIX: Small optimization of WebUI responses when there isn't a data payload. (sledgehammer999)
+    - BUGFIX: Hide empty folders after filtering. Closes #74. (sledgehammer999)
+    - BUGFIX: Expand folders when filtering files. Closes #1076. (sledgehammer999)
+    - BUGFIX: Updated search plugin's URL (Zach Thibeau)
+    - BUGFIX: Strip some png to fix incorrect sRGB profiles. (Angel Alonso)
+    - BUGFIX: Fixed font issues on OSX Mavericks (Zach Thibeau)
+    - BUGFIX: Improve text in the About dialog (Artem S. Tashkinov)
+    - BUGFIX: Always show a peer IP address as a tool tip (Artem S. Tashkinov)
+    - BUGFIX: Fix inhibit system functionality. Closes #766. (sledgehammer999)
+    - BUGFIX: WebUI: Don't gzip too small payloads. (sledgehammer999)
+    - BUGFIX: Correctly detect if the browser supports gzip compression. (sledgehammer999)
+    - BUGFIX: Fix WebUI link to 'Anonymous mode' explanation. Closes #1093. (sledgehammer999)
+    - BUGFIX: Correctly update tracker tier number in the trackers tab. Closes #1075. (sledgehammer999)
+    - BUGFIX: Speed improvements.(sledgehammer999)
+    - OTHER: Updated translations.
+    
+* Tue Nov 05 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.2
+    - BUGFIX: Fix WebUI gzip compression. Closes #1037. (sledgehammer999)
+    - BUGFIX: Fix compilation with qt < 4.8.0. Closes #1043. (sledgehammer999)
+    - OTHER: Updated translations.
+
+* Mon Oct 28 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.1
+    - FEATURE: Show external IP in the log. Closes #968. (sledgehammer999)
+    - FEATURE: Enable gzip compression in the webui. It should be faster now. (sledgehammer999)
+    - FEATURE: Torrents show more states(queued for checking, downloading metadata, allocating, checking resume). (sledgehammer999)
+    - FEATURE: Reenable "force reannounce" to all trackers. (sledgehammer999)
+    - FEATURE: Allow to clear the UI lock password. Closes #973. (sledgehammer999)
+    - FEATURE: New translations: English(Australia) and English(United Kingdom)
+    - BUGFIX: Expose all available translation in the WebUI. Closes #976. (sledgehammer999)
+    - BUGFIX: Copy IP copied wrong data. Closes #970 (sledgehammer999)
+    - BUGFIX: "Preview file..." didn't work on single file torrents. (sledgehammer999)
+    - BUGFIX: Fix and improve the scheduler (Gelmir and sledgehammer999)
+    - BUGFIX: RSS fixes. Closes #960, #998 (Gelmir)
+    - BUGFIX: Fix 'append label to save path' with magnet links. (sledgehammer999)
+    - BUGFIX: Can download up to 10MB .torrent file when a link is provided. Closes #879 (sledgehammer999)
+    - OTHER: Updated translations.
+    - LINUX: Fix missing conf.pri error (leigh123linux)
+    - WINDOWS: Don't remove file associations if they aren't our own. (sledgehammer999)
+
+* Sat Oct 12 2013 - Christophe Dumez <chris@qbittorrent.org> and sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.0
+    - FEATURE: Add command line option to daemonize qbittorrent-nox (ngaro)
+    - FEATURE: Add "Shutdown qBittorrent" button to Web UI (ngaro)
+    - FEATURE: Add setting to copy .torrent files for finished downloads (Driim)
+    - FEATURE: Add option to start qBittorrent on Windows startup (sledgehammer999)
+    - FEATURE: Add context menu to Web seed list (Gelmir)
+    - FEATURE: Add support for tracker tiers / groups to creator (Gelmir)
+    - FEATURE: Allow clearing execution and ban logs (Gelmir)
+    - FEATURE: Add option to use random port on each startup (ireallylikeher)
+    - FEATURE: Expose the cache expiry to the user (Gelmir)
+    - FEATURE: Support Atom feeds (Gelmir)
+    - FEATURE: Add "save path" column (John Peterson)
+    - FEATURE: Add μTorrent-compatible "Flags" column in the peer tab(sledgehammer999)
+    - FEATURE: Load magnet metadata in the background while the "Add New Torrent" Dialog is showing (Gelmir)
+    - FEATURE: Allow to enter only an info-hash for download(sledgehammer999)
+    - FEATURE: Bring the "Add New Torrent" Dialog to the front(glassez)
+    - BUGFIX: Add confirmation dialog for "Force recheck" action (closes #131)
+    - BUGFIX: Greatly improve RSS manager performance (closes #34)
+    - BUGFIX: Ensure that all columns in the tranferlist have a size > 0.
+    - BUGFIX: Don't mark RSS item as read when it failed to download (Gelmir)
+    - BUGFIX: Fix ETA calculation when some files are downloaded and marked afterwards as 'do not download'(sledgehammer999)
+    - BUGFIX: Make the UI show that PEX/DHT/LSD are actually disabled on private torrents(sledgehammer999)
+    - BUGFIX: Scheduler should be much more robust and correct now(sledgehammer999)
+    - BUGFIX: Now qBt won't forget torrent settings after an unclean shutdown(sledgehammer999)
+    - BUGFIX: Text boxes in edit dialogs will fit to text width(Gelmir)
+    - BUGFIX: Enable edit/rename via F2 or double click in various places(Gelmir)
+    - BUGFIX: Allow to edit trackers and copy their urls(Gelmir and Driim)
+    - BUGFIX: Add Uploaded column to main view(Gelmir)
+    - BUGFIX: Calculate ETA for seeding torrents(Gelmir)    
+    - BUGFIX: Add option to ignore global share ratio limits for created torrents(Gelmir)
+    - OTHER: Many RSS bugfixes and improvements all over the place(Gelmir)
+    - OTHER: Generate translations at configure time to reduce tarball size
+    - OTHER: Make peer tab sortable by ip too (Gelmir)
+    - OTHER: Translations moved to Transifex(https://www.transifex.com/projects/p/qbittorrent/)
+    - OTHER: New Translation - Vietnamese (Anh Phan)
+    - PERFORMANCE: Impove drawing speed of tranferlist when there are many torrents(>100)
+    - PERFORMANCE: Impove drawing speed of peers list when there are many peers
+
+* Thu Aug 09 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.0
+    - FEATURE: Brand new torrent addition dialog
+    - FEATURE: Add the ability to choose the save path when using magnet links (mutoso)
+    - FEATURE: Add support for adding multiple local torrents at once (Web UI)
+    - COSMETIC: Improve style of left panel
+    - BUGFIX: Lower panels no longer gets disabled
+    - BUGFIX: Major code refactoring and various optimizations.
+    - BUGFIX: No longer strip root folder from torrent files
+    - OTHER: Drop support for libtorrent v0.14.x
+    - OTHER: Drop support for Qt 4.5
+
+* Sat Oct 08 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.0
+    - FEATURE: Add file association settings to program preferences (Windows)
+    - FEATURE: Add setting to ignore slow torrents in queueing system
+    - FEATURE: Add advanced setting to announce to all trackers
+    - FEATURE: Add support for anonymous mode (libtorrent >= v0.16)
+    - FEATURE: Add quick "set as default save path" checkbox to torrent addition dialog (sledgehammer999)
+    - BUGFIX: Add tray menu entry for toggling window visibility
+    - BUGFIX: Fix execution log lines selection and copying
+    - BUGFIX: Reduce CPU usage when running Web UI
+    - BUGFIX: Save RSS items to disk regularly for safety
+    - BUGFIX: Fix ratio calculation (use all_time_download)
+    - BUGFIX: Fix torrent upload issues (Web UI)
+    - BUGFIX: Fix some IE incompatibilities (Web UI)
+    - COSMETIC: Display speed at the beginning of the Window title
+    - COSMETIC: Several cosmetic fixes to the Web UI
+    - COSMETIC: Make top toolbar follow system style
+    - OTHER: Display libraries versions in about dialog (sledgehammer999)
+    - OTHER: Display qBittorrent version in Web UI about dialog
+
+* Thu Jun 02 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.8.0
+    - FEATURE: Added full libtorrent v0.16 support (uTP, ...)
+    - FEATURE: Proxy can be disabled for peer connections
+    - FEATURE: Added support for secure SMTP connection (SSL)
+    - FEATURE: Added support for SMTP authentication
+    - FEATURE: Added UPnP/NAT-PMP port forward for the Web UI port
+    - FEATURE: qBittorrent can update dynamic DNS services (DynDNS, no-ip)
+    - FEATURE: Display peer connection type in peer list (BT, uTP, Web)
+    - FEATURE: Added full regex support to RSS downloader
+    - FEATURE: Added regex help and validation in RSS downloader
+    - FEATURE: Added HTTPS support to Web UI (Ishan Arora)
+    - BUGFIX: Change systray icon on the fly (no restart needed)
+    - BUGFIX: Remember peer-level rate limits (requires libtorrent v0.16)
+    - BUGFIX: Stop annoncing to trackers an all tiers (more respectful)
+    - BUGFIX: Stop sharing private trackers with other peers
+    - BUGFIX: Tracker exchange extension can be disabled
+    - BUGFIX: Cleaner program exit on system log out
+    - BUGFIX: Fix possible magnet link parsing problems
+    - BUGFIX: Fix possible RSS URL parsing problems
+    - COSMETIC: Added monochrome icon for light themes 
+
+* Sun Mar 20 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.7.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: New and improved RSS feed automated downloader
+    - FEATURE: Added feature to shutdown qbittorrent on torrents completion
+    - FEATURE: Added a torrent import assistant to seed or keep downloading outside torrents
+    - FEATURE: qBittorrent can update itself from Sourceforge (Windows/Mac OS X only)
+    - FEATURE: Added a transfer list column to display the current tracker
+    - FEATURE: Remember the last trackers used in the torrent creation tool
+    - FEATURE: The optimal piece size is now automatically computed in the torrent creation tool
+    - FEATURE: Bring up the connection settings when clicking on the connection status icon
+    - FEATURE: Major code refactoring and optimization
+    - FEATURE: Added "Amount downloaded/left" columns to transfer list
+    - FEATURE: Simplified proxy settings
+    - 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: Improved the torrent creation tool appearance
+    - COSMETIC: Use country flags by Mark James (Thanks to Dmytro Pukha)
+    - COSMETIC: Use bigger alternative speed icon
+    - OTHERS: Dropped support for Qt <= 4.4
+
+* Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
+    - FEATURE: Added actions to "Move to top/bottom" of priority queue
+    - FEATURE: Auto-Shutdown on downloads completion
+    - FEATURE: Email notification on download completion
+    - FEATURE: Added button to password-lock the UI
+    - FEATURE: Added label-level Pause/Resume/Delete actions
+    - FEATURE: Torrents can now be filtered by name
+    - FEATURE: Run external program on torrent completion
+    - FEATURE: Detect executable updates in order to advise the user to restart
+
+* Tue Jul 27 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
     - FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)
     - FEATURE: Remember previous save paths in torrent addition dialog
     - FEATURE: Max number of half-open connections can now be edited
@@ -15,10 +299,12 @@
     - FEATURE: Torrents can be automatically paused once they reach a given ratio
     - FEATURE: Several files can now be disabled at once
     - FEATURE: Added "Select All/None" buttons to files list
+    - FEATURE: Added support for BitComet links (bc://bt/...)
     - BUGFIX: Hide seeding torrents files priorities in Web UI
     - BUGFIX: The user can disable permanently recursive torrent download
     - BUGFIX: Peer Exchange status is now correctly reported
     - BUGFIX: Use an INI file instead of the registry on Windows (More reliable)
+    - BUGFIX: Removed client spoofing feature to avoid tracker blacklisting
     - COSMETIC: Display peers country name in tooltip
     - COSMETIC: Display number of torrents in transfers tab label
     - COSMETIC: Simplified program preferences

INSTALL

@@ -10,25 +10,23 @@ qBittorrent - A BitTorrent client in C++ / Qt4
   will install and execute qBittorrent hopefully without any problems.
 
   Dependencies:
-    - Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+    - Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, compatible with v0.15.x)
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.15.0)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 
-    - libboost 1.34.x (libboost-filesystem, libboost-thread, libboost-date-time) + libasio
+    - libboost 1.34.x (libboost-filesystem°) + libasio
       or
-    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time)
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem°)
+      
+    °libboost-filesystem is not needed if libtorrent-rasterbar >= v0.16.x is used
 
     - python >= 2.3 (needed by search engine)
         * Run time only dependency
 
-    - libnotify >= 0.4.2, glib-2.0 (optional)
-        * Can be used for system notifications to replace standard Qt notifications
-          so that it integrates better into the Desktop
-
     - geoip-database (optional)
         * If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
         * Run time only dependency
@@ -46,7 +44,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, >= v0.15.0 ADVISED)
+    - libtorrent-rasterbar by Arvid Norberg (>= v0.15.0)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 

README.os2

@@ -27,7 +27,6 @@ First you need to create the conf.pri file in the same dir as this readme.os2 is
 the conf.pri file has the following content:
 
 ##### conf.pri content beginn #####
-PREFIX = .
 BINDIR = ./bin
 INCDIR = ./include
 LIBDIR = ./lib
@@ -43,7 +42,10 @@ LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
 
 Of course all the above path references have to be adjusted to your build env.
 
-It should now be easy to build qBittorrent:
+Now you can either do a normal build or a shadow build. A shadow build has the
+advantage that no created files are in the same dir as the sources are.
+
+For a normal build do the following:
 
 Simply type:
 $ qmake
@@ -51,6 +53,16 @@ $ qmake
 Followed by:
 $ make
 
+For a shadow build do the following:
+given your sources are in x:\trees\qbittorrent\trunk create a 
+x:\trees\qbittorrent\build directory
+
+Now switch to the created directory and type:
+$ qmake ..\trunk
+
+Followed by:
+$ make
+
 If all works fine you should get a working qbittorrent executable.
 
 If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC:

configure

@@ -18,15 +18,24 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --disable-gui                      Disable qBittorrent Graphical user
+  --enable-debug                                  Enable debug mode
-                                    interface for headless running
+  --disable-gui                                   Disable qBittorrent
-  --with-libboost-inc=[path]         Path to libboost include files
+                                                 Graphical user interface for
-  --with-libboost-lib=[path]         Path to libboost library files
+                                                 headless running
-  --disable-libnotify               Disable use of libnotify
+  --disable-qt-dbus                              Disable use of qt-dbus
-  --disable-geoip-database          Disable use of geoip-database
+  --with-libboost-inc=[path]                      Path to libboost include
-  --with-geoip-database-embedded     Geoip Database will be embedded in
+                                                 files
-                                    qBittorrent executable (please follow
+  --with-libboost-lib=[path]                      Path to libboost library
-                                    instructions in src/geoip/README)
+                                                 files
+  --disable-geoip-database                       Disable use of geoip-database
+  --with-geoip-database-embedded                  Geoip Database will be
+                                                 embedded in qBittorrent
+                                                 executable (please follow
+                                                 instructions in
+                                                 src/geoip/README)
+  --with-qtsingleapplication=[system|shipped]     Use the shipped
+                                                 qtsingleapplication library
+                                                 or the system one
 
 EOT
 }
@@ -143,11 +152,21 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--enable-debug)
+			QC_ENABLE_DEBUG="Y"
+			shift
+			;;
+
 		--disable-gui)
 			QC_DISABLE_GUI="Y"
 			shift
 			;;
 
+		--disable-qt-dbus)
+			QC_DISABLE_qt_dbus="Y"
+			shift
+			;;
+
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
@@ -158,11 +177,6 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--disable-libnotify)
-			QC_DISABLE_libnotify="Y"
-			shift
-			;;
-
 		--disable-geoip-database)
 			QC_DISABLE_geoip_database="Y"
 			shift
@@ -173,6 +187,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--with-qtsingleapplication=*)
+			QC_WITH_QTSINGLEAPPLICATION=$optarg
+			shift
+			;;
+
 		--verbose)
 			QC_VERBOSE="Y"
 			shift
@@ -194,12 +213,14 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
+echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
 echo QC_DISABLE_GUI=$QC_DISABLE_GUI
+echo QC_DISABLE_qt_dbus=$QC_DISABLE_qt_dbus
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
 echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB
-echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
 echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database
 echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED
+echo QC_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION
 echo
 fi
 
@@ -304,7 +325,8 @@ cat >$1/modules.cpp <<EOT
 #line 1 "qt4.qcm"
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.4
+name: Qt >= 4.6
+arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
@@ -312,14 +334,61 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.4"; }
+	QString name() const { return "Qt >= 4.6"; }
-	QString shortname() const { return "Qt 4.4"; }
+	QString shortname() const { return "Qt 4.6"; }
 	bool exec()
 	{
+                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addDefine("DISABLE_GUI");
+			conf->addExtra("CONFIG += nox");
-		}	
+		}
-		return(QT_VERSION >= 0x040400);
+                // Debug mode
+                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
+                  conf->addExtra("CONFIG -= release");
+                  conf->addExtra("CONFIG += debug");
+                } else {
+                  conf->addExtra("CONFIG -= debug");
+                  conf->addExtra("CONFIG += release");
+                }
+                #ifdef Q_OS_FREEBSD
+                  conf->addLib("-lexecinfo");
+                  conf->addExtra("MANPREFIX = \$\$PREFIX");
+                #else
+                  conf->addExtra("MANPREFIX = \$\$PREFIX/share"); 
+                #endif
+		return(QT_VERSION >= 0x040600);
+	}
+};
+#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 "pkg-config.qcm"
@@ -350,20 +419,17 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.4";
+		QString req_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
-		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-  		  conf->addLib("-lcrypto");
-                }
 		return true;
 	}
 };
@@ -376,12 +442,15 @@ arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
 #include <boost/version.hpp>
+#include <libtorrent/version.hpp>
+
 class qc_libboost : public ConfObj
 {
 public:
-	qc_libboost(Conf *c) : ConfObj(c) {}
+  qc_libboost(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libboost"; }
+  QString name() const { return "libboost"; }
-	QString shortname() const { return "libboost"; }
+  QString shortname() const { return "libboost"; }
+
   QString findBoostLib(QString path, QString lib) const {
     QString name;
     QDir libDir(path);
@@ -405,136 +474,62 @@ public:
     }
     return name;
   }
-	bool exec(){
+
-        	QString s;
+  bool exec(){
-		s = conf->getenv("QC_WITH_LIBBOOST_INC");
+    QStringList sl;
-		if(!s.isEmpty()) {
+    QString s = conf->getenv("QC_WITH_LIBBOOST_INC");
-			if(!conf->checkHeader(s, "boost/format.hpp")) {
+    if (!s.isEmpty())
-				return false;
+      sl << s;
-      			}
+    sl << "/usr/include";
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+    sl << "/usr/local/include";
-				return false;
+    bool found = false;
-      			}
+    foreach (s, sl) {
-			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+      if (conf->checkHeader(s, "boost/format.hpp")
-				return false;
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
-      			}
+          && conf->checkHeader(s, "boost/filesystem/path.hpp")
-			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+#endif
-				return false;
+         ) {
-      			}
+        found = true;
-		}else{
+        break;
-			QStringList sl;
+      }
-			sl << "/usr/include";
+    }
-			sl << "/usr/local/include";
+    if (!found)
-			bool found = false;
+      return false;
-			foreach(s, sl){
+
-				if(conf->checkHeader(s, "boost/format.hpp")){
+    conf->addIncludePath(s);
-					found = true;
+
-					break;
+    // Find library
-				}
+    s = conf->getenv("QC_WITH_LIBBOOST_LIB");
-			}
-			if(!found) {
-				return false;
-          		}
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
-				return false;
-      			}
-			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
-				return false;
-      			}
-			if(!conf->checkHeader(s, "boost/thread.hpp")) {
-				return false;
-      			}
-		}
-		conf->addIncludePath(s);
-		// Find library
-		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
     QStringList required_libs;
 #if BOOST_VERSION >= 103500
       required_libs << "system"; 
 #endif
-    if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
-      // Not required by nox
+    required_libs << "filesystem" ;
-      required_libs << "filesystem" << "thread";
+#endif
-    }
+    //required_libs << "thread";
     QStringList libDirs;
-    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+    if (!s.isEmpty())
+      libDirs << s;
+    libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
+
     foreach(const QString& lib, required_libs) {
-      if(!s.isEmpty()) {
+      bool found = false;
-        QString detected_name = findBoostLib(s, lib);
+      foreach(const QString& libDir, libDirs) {
-        if(detected_name.isEmpty()) {
+        QString detected_name = findBoostLib(libDir, lib);
-          printf("Could not find boost %s library!\n", qPrintable(lib));
+        if(!detected_name.isEmpty()) {
-          return false;
-        } else {
           conf->addLib("-l"+detected_name);
-        }
+          found = true;
-      } else {
+          break;
-        bool found = false;
-        foreach(const QString& libDir, libDirs) {
-          QString detected_name = findBoostLib(libDir, lib);
-          if(!detected_name.isEmpty()) {
-            conf->addLib("-l"+detected_name);
-            found = true;
-            break;
-          }
-        }
-        if(!found) {
-          printf("Could not find boost %s library!\n", qPrintable(lib));
-          return false;
         }
       }
+      if(!found) {
+        printf("Could not find boost %s library!\n", qPrintable(lib));
+        return false;
+      }
     }
-		return true;
+    return true;
-	}
+  }
-};
-#line 1 "libnotify.qcm"
-/*
------BEGIN QCMOD-----
-name: libnotify
------END QCMOD-----
-*/
-// see  Conf::findPkgConfig
-class qc_libnotify : public ConfObj
-{
-public:
-	qc_libnotify(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
-	QString shortname() const { return "libnotify"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
-	bool exec(){
-		if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			return false;
-		}
-		QStringList incs;
-		QString req_ver = "0.4.2";
-		QString version, libs, other;
-		VersionMode mode = VersionMin;
-		if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) {
-			conf->addDefine("WITH_LIBNOTIFY");
-			for(int n = 0; n < incs.count(); ++n)
-				conf->addIncludePath(incs[n]);
-			if(!libs.isEmpty())
-				conf->addLib(libs);
-			QStringList incs2;
-			QString req_ver2 = "2.0";
-			QString version2, libs2, other2;
-			if(conf->findPkgConfig("glib-2.0", mode, req_ver2, &version2, &incs2, &libs2, &other2)) {
-				for(int n = 0; n < incs2.count(); ++n)
-				conf->addIncludePath(incs2[n]);
-				if(!libs2.isEmpty())
-					conf->addLib(libs2);
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-		
-		return true;
-	}
 };
 #line 1 "geoip-database.qcm"
 /*
@@ -574,12 +569,42 @@ public:
 #endif
 	}
 };
+#line 1 "qtsingleapplication.qcm"
+/*
+-----BEGIN QCMOD-----
+name: qtsingleapplication
+arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
+-----END QCMOD-----
+*/
+class qc_qtsingleapplication : public ConfObj
+{
+public:
+        qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
+        QString name() const { return "qtsingleapplication library"; }
+        QString shortname() const { return "qtsingleapplication"; }
+
+        bool exec(){
+                QString s;
+                s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
+                if(s.compare("system", Qt::CaseInsensitive) == 0) {
+                  // System
+                  conf->addExtra("CONFIG += usesystemqtsingleapplication");
+                  printf(" [system] ");
+                } else {
+                  printf(" [shipped] ");
+                }
+                return true;
+        }
+};
 
 EOT
 cat >$1/modules_new.cpp <<EOT
     o = new qc_qt4(conf);
     o->required = true;
     o->disabled = false;
+    o = new qc_qt_dbus(conf);
+    o->required = false;
+    o->disabled = false;
     o = new qc_pkg_config(conf);
     o->required = true;
     o->disabled = false;
@@ -589,12 +614,12 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_libboost(conf);
     o->required = true;
     o->disabled = false;
-    o = new qc_libnotify(conf);
-    o->required = false;
-    o->disabled = false;
     o = new qc_geoip_database(conf);
     o->required = false;
     o->disabled = false;
+    o = new qc_qtsingleapplication(conf);
+    o->required = true;
+    o->disabled = false;
 
 EOT
 cat >$1/conf4.h <<EOT
@@ -1540,12 +1565,14 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
+export QC_ENABLE_DEBUG
 export QC_DISABLE_GUI
+export QC_DISABLE_qt_dbus
 export QC_WITH_LIBBOOST_INC
 export QC_WITH_LIBBOOST_LIB
-export QC_DISABLE_libnotify
 export QC_DISABLE_geoip_database
 export QC_WITH_GEOIP_DATABASE_EMBEDDED
+export QC_WITH_QTSINGLEAPPLICATION
 export QC_VERBOSE
 rm -rf .qconftemp
 (

doc/qbittorrent-nox.1

@@ -8,7 +8,7 @@ qBittorrent\-nox \- a command line Bittorrent client written in C++ / Qt4
 
 .SH "SYNOPSIS"
 
-\fBqbittorrent\-nox\fR [\-\-webui-port=x] [TORRENT_FILE | URL]...
+\fBqbittorrent\-nox\fR [\-\-d|\-\-daemon] [\-\-webui-port=x] [TORRENT_FILE | URL]...
 
 \fBqbittorrent\-nox\fR \-\-help
 

install.os2

@@ -0,0 +1,187 @@
+QBittorrent installation
+
+
+
+0. CONTENTS OF THIS FILE
+========================
+
+1. INTRODUCTION
+
+2. REQUIREMENTS
+
+3. INSTALLATION
+
+4. BUGREPORTS
+
+5. CREDITS
+
+6. SUPPORT AND DONATIONS
+
+7. HISTORY
+
+
+1. INTRODUCTION
+===============
+
+Welcome to QBittorrent port for OS/2 and eComStation.
+
+
+2. REQUIREMENTS
+===============
+
+The following requirements can be installed either by rpm or by zip files.
+
+RPM Installation:
+
+klibc
+-----
+
+  1. yum install libc
+
+openssl 1.0
+-----------
+
+  1. yum install openssl
+
+pthread
+-------
+
+  1. yum install pthread
+
+GCC4Core
+--------
+
+  1. yum install libgcc
+  2. yum install gcc-stack-protector
+  3. yum install gcc-stdc++-shared-library
+  4. yum install gcc-supc++-shared-library
+
+Qt4 dll
+-------
+
+  1. yum install libqt4
+
+
+ZIP Installation:
+
+klibc
+-----
+
+  1. Download klibc 0.6.5 or better (see http://svn.netlabs.org/libc for more information)
+  2. Install the files to your libpath eg x:\ecs\dll
+
+openssl 1.0
+-----------
+
+  1. Download the zip file from http://rpm.netlabs.org/release/00/zip
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+pthread
+-------
+
+  1. Download pthread 2012-03-13 or better from http://rpm.netlabs.org/release/00/zip
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+GCC4Core
+--------
+
+  1. Download GCC4Core 1.2.1 or better from http://ftp.netlabs.org/pub/gcc
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+Qt4 dll
+-------
+
+  1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more information)
+  2. Install the files according to the readme
+
+
+3. INSTALLATION
+===============
+          
+To install QBittorrent, do the following:
+
+  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. BUGREPORTS
+=============
+
+Please create bugreports at http://svn.netlabs.org/qtapps
+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
+==========
+
+2012-09-19
+
+  * updated to 3.0.4 code level of QBittorrent
+  * updated libtorrent to 0.16.3 level
+
+2012-09-06
+
+  * updated to 3.0.2 code level of QBittorrent
+
+2012-05-14
+
+  * updated to 2.9.8 code level of QBittorrent
+
+2012-03-15
+
+  * updated to 2.9.5 code level of QBittorrent
+
+2011-09-26
+
+  * updated to 2.8.5 code level of QBittorrent
+  * updated to Qt 4.7.3
+
+2011-06-20
+
+  * updated to 2.7.3 code level of QBittorrent
+  * updated libtorrent to 0.15.6 level
+
+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
+

macxconf.pri

@@ -0,0 +1,67 @@
+PREFIX = /usr/local
+BINDIR = /usr/local/bin
+DATADIR = /usr/local/share
+
+# Use pkg-config to get all necessary libtorrent DEFINES
+CONFIG += link_pkgconfig
+PKGCONFIG += libtorrent-rasterbar
+DEFINES += BOOST_ASIO_DYN_LINK
+
+# Special include/libs paths (macports)
+INCLUDEPATH += /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include
+LIBS += -L/opt/local/lib
+
+# OpenSSL lib
+LIBS += -lssl -lcrypto
+# Boost system lib
+LIBS += -lboost_system-mt
+# Boost filesystem lib (Not needed for libtorrent >= 0.16.0)
+#LIBS += -lboost_filesystem-mt
+# Carbon
+LIBS += -framework Carbon -framework IOKit
+# Zlib
+LIBS += -lz
+
+document_icon.path = Contents/Resources
+document_icon.files = mac/qBitTorrentDocument.icns
+QMAKE_BUNDLE_DATA += document_icon
+
+qt_conf.path = Contents/Resources
+qt_conf.files = mac/qt.conf
+QMAKE_BUNDLE_DATA += qt_conf
+
+qt_translations.path = Contents/MacOS/translations
+qt_translations.files = qt-translations/qt_ar.qm \
+                        qt-translations/qt_bg.qm \
+                        qt-translations/qt_ca.qm \
+                        qt-translations/qt_cs.qm \
+                        qt-translations/qt_da.qm \
+                        qt-translations/qt_de.qm \
+                        qt-translations/qt_es.qm \
+                        qt-translations/qt_fi.qm \
+                        qt-translations/qt_fr.qm \
+                        qt-translations/qt_gl.qm \
+                        qt-translations/qt_he.qm \
+                        qt-translations/qt_hu.qm \
+                        qt-translations/qt_it.qm \
+                        qt-translations/qt_ja.qm \
+                        qt-translations/qt_ko.qm \
+                        qt-translations/qt_lt.qm \
+                        qt-translations/qt_nl.qm \
+                        qt-translations/qt_pl.qm \
+                        qt-translations/qt_pt.qm \
+                        qt-translations/qt_pt_BR.qm \
+                        qt-translations/qt_ru.qm \
+                        qt-translations/qt_sk.qm \
+                        qt-translations/qt_sv.qm \
+                        qt-translations/qt_tr.qm \
+                        qt-translations/qt_uk.qm \
+                        qt-translations/qt_zh_CN.qm \
+                        qt-translations/qt_zh_TW.qm
+QMAKE_BUNDLE_DATA += qt_translations
+
+ICON = mac/qbittorrent_mac.icns
+QMAKE_INFO_PLIST = mac/Info.plist
+
+DEFINES += WITH_GEOIP_EMBEDDED
+message("On Mac OS X, GeoIP database must be embedded.")

os2conf.pri

@@ -0,0 +1,19 @@
+exists(conf.pri) {
+    # to the conf.pri goes all system dependent stuff
+    include(conf.pri)
+}
+
+LIBS += -ltorrent-rasterbar \
+        -lboost_thread \
+        -lboost_system \
+        -lboost_filesystem \
+        -lssl -lcrypto -lidn -lpthread -lz
+
+RC_FILE = qbittorrent_os2.rc
+
+# LIBTORRENT DEFINES
+DEFINES += WITH_SHIPPED_GEOIP_H
+DEFINES += BOOST_ASIO_DYN_LINK
+
+DEFINES += WITH_GEOIP_EMBEDDED
+message("On eCS(OS/2), GeoIP database must be embedded.")

qBittorrent.kdevelop

@@ -1,199 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Christophe Dumez</author>
-    <email>chris@qbittorrent.org</email>
-    <version>1.0.0</version>
-    <projectmanagement>KDevTrollProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <keywords>
-      <keyword>Qt</keyword>
-    </keywords>
-    <projectname>qBittorrent</projectname>
-    <ignoreparts/>
-    <projectdirectory>.</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
-    <defaultencoding/>
-    <versioncontrol>kdevsubversion</versioncontrol>
-  </general>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
-      <group pattern="*.ui" name="User Interface" />
-      <group pattern="*.png" name="Icons" />
-      <group pattern="*" name="Others" />
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <showvcsfields>false</showvcsfields>
-    </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>w3c-svg</toc>
-      <toc>sw</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-      <gdbpath/>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-      <outputradix>10</outputradix>
-    </display>
-  </kdevdebugger>
-  <kdevcppsupport>
-    <qt>
-      <version>4</version>
-      <used>true</used>
-      <includestyle>4</includestyle>
-      <designerintegration>ExternalDesigner</designerintegration>
-      <root>/usr/lib/qt4</root>
-      <qmake>/usr/bin/qmake</qmake>
-      <designer>/usr/bin/designer</designer>
-      <designerpluginpaths/>
-    </qt>
-    <references>
-      <pcs>automatic_%2Fhome%2Fishanarora%2Fprojects%2Fqbittorrent</pcs>
-    </references>
-    <codecompletion>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-      <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
-      <completionBoxItemOrder>0</completionBoxItemOrder>
-      <howEvaluationContextMenu>true</howEvaluationContextMenu>
-      <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
-      <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
-      <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
-      <processPrimaryTypes>true</processPrimaryTypes>
-      <processFunctionArguments>true</processFunctionArguments>
-      <preProcessAllHeaders>true</preProcessAllHeaders>
-      <parseMissingHeadersExperimental>true</parseMissingHeadersExperimental>
-      <resolveIncludePathsUsingMakeExperimental>true</resolveIncludePathsUsingMakeExperimental>
-      <alwaysParseInBackground>true</alwaysParseInBackground>
-      <usePermanentCaching>true</usePermanentCaching>
-      <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
-      <includePaths>.;</includePaths>
-    </codecompletion>
-    <creategettersetter>
-      <prefixGet>get</prefixGet>
-      <prefixSet>set</prefixSet>
-      <prefixVariable>m_,_</prefixVariable>
-      <parameterName>theValue</parameterName>
-      <inlineGet>true</inlineGet>
-      <inlineSet>true</inlineSet>
-    </creategettersetter>
-    <splitheadersource>
-      <enabled>false</enabled>
-      <synchronize>true</synchronize>
-      <orientation>Vertical</orientation>
-    </splitheadersource>
-  </kdevcppsupport>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevtrollproject>
-    <general>
-      <activedir>src</activedir>
-    </general>
-    <run>
-      <directoryradio>executable</directoryradio>
-      <mainprogram>/home/ishanarora/projects/qbittorrent/src/qbittorrent</mainprogram>
-      <programargs/>
-      <globaldebugarguments/>
-      <globalcwd>/home/ishanarora/projects/qbittorrent</globalcwd>
-      <useglobalprogram>true</useglobalprogram>
-      <terminal>false</terminal>
-      <autocompile>true</autocompile>
-      <autoinstall>false</autoinstall>
-      <autokdesu>false</autokdesu>
-      <envvars/>
-    </run>
-    <make>
-      <abortonerror>true</abortonerror>
-      <runmultiplejobs>false</runmultiplejobs>
-      <numberofjobs>1</numberofjobs>
-      <dontact>false</dontact>
-      <makebin/>
-      <prio>0</prio>
-      <envvars/>
-    </make>
-    <qmake>
-      <savebehaviour>2</savebehaviour>
-      <replacePaths>false</replacePaths>
-      <disableDefaultOpts>true</disableDefaultOpts>
-    </qmake>
-  </kdevtrollproject>
-  <cppsupportpart>
-    <filetemplates>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-    </filetemplates>
-  </cppsupportpart>
-  <ctagspart>
-    <customArguments/>
-    <customTagfilePath>/home/ishanarora/projects/qbittorrent/tags</customTagfilePath>
-    <activeTagsFiles/>
-  </ctagspart>
-  <kdevdocumentation>
-    <projectdoc>
-      <docsystem/>
-      <docurl/>
-      <usermanualurl/>
-    </projectdoc>
-  </kdevdocumentation>
-</kdevelop>

qbittorrent.pro

@@ -2,3 +2,18 @@ TEMPLATE = subdirs
 
 SUBDIRS += src
 
+include(version.pri)
+include(qm_gen.pri)
+
+# Dist
+dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ &&
+dist.commands += git clone . ../$${PROJECT_NAME}-$${PROJECT_VERSION} &&
+dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.git &&
+dist.commands += rm -f ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.gitignore &&
+dist.commands += cd .. &&
+dist.commands += tar czf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar.gz $${PROJECT_NAME}-$${PROJECT_VERSION} &&
+dist.commands += tar cf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar $${PROJECT_NAME}-$${PROJECT_VERSION} &&
+dist.commands += xz -f $${PROJECT_NAME}-$${PROJECT_VERSION}.tar &&
+dist.commands += rm -fR $${PROJECT_NAME}-$${PROJECT_VERSION}
+
+QMAKE_EXTRA_TARGETS += dist

qbittorrent.qc

@@ -6,6 +6,8 @@
   <dep type='qt4'>
     <required/>
   </dep>
+  <dep type='qt-dbus'>
+  </dep>
   <dep type='pkg-config'>
     <required/>
   </dep>
@@ -15,8 +17,9 @@
   <dep type='libboost'>
     <required/>
   </dep>
-  <dep type='libnotify'>
-  </dep>
   <dep type='geoip-database'>
   </dep>
+  <dep type='qtsingleapplication'>
+    <required/>
+  </dep>
 </qconf>

qcm/libboost.qcm

@@ -6,12 +6,15 @@ arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
 #include <boost/version.hpp>
+#include <libtorrent/version.hpp>
+
 class qc_libboost : public ConfObj
 {
 public:
-	qc_libboost(Conf *c) : ConfObj(c) {}
+  qc_libboost(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libboost"; }
+  QString name() const { return "libboost"; }
-	QString shortname() const { return "libboost"; }
+  QString shortname() const { return "libboost"; }
+
   QString findBoostLib(QString path, QString lib) const {
     QString name;
     QDir libDir(path);
@@ -35,84 +38,60 @@ public:
     }
     return name;
   }
-	bool exec(){
+
-        	QString s;
+  bool exec(){
-		s = conf->getenv("QC_WITH_LIBBOOST_INC");
+    QStringList sl;
-		if(!s.isEmpty()) {
+    QString s = conf->getenv("QC_WITH_LIBBOOST_INC");
-			if(!conf->checkHeader(s, "boost/format.hpp")) {
+    if (!s.isEmpty())
-				return false;
+      sl << s;
-      			}
+    sl << "/usr/include";
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+    sl << "/usr/local/include";
-				return false;
+    bool found = false;
-      			}
+    foreach (s, sl) {
-			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+      if (conf->checkHeader(s, "boost/format.hpp")
-				return false;
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
-      			}
+          && conf->checkHeader(s, "boost/filesystem/path.hpp")
-			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+#endif
-				return false;
+         ) {
-      			}
+        found = true;
-		}else{
+        break;
-			QStringList sl;
+      }
-			sl << "/usr/include";
+    }
-			sl << "/usr/local/include";
+    if (!found)
-			bool found = false;
+      return false;
-			foreach(s, sl){
+
-				if(conf->checkHeader(s, "boost/format.hpp")){
+    conf->addIncludePath(s);
-					found = true;
+
-					break;
+    // Find library
-				}
+    s = conf->getenv("QC_WITH_LIBBOOST_LIB");
-			}
-			if(!found) {
-				return false;
-          		}
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
-				return false;
-      			}
-			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
-				return false;
-      			}
-			if(!conf->checkHeader(s, "boost/thread.hpp")) {
-				return false;
-      			}
-		}
-		conf->addIncludePath(s);
-		// Find library
-		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
     QStringList required_libs;
 #if BOOST_VERSION >= 103500
       required_libs << "system"; 
 #endif
-    if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
-      // Not required by nox
+    required_libs << "filesystem" ;
-      required_libs << "filesystem" << "thread";
+#endif
-    }
+    //required_libs << "thread";
     QStringList libDirs;
-    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+    if (!s.isEmpty())
+      libDirs << s;
+    libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
+
     foreach(const QString& lib, required_libs) {
-      if(!s.isEmpty()) {
+      bool found = false;
-        QString detected_name = findBoostLib(s, lib);
+      foreach(const QString& libDir, libDirs) {
-        if(detected_name.isEmpty()) {
+        QString detected_name = findBoostLib(libDir, lib);
-          printf("Could not find boost %s library!\n", qPrintable(lib));
+        if(!detected_name.isEmpty()) {
-          return false;
-        } else {
           conf->addLib("-l"+detected_name);
-        }
+          found = true;
-      } else {
+          break;
-        bool found = false;
-        foreach(const QString& libDir, libDirs) {
-          QString detected_name = findBoostLib(libDir, lib);
-          if(!detected_name.isEmpty()) {
-            conf->addLib("-l"+detected_name);
-            found = true;
-            break;
-          }
-        }
-        if(!found) {
-          printf("Could not find boost %s library!\n", qPrintable(lib));
-          return false;
         }
       }
+      if(!found) {
+        printf("Could not find boost %s library!\n", qPrintable(lib));
+        return false;
+      }
     }
-		return true;
+    return true;
-	}
+  }
 };

qcm/libnotify.qcm

@@ -24,7 +24,7 @@ public:
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) {
-			conf->addDefine("WITH_LIBNOTIFY");
+			conf->addExtra("CONFIG += libnotify");
 			for(int n = 0; n < incs.count(); ++n)
 				conf->addIncludePath(incs[n]);
 			if(!libs.isEmpty())
@@ -40,10 +40,21 @@ public:
 			} else {
 				return false;
 			}
+			QStringList incs3;
+                        QString req_ver3 = "2.0";
+                        QString version3, libs3, other3;
+			if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
+                                for(int n = 0; n < incs3.count(); ++n)
+                                conf->addIncludePath(incs3[n]);
+                                if(!libs3.isEmpty())
+                                        conf->addLib(libs3);
+                        } else {
+                                return false;
+                        }
 		} else {
 			return false;
 		}
-		
+
 		return true;
 	}
 };

qcm/libtorrent-rasterbar.qcm

@@ -8,20 +8,17 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.4";
+		QString req_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
-		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-  		  conf->addLib("-lcrypto");
-                }
 		return true;
 	}
 };

qcm/qt-dbus.qcm

@@ -0,0 +1,31 @@
+/*
+-----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;
+	}
+};

qcm/qt-svg.qcm

@@ -0,0 +1,31 @@
+/*
+-----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;
+	}
+};

qcm/qt4.qcm

@@ -1,6 +1,7 @@
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.4
+name: Qt >= 4.6
+arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
@@ -8,13 +9,28 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.4"; }
+	QString name() const { return "Qt >= 4.6"; }
-	QString shortname() const { return "Qt 4.4"; }
+	QString shortname() const { return "Qt 4.6"; }
 	bool exec()
 	{
+                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addDefine("DISABLE_GUI");
+			conf->addExtra("CONFIG += nox");
-		}	
+		}
-		return(QT_VERSION >= 0x040400);
+                // Debug mode
+                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
+                  conf->addExtra("CONFIG -= release");
+                  conf->addExtra("CONFIG += debug");
+                } else {
+                  conf->addExtra("CONFIG -= debug");
+                  conf->addExtra("CONFIG += release");
+                }
+                #ifdef Q_OS_FREEBSD
+                  conf->addLib("-lexecinfo");
+                  conf->addExtra("MANPREFIX = $$PREFIX");
+                #else
+                  conf->addExtra("MANPREFIX = $$PREFIX/share"); 
+                #endif
+		return(QT_VERSION >= 0x040600);
 	}
 };

qcm/qtsingleapplication.qcm

@@ -0,0 +1,26 @@
+/*
+-----BEGIN QCMOD-----
+name: qtsingleapplication
+arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
+-----END QCMOD-----
+*/
+class qc_qtsingleapplication : public ConfObj
+{
+public:
+        qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
+        QString name() const { return "qtsingleapplication library"; }
+        QString shortname() const { return "qtsingleapplication"; }
+
+        bool exec(){
+                QString s;
+                s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
+                if(s.compare("system", Qt::CaseInsensitive) == 0) {
+                  // System
+                  conf->addExtra("CONFIG += usesystemqtsingleapplication");
+                  printf(" [system] ");
+                } else {
+                  printf(" [shipped] ");
+                }
+                return true;
+        }
+};

qm_gen.pri

@@ -0,0 +1,19 @@
+TS_IN = $$fromfile(src/src.pro,TRANSLATIONS)
+TS_IN_NOEXT = $$replace(TS_IN,".ts","")
+             
+isEmpty(QMAKE_LRELEASE) {
+    win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
+    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+    unix {
+        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
+    } else {
+        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
+    }
+}
+
+message("Building translations")
+for(L,TS_IN_NOEXT) {
+    message("Processing $${L}")
+    system("$$QMAKE_LRELEASE -silent src/$${L}.ts -qm src/$${L}.qm")
+    !exists("src/$${L}.qm"):error("Building translations failed, cannot continue")
+}