Bump to 3.1.9

This reverts commit b294d89b4f.

.gitattributes

@@ -1,7 +0,0 @@
-core.eol=lf
-* text eol=lf
-*.zip binary
-*.png binary
-*.ico binary
-*.qm binary
-*.icns binary

.gitignore

@@ -1,32 +1,15 @@
-src/gui/geoip/GeoIP.dat
-src/gui/geoip/GeoIP.dat.gz
+src/geoip/GeoIP.dat
 src/qbittorrent
-src/qbittorrent-nox
-src/release
-src/debug
 qbittorrent.pro.user*
 conf.pri
-Makefile*
+Makefile
 *.pyc
 *.log
-
 # Compiled object files
 *.o
-*.pdb
-*.exe
-
 # Generated MOC, resource and UI files
 moc_*.cpp
 qrc_*.cpp
 ui_*.h
 *.moc
 src/lang/qbittorrent_*.qm
-.DS_Store
-.qmake.stash
-src/qbittorrent.app
-*.dmg
-
-#Autotools junk
-aclocal.m4
-autom4te.cache/*
-config.status

.travis.yml

@@ -1,30 +1,13 @@
-language: cpp
-
-os:
-  - linux
-  - osx
-osx_image: xcode7
+language:
+  - cpp
 
 env:
-  matrix:
-    # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
-    #- lt_branch=dist gui=true
-    #- lt_branch=dist gui=false
-    - lt_branch=RC_1_0 qt=5 gui=true
-    - lt_branch=RC_1_0 qt=5 gui=false
-    - lt_branch=RC_1_0 qt=4 gui=true
-    - lt_branch=RC_1_0 qt=4 gui=false
-
-  global:
-    - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
-    - coverity_branch: coverity_scan
-
-matrix:
-  exclude:
-    - os: linux
-      env: lt_branch=RC_1_0 qt=5 gui=true
-    - os: linux
-      env: lt_branch=RC_1_0 qt=5 gui=false
+  # 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:
@@ -34,90 +17,37 @@ branches:
 notifications:
   email:
     on_success: change
-    on_failure: change
-
-# container-based builds
-sudo: false
-# TODO: osx builder does not enable cache yet, see: https://github.com/travis-ci/travis-ci/issues/4011
-cache:
-  directories:
-    - $HOME/.ccache
-
-addons:
-  coverity_scan:
-    project:
-      name: "qbittorrent/qBittorrent"
-      description: "Build submitted via Travis CI"
-    build_command_prepend: "./bootstrap.sh && ./configure $qbtconf && echo QMAKE_CC=$CC >> conf.pri && echo QMAKE_CXX=$CXX >> conf.pri"
-    build_command: make
-    branch_pattern: $coverity_branch
-    notification_email: sledgehammer999@qbittorrent.org
-  apt:
-    sources:
-    # sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
-    - ubuntu-toolchain-r-test
-    - boost-latest
-    packages:
-    # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
-    - autoconf
-    - automake
-    - colormake
-    - g++-4.8
-    - libssl-dev
-    - libboost1.55-dev
-    - libboost-system1.55-dev
-    - libqt4-dev
-    # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
-    #- libtorrent-rasterbar6
+    on_failure: change 
 
 before_install:
-  # Only allow specific build for coverity scan, others will stop
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true ]; then exit ; fi
-
   - shopt -s expand_aliases
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CC=gcc-4.8 CXX=g++-4.8 ; fi
-  - if [ "$TRAVIS_BRANCH" != "$coverity_branch" -a "$TRAVIS_OS_NAME" = "linux" ]; then dpkg-query -L ccache && export PATH="/usr/lib/ccache/:$PATH" ; fi
-  - alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system)
+  - alias sudo="sudo "
+  # Using nprocs/2 sometimes may fail (gcc is killed by system), just use two threads
+  - alias make="colormake -j2 "
 
-  - libt_path="$HOME/libt_install"
-  - qbt_path="$HOME/qbt_install"
-  - ltconf="$ltconf --prefix="$libt_path" --disable-geoip"
-  - qbtconf="$qbtconf --prefix="$qbt_path" --with-qt4 PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":$PKG_CONFIG_PATH"
-
-  # Options for specific branches
   # Also setup a virtual display for after_success target when gui == true
-  - if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ;
-    elif [ "$TRAVIS_OS_NAME" = "linux" ]; then 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
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then qbtconf="$qbtconf --disable-qt-dbus" ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" -a "$qt" = 4 ]; then brew install qt; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" -a "$qt" = 5 ]; then qbtconf="$qbtconf --with-qt4=no" ; fi
+  - 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"
 
-  # Print settings
-  - echo $lt_branch
-  - echo $gui
+  - echo settings
+  - echo $lt_source
   - echo $ltconf
+  - echo $gui
   - echo $qbtconf
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then ccache -V && ccache --show-stats && ccache --zero-stats ; fi
+
+  - 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 [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" != "dist" ]; then cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch ; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" != "dist" ]; then cd libtorrent && ./autotool.sh && ./configure $ltconf && make install && cd "$TRAVIS_BUILD_DIR" ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null && brew install colormake libtorrent-rasterbar ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" -a "$qt" = 5 ]; then brew install qt5 && brew link --force qt5 ; fi
+  - 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:
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # Skip usual build when running coverity scan
-  - ./bootstrap.sh && ./configure $qbtconf
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then echo "QMAKE_CC=$CC" >> conf.pri && echo "QMAKE_CXX=$CXX" >> conf.pri ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs/' src/Makefile ; fi
-  - make && make install
-
+  - qt-qconf
+  - ./configure $qbtconf && sudo make install
+  
 after_success:
-  - if [ "$gui" = true ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd "$qbt_path/bin" && export LD_PRELOAD="$libt_path/lib/libtorrent-rasterbar.so:$LD_PRELOAD" ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cd "src/$qbt_exe.app/Contents/MacOS" ; fi
-  - ./$qbt_exe --version
-
-after_script:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then ccache --show-stats ; fi
+  - if $gui ; then qbittorrent --version ; else qbittorrent-nox --version ; fi

.tx/config

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

AUTHORS

@@ -17,7 +17,7 @@ Contributors:
 * Nick Tiskov <daymansmail@gmail.com>
 
 Code from other projects:
-* files src/qtsingleapplication/* src/lineedit/*
+* files src/qtsingleapp/* src/lineedit/*
   copyright: Nokia Corporation
   license: LGPL
 
@@ -34,7 +34,7 @@ Code from other projects:
   license: GPLv2/3
 
 Images Authors:
-* files: src/icons/*.png
+* files: src/Icons/*.png
   copyright: Gnome Icon Theme
   license: GPLv2
   url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
@@ -44,21 +44,21 @@ Images Authors:
   license: LGPL
   url: http://www.oxygen-icons.org
 
-* files: src/icons/flags/*.png
+* files: src/Icons/flags/*.png
   copyright: Mark James <mjames@gmail.com>
   license: Public Domain
   url: http://www.famfamfam.com
 
-* files: src/icons/skin/*.png
+* files: src/Icons/skin/*.png
   files: src/menuicons/YYxYY/*.png
   copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
   license: GPLv2
 
-* file: src/icons/skin/tabs.gif
+* file: src/Icons/skin/tabs.gif
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
-* file: src/icons/skin/qbittorrent_mono*
+* file: src/Icons/skin/qbittorrent_mono*
   copyright: Daniel Eguren <deguren@gmail.com>
   license: LGPL
 
@@ -77,17 +77,9 @@ Images Authors:
 * file: src/search_engine/engines/torrentreactor.png
   copyright: Downloaded from torrentreactor.net
 
-* file: src/icons/oxygen/checked.png
-  copyright: Victor Buinsky <allok.victor@gmail.com>
-  
-* file: src/icons/skin/ratio.png
-  copyright: Fatcow Web Hosting
-  license: Creative Commons Attribution 3.0 License
-  url: http://www.fatcow.com/free-icons
-
 Translations authors:
 * files: src/lang/*.ts
-* file: src/icons/qBittorrent.desktop
+* file: src/Icons/qBittorrent.desktop
   copyright:
   - Arabic: SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and  Ibrahim Saed ibraheem_alex(Transifex)
   - Armenian: Hrant Ohanyan (hrantohanyan@mail.am)

CODING_GUIDELINES.md

@@ -1,229 +0,0 @@
-All new code must follow the following coding guidelines.  
-If you make changes in a file that still uses another coding style, make sure that you follow these guidelines for your changes instead.  
-**Note 1:** I will not take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style.  
-**Note 2:** You can use the `uncrustify` program/tool to clean up any source file. Use it with the `uncrustify.cfg` configuration file found in the root folder.  
-**Note 3:** There is also a style for QtCreator but it doesn't cover all cases. In QtCreator `Tools->Options...->C++->Code Style->Import...` and choose the `codingStyleQtCreator.xml` file found in the root folder.  
-
-### 1. Curly braces ###
-#### a. Function blocks, class/struct definitions, namespaces ####
-```c++
-int myFunction(int a)
-{
-    //code
-}
-
-void myFunction() {} // empty body
-
-MyClass::MyClass(int *parent)
-    : m_parent(parent)
-{
-    //initialize
-}
-
-int MyClass::myMethod(int a)
-{
-    //code
-}
-
-class MyOtherClass
-{
-public:
-    //code
-protected:
-    //code
-private:
-    //code
-};
-
-namespace Name
-{
-    //code
-}
-
-// Lambdas
-[](int arg1, int arg2) -> bool { return arg1 < arg2; }
-
-[this](int arg)
-{
-    this->acc += arg;
-}
-```
-
-#### b. Other code blocks ####
-```c++
-if (condition) {
-    //code
-}
-
-for (int a = 0; a < b; ++b) {
-    //code
-}
-
-switch (a) {
-case 1:
-    //blah
-case 2:
-    //blah
-default:
-    //blah
-}
-```
-
-#### c. Blocks in switch's case labels ####
-```c++
-switch (var) {
-case 1: {
-        //declare local variables
-        //code
-    }
-    break;
-case 2: {
-        //declare local variables
-        //code
-    }
-    break;
-default:
-    //code
-}
-```
-
-#### d. single-line blocks (lambdas, initializer lists etc.) ####
-```c++
- {} // empty - space before {
- { body } // spaces around { and before }
-```
-
-### 2. If blocks ###
-#### a. Multiple tests ####
-```c++
-if (condition) {
-    //code
-}
-else if (condition) {
-    //code
-}
-else {
-    //code
-}
-```
-The `else if`/`else` must be on their own lines.
-
-#### b. Single statement if blocks ####
-**Most** single statement if blocks should look like this:
-```c++
-if (condition)
-    a = a + b;
-```
-
-One acceptable exception to this **can be** `return`, `break` or `continue` statements, provided that the test condition isn't very long. However you can choose to use the first rule instead.
-```c++
-a = myFunction();
-b = a * 1500;
-
-if (b > 0) return;
-c = 100 / b;
-```
-
-#### c. Using curly braces for single statement if blocks ####
-
-However, there are cases where curly braces for single statement if blocks **should** be used.
-* If some branch needs braces then all others should use them. Unless you have multiple `else if` in a row and the one needing the braces is only for a very small sub-block of code.
-* Another exception would be when we have nested if blocks or generally multiple levels of code that affect code readability.
-
-Generally it will depend on the particular piece of code and would be determined on how readable that piece of code is. **If in doubt** always use braces if one of the above exceptions applies.
-
-### 3. Indentation###
-4 spaces.
-
-### 4. File encoding and line endings.###
-
-UTF-8 and Unix-like line ending (LF). Unless some platform specific files need other encodings/line endings.
-
-### 5. Initialization lists.###
-Initialization lists should be vertical. This will allow for more easily readable diffs. The initialization colon should be indented and in its own line along with first argument. The rest of the arguments should be indented too and have the comma prepended.
-```c++
-myClass::myClass(int a, int b, int c, int d)
-    : m_a(a)
-    , m_b(b)
-    , m_c(c)
-    , m_d(d)
-{
-    //code
-}
-```
-
-### 6. Enums.###
-Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
-```c++
-enum Days
-{
-    Monday,
-    Tuesday,
-    Wednesday,
-    Thursday,
-    Friday,
-    Saturday,
-    Sunday
-};
-```
-
-### 7. Names.###
-All names should be camelCased.
-
-#### a. Type names and namespaces ####
-Type names and namespaces start with Upper case letter (except POD types).
-```c++
-class ClassName {}
-
-struct StructName {}
-
-enum EnumName {}
-
-typedef QList<ClassName> SomeList;
-
-namespace NamespaceName
-{
-}
-```
-
-#### b. Variable names ####
-Variable names start with lower case letter.
-```c++
-int myVar;
-```
-
-#### c. Private member variable names ####
-Private member variable names start with lower case letter and should have ```m_``` prefix.
-```c++
-class MyClass
-{
-    int m_myVar;
-}
-```
-
-### 8. Misc.###
-
-* Line breaks for long lines with operation:
-
-```c++
-a += "b"
-  + "c"
-  + "d";
-```
-
-* Space around operations eg `a = b + c` or `a=b+c`:
-
-Before and after the assignment there should be a space. One exception could be: for loops.
-```c++
-for (int a=0; a<b; ++b) {
-}
-```
-
-* private/public/protected must not be indented
-
-* Preprocessor commands must go at line start
-
-* Method definitions aren't allowed in header files
-
-###8. Not covered above###
-If something isn't covered above, just follow the same style the file you are editing has. If that particular detail isn't present in the file you are editing, then use whatever the rest of the project uses.

CONTRIBUTING.md

@@ -1,36 +0,0 @@
-# Filing an issue
-
-### Must read
-* If you aren't sure, you can ask on the [**forum**](http://forum.qbittorrent.org) or read our [**wiki**](http://wiki.qbittorrent.org) first.
-* Do a quick **search**. Others might already reported the issue.
-* Write in **English**!
-* Provide **version** information: (You can find version numbers at menu `Help -> About -> Libraries`)
-  ```
-qBittorrent:
-Qt:
-libtorrent:
-boost:
-OS version:
-
-  ```
-* Provide **steps** to reproduce the problem, it will be easier to pinpoint the fault.
-* **Screenshots**! A screenshot is worth a thousand words. just upload it. [(How?)](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests)
-
-### Good to know
-* **Be patient**. The dev team is small and resource limited. Devs finding their free time, analyzing the problem and fixing the issue, it all takes time. :clock3:
-* If you can code, why not become a **contributor** by fixing the issue and open a pull request? :wink:
-* Harsh words or threats won't help your situation. What's worse, your complain will (very likely) to be **ignored**. :fearful:
-
-
-# Opening a pull request
-
-### Must read
-* Read our [**coding guidelines**](https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md). There are some scripts to help you: [uncrustify script](https://raw.githubusercontent.com/qbittorrent/qBittorrent/master/uncrustify.cfg), [astyle script](https://gist.github.com/Chocobo1/539cee860d1eef0acfa6), [(related thread)](https://github.com/qbittorrent/qBittorrent/issues/2192).
-* Keep the title **short** and provide a **clear** description about what your pull request does.
-* Provide **screenshots** for UI related changes.
-* Keep your git commit history **clean** and **precise**. Commits like `xxx fixup` should not appear.
-* If your commit fix a reported issue (for example #4134), add the following message to the commit `Closes #4134.`. Example [here](https://github.com/qbittorrent/qBittorrent/commit/a74bac20c4e8de9776bf9bb77fdc7526135d1988).
-
-### Good to know
-* **Search** pull request history! Others might already implemented your idea and is waiting to be merged (or got rejected already). Save your precious time by doing a search first.
-* When resolving merge conflicts, do `git rebase <target_branch_name>`, don't do `git pull`. Then you can start fixing the conflicts. Here is a good explanation: [link](https://www.atlassian.com/git/tutorials/merging-vs-rebasing).

Changelog

@@ -1,211 +1,115 @@
-* Tue Jan 19 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.2
-    - FEATURE: Add a new column to peers list that shows list of files which are downloaded right now from a peer. (evsh)
-    - FEATURE: Improve the "Watch folders" UI. Closes #4300. You'll need to redo your watch folders settings. (sledgehammer999, glassez)
-    - FEATURE: Support loading multiple magnets/hashes/urls per .magnet file in the watched folder(one per line). Closes #217. (sledgehammer999)
-    - BUGFIX: Fix resolution of peer host names. Closes #4307. (sledgehammer999)
-    - BUGFIX: Don't recheck twice after 'Force Recheck' with 'Recheck torrents on completion' enabled. Closes #4274. (sledgehammer999)
-    - BUGFIX: Don't apply some settings again if they weren't changed. Closes #4278. (sledgehammer999)
-    - BUGFIX: Update ISO 3166 country codes. Closes #3942. (Chocobo1)
-    - BUGFIX: Fix moving torrents to Temp after app restart. Closes #4434. (glassez)
-    - BUGFIX: Fix crash in favicon code due to null pointer dereference. (glassez)
-    - BUGFIX: Move the 'qBittorrent-resume' file even when no magnets were recovered. Also make sure to rename it with a unique name. Closes #4334. (sledgehammer999)
-    - BUGFIX: Don't add the watch folder before the user closes the Preferences window. (sledgehammer999)
-    - BUGFIX: Remove watch folders permanently only if the user accepts the Preferences dialog. (sledgehammer999)
-    - BUGFIX: Better handling of cookies in the download manager (glassez)
-    - BUGFIX: Use the download manager for RSS, the program updater and the dns updater. (glassez)
-    - BUGFIX: Fix reconfigure additional trackers (glassez)
-    - BUGFIX: Fix loading corrupted .fastresume file (glassez)
-    - WEBUI: Show filtered torrents number (buinsky)
-    - WEBUI: Fix paused, active and inactive filters (buinsky)
-    - WEBUI: Fixed bug when uploading several files and only the last one was considered. (naikel)
-    - WEBUI: Implemented WebUI interface for the new Watched Folders feature (naikel)
-    - WEBUI: Fix possible showing "qBittorrent client is not reachable" message on deleting torrents. (buinsky)
-    - WEBUI: Don't show "Limit download speed" menu item for downloaded torrents. (buinsky)
-    - WEBUI: Update webui run program parameters (buinsky)
-    - WEBUI: Allow to remove the label assigned to a torrent (pmzqla)
-    - WEBUI: Repair translation (buinsky)
-    - WEBUI: Remember last opened tab (buinsky)
-    - WEBUI: Bump WebUI API_VERSION and API_VERSION_MIN.
-    - COSMETIC: Update native names for Chinese locales. Closes #4381. (sledgehammer999)
-    - COSMETIC: Rename column header in Content view. (Chocobo1)
-    - COSMETIC: Edit speed limits and upload ratio icons (buinsky)
-    - SEARCH: Code refactoring. (glassez)
-    - SEARCH: Fix PirateBay plugin implementation for Python 3 (ngosang)
-    - SEARCH: Update PirateBay URL. Closes #4470 (ngosang)
-    - RSS: Code refactoring. (glassez)
-    - LINUX: Fix build. (sledgehammer999)
-    - OSX: Set qBittorrent as default torrent app in  Mac OS (dmitry.viktorov)
-    - OTHER: Fix lrelease version due to the default Qt5 build (Fabio Alessandro Locati)
-    - OTHER: Indicate to the user that he's going to download the new version. Indicate from the installer that the old version was detected and no settings will be deleted. Closes #4320. (sledgehammer999)
-    - OTHER: Don't require GUI libs for qt4 nox build. Closes #4404. (sledgehammer999)
-    - OTHER: Fix cross-compilation (bnagaev)
-    - OTHER: Allow GeoIP in nox builds (glassez)
+* 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)
 
-* Tue Dec 08 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.1
-    - FEATURE: New "Set as default label" option in Add torrent dialog. (takiz)
-    - FEATURE: Support wildcards for filtering torrent list and torrent content (vlakoff)
-    - BUGFIX: Fix -1 is displayed instead of the infinity symbol (Chocobo1)
-    - BUGFIX: Fix scan dirs settings saving. Closes #4254, #4239, #4187. (glassez)
-    - BUGFIX: Exported torrents now use name instead of hash. Closes #4205. (glassez)
-    - BUGFIX: Improve upgrade to v3.3.0. Now undownloaded magnets will be migrated too. Fixes #4195. (glassez)
-    - BUGFIX: Fix wrong encoding for listen failed error message. (glassez)
-    - BUGFIX: Fix RSS not automarking articles as read. (glassez)
-    - BUGFIX: Fix possible deadlock during application exit. (sledgehammer999)
-    - WEBUI: Cookies support on WebUI when downloading torrent from a URL. (Naikel Aparicio)
-    - WEBUI: Modified download and upload windows to allow autocompletion of browsers. (Naikel Aparicio)
-    - WEBUI: Fixed the spinner in the WebUI upload page. (Naikel Aparicio)
-    - WEBUI: Modified height of the WebUI download page. (Naikel Aparicio)
-    - WEBUI: Fixed all the JavaScript functions for download and upload pages. (Naikel Aparicio)
-    - WEBUI: Add seeds tab to WebUI (buinsky)
-    - WEBUI: Bump WebUI API_VERSION.
-    - COSMETIC: Cleanup "Trackers", "Peers", "HTTP Sources", "Speed" and "Content" page layout (Chocobo1)
-    - COSMETIC: Reduce mainwindow border width (Chocobo1)
-    - COSMETIC: Use QLineEdit built-in ClearButton (Qt5 only) (Chocobo1)
-    - COSMETIC: Change text description for half-open connection (Chocobo1)
-    - OTHER: Change update URL to FossHub. Closes #4188. (sledgehammer999)
+* 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.
 
-* Sun Nov 29 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.0
-    - FEATURE: Huge core code refactoring. Problems with labels, temp folders etc should be eliminated. Smoother UI should be observed too. (glassez)
-    - FEATURE: Speed graph (Anton Lashkov)
-    - FEATURE: Add multiple peers in Peers addition dialog. Closes #1563, #2245, #3133, #1419, #3287, #1419 (ngosang)
-    - FEATURE: Allow to copy all peers with a keyboard shortcut (ngosang)
-    - FEATURE: Use GeoIP2 database, allows for country resolution of IPv6 peers. It is no longer embedded in the program but downloaded and updated monthly. (glassez)
-    - FEATURE: Add more "Run External Program" parameters, closes #3053, #238, #1291, #1522. (Chocobo1, glassez)
-    - FEATURE: Add an option to allow the use of proxies only for torrents. Closes #2701. (pmzqla)
-    - FEATURE: Detect network interface state changes. It should detect VPN connection resets. (Pawel Polewicz)
-    - FEATURE: Switch to using c++11 (glassez)
-    - FEATURE: Automatically add trackers to new downloads. (ngosang)
-    - FEATURE: You can now choose the path to download for watched folders. (dsimakov, sledgehammer999)
-    - FEATURE: Switch to Qt5 by default.
-    - BUGFIX: Fix progress calculation in Content tab. Closes #2639 Closes #2752 (ngosang)
-    - BUGFIX: Fix label filter. Closes #3429. (glassez)
-    - BUGFIX: Fix "Run External Program Launches too Early" issue, closes #2107. (Chocobo1)
-    - BUGFIX: Don't remove torrent contents parent folder, even it is empty. Closes #2244. (Chocobo1)
-    - BUGFIX: Always apply filter for manually banned IPs. Related #3988. (sledgehammer999)
-    - BUGFIX: Fix reporting of tracker status. Closes #3101. (sledgehammer999)
-    - BUGFIX: Don't connect to "any interface" when the configured network interface is missing. Closes #3943, #2741, #1159, #844 and #143. (sledgehammer999)
-    - BUGFIX: Fix reordering of first column with Qt5. Closes #2835. (sledgehammer999)
-    - COSMETIC: Add back "qBittorrent" in program updater title, closes #3549. (Chocobo1)
-    - COSMETIC: Use infinity symbol rather than -1 for nb_connections (pmzqla)
-    - COSMETIC: Move uTP options to it's own section (Chocobo1)
-    - COSMETIC: Fix availability bar & progress bar height being too small on high DPI displays (Chocobo1)
-    - COSMETIC: Fix availability label & progress label clipped on high DPI displays, closes #3237. (Chocobo1)
-    - COSMETIC: Add tooltips/legend for availability bar & progress bar (Chocobo1)
-    - COSMETIC: Use theme color for background in PropertiesWidget (Chocobo1)
-    - COSMETIC: Replace horizontal line with border in bottom panel (Chocobo1)
-    - COSMETIC: Various visual changes in the side panel. (Chocobo1)
-    - COSMETIC: Use thin border for transfer list (Chocobo1)
-    - COSMETIC: Make URL in "Add Torrent File..." clickable. Closes #3928. (Chocobo1)
-    - COSMETIC: New view for errored torrents. (sledgehammer999)
-    - WEBUI: Add information in General tab (ngosang)
-    - WEBUI: Reorder "Super seeding mode" option in right click menu (ngosang)
-    - WEBUI: Clean up JavaScript code (ngosang)
-    - WEBUI: Added labels support. #648 (Felipe Barriga Richards, ngosnag)
-    - WEBUI: Fix accessing the WebUI through IPv6 (ngosang)
-    - WEBUI: Bump WebUI API_VERSION to 6.
-    - WEBUI: Change selected color to differentiate from the progressbar. (Daniel Peukert, ngosang)
-    - SEARCH: Add "Copy description page URL" button in search tab. Closes #2371. (pmzqla)
-    - SEARCH: Add https_proxy env variable. This forces Python to use the HTTP proxy for HTTPS connections. (pmzqla)
-    - SEARCH: Detect new plugin URL from clipboard (ngosang)
-    - SEARCH: Update Torrentz trackers (ngosang)
-    - WINDOWS: Fix german translation of the installer (netswap)
-    - NOX: Don't ask the user questions in nox build when in non-interactive mode. Closes #3875. (sledgehammer999)
-    - OTHER: Fixed typos, spelling correction (dartraiden)
-    - OTHER: Fix need for restart to enable/disable peer countries resolution. (glassez)
-    - OTHER: Unload the GeoIP db when disabled. (sledgehammer999)
-    - OTHER: Reduce max value of "Disk cache size" to 1536MB for 32bit. Closes to #4028. (Chocobo1)
-    - OTHER: Make "Download in sequential order" and "Download first and last piece first" options independent. (glassez)
-
-* Sun May 10 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.0
-    - FEATURE: Show actual protocol for listen success/failure in the log. Needs libtorrent v1.0.0 (Gelmir)
-    - FEATURE: Support per tracker re-announce. Needs libtorrent v1.0.0 (Gelmir)
-    - FEATURE: Support saving in network locations. (Gelmir)
-    - FEATURE: Support Qt5 (mostly Glassez)
-    - FEATURE: Code optimizations resulting in a more CPU efficient and snappier qBittorrent. (sorokin)
-    - FEATURE: WEBUI code rewritten, refactored and improved. (glassez, pmzqla, buinsky)
-    - FEATURE: Add option to hibernate computer in Auto-Shutdown menu (Bruno Barbieri)
-    - FEATURE: Cache preferences in memory. Minimize chance of settings corruption. Closes #1272, #1523, #1694. (sledgehammer999)
-    - FEATURE: Option to disable connections not supported by proxies. Closes #1894. (sledgehammer999)
-    - FEATURE: Haiku OS support (diger)
-    - FEATURE: Add a save resume data interval option(useful for SSD). (john-peterson)
-    - FEATURE: Add "Last Seen Complete" column (pmzqla)
-    - FEATURE: Add "Last Activity" column (pmzqla)
-    - FEATURE: Add "Total Size" column (pmzqla)
-    - FEATURE: Show current speed limits in the status bar (pmzqla)
-    - FEATURE: Episode filtering for RSS (Gelmir)
-    - FEATURE: Highlight files when opening containing folder on Windows and Linux(nautilus, dolphin, konqueror). (Gelmir, pmzqla)
-    - FEATURE: Setting to ignore RSS rule matches for X days (Gelmir)
-    - FEATURE: Add hotkeys and buttons for Top and Bottom priorities (alfrix)
-    - FEATURE: Implement peer relevance column. Closes #1630. (sledgehammer999)
-    - FEATURE: Show reason why a peer was blocked. Needs libtorrent 1.0.x. (sledgehammer999)
-    - FEATURE: Use the 'fastest_upload' setting as seed choking algorithm. (sledgehammer999)
-    - FEATURE: Allow to set text options for the toolbar icons (pmzqla)
-    - FEATURE: Add 'Resumed' torrent filter (john.s.peterson)
-    - FEATURE: 'Add New Torrent` dialog has a button for quickly choosing a location (sledgehammer999)
-    - FEATURE: Copy selected peers as IP:Port format. (ngosang)
-    - FEATURE: Show info hash in the torrent details in 'Add New Torrent' dialog. (sledgehammer999, chrishirst)
-    - FEATURE: New feature: Remove empty labels (ngosang)
-    - FEATURE: Add "Copy name" option in right-click menu of torrent list. Closes #2452 (chrishirst)
-    - FEATURE: Implement tracker list in the side panel. Closes #170. (sledgehammer999)
-    - FEATURE: Implement a 'Completed' status. Closes #2326 #2483 #939. (sledgehammer999)
-    - FEATURE: Columns for session-based download and upload statistics (LazyBui)
-    - BUGFIX: Use completed time from libtorrent directly. Closes #1726.
-    - BUGFIX: Speedup and fix a bug in torrent moving. (sorokin)
-    - BUGFIX: Scan Folder dialog now remembers last location (Bryan Roscoe)
-    - BUGFIX: Show input box to filter torrent list only when the list is shown (pmzqla)
-    - BUGFIX: Add placeholder text to the input to filter the torrent list (pmzqla)
-    - BUGFIX: Put directories first when sorting torrent content by name (pmzqla)
-    - BUGFIX: Fix missing icon for open action in file list (Gelmir)
-    - BUGFIX: Set placeholder text to torrent content filter. (sorokin)
-    - BUGFIX: Fix torrent creation when data is too large (sorokin)
-    - BUGFIX: Load torrents that have big metadata file. Closes #1889. (sledgehammer999)
-    - BUGFIX: Use correct separator for "OR" condition in RSS rules (pmzqla)
-    - BUGFIX: Don't waste UI space in 'Content' window. Closes #2159 (alfrix)
-    - BUGFIX: Fix the language selection in the combobox when the system locale only has a lang equivalent and not a lang_COUNTRY one. Closes #1786. (sledgehammer999)
-    - BUGFIX: Don't overwrite the 'Add Paused' setting from the Add New Torrent Dialog (Gelmir)
-    - BUGFIX: Fix file preview when .!qB extension is used (pmzqla)
-    - BUGFIX: Ensure that the priority column has enough width when queueing is enabled. Closes #2263. (sledgehammer999)
-    - BUGFIX: Don't put limits to the alternative speed limits (pmzqla)
-    - BUGFIX: Make space key change all selected files' checkboxes (sorokin)
-    - BUGFIX: Don't block peers that use privileged ports. (sledgehammer999)
-    - BUGFIX: Accept multiple files at once. Closes #2253 (buinsky)
-    - BUGFIX: Don't touch torrents whose files are missing. Closes #342 #2308 #2469. (sledgehammer999)
-    - BUGFIX: Save the new save path first in the history. Closes #2382. (sledgehammer999)
-    - BUGFIX: Fix default tracker in 'Create Torrent' dialog. (ngosang)
-    - BUGFIX: Let the OS decide the default interface regardless of IPv4/IPv6. Closes #2156. (Chocobo1)
-    - BUGFIX: Delete the correct selected torrents when the list is filtered. Closes #2729. (sledgehammer999)
-    - BUGFIX: Don't use HTML in tray icon pop-up on OSX. Closes #2830. (pmzqla)
-    - BUGFIX: Fix crash when trying to open destination folder on a torrent with no metadata. Closes #2522. (pmzqla)
-    - BUGFIX: Change torrent name when metadata is retrieved. (ngosang)
-    - COSMETIC: Removes white bar in the labels list. Closes #1151. (ngosang)
-    - COSMETIC: Fix speed printing in the tray icon and in the title bar. Closes #2737. (sledgehammer999)
-    - COSMETIC: Change the color scheme used (sledgehammer999)
-    - RSS: Display remote images in the preview (Mladen Milinkovic)
-    - RSS: Format html descriptions in the preview (Mladen Milinkovic)
-    - RSS: Support overriding global "Add paused" option on per rule basis (Gelmir)
-    - WINDOWS: Fix automatic python download. Closes #2076. (sledgehammer999)
-    - WINDOWS: Fix crash when searching the registry for installed python (glassez)
-    - WINDOWS: Tell Windows to wait during shutdown. (sledgehammer999, paolo-sz)
-    - OSX: Use the configure script to prepare the build in Mac OSX too. Closes #2295. (sledgehammer999)
-    - OSX: Fix the build (David Christenson)
-    - LINUX: Distribute systemd service file for the nox build (sledgehammer999, leigh123linux)
-    - LINUX: Create qBittorrent.appdata.xml (alxpl)
-    - SEARCH: Update KickassTorrents plugin (pmzqla)
-    - SEARCH: Remove vertor engine. Closes #2260. (DoumanAsh)
-    - SEARCH: Small fix of import in legittorrents engine (DoumanAsh)
-    - SEARCH: Add combo box for fast search engine switch (DoumanAsh)
-    - SEARCH: Fix error in mininova search engine (ngosang)
-    - SEARCH: Fix piratebay. Closes #2270 (DoumanAsh)
-    - SEARCH: Updated URL in kickasstorrents search engine (ngosang)
-    - SEARCH: Torrentz search engine added (ngosang)
-    - OTHER: Drop libtorrent 0.15.x support
-    - OTHER: Drop Qt < 4.8.0 support
-    - OTHER: Migrate build system to autotools (sledgehammer999)
-    - OTHER: Remove deprecated feature of separate DHT port. (sledgehammer999)
-    - OTHER: Speedup compilation speed (sorokin)
-    - OTHER: Backtrace generation now works on MinGW. (Gelmir)
-    - OTHER: New translation: Hindi(India).
+* 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)

INSTALL

@@ -14,11 +14,15 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 1.0.6)
+    - 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.35.x (libboost-system)
+    - libboost 1.34.x (libboost-filesystem°) + libasio
+      or
+    - 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
@@ -40,7 +44,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= v1.0.6)
+    - 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

@@ -1,12 +1,10 @@
-qBittorrent - A BitTorrent client in Qt
+qBittorrent - A BitTorrent client in Qt4
 ------------------------------------------
 
-[![Build Status](https://travis-ci.org/qbittorrent/qBittorrent.svg?branch=master)](https://travis-ci.org/qbittorrent/qBittorrent)
-[![Coverity Status](https://scan.coverity.com/projects/5494/badge.svg)](https://scan.coverity.com/projects/5494)
+Description:
 ********************************
-### Description:
-qBittorrent is a bittorrent client programmed in C++ / Qt that uses
-libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
+qBittorrent is a bittorrent client programmed in C++ / Qt4 that uses
+libtorrent (sometimes called rblibtorrent) by Arvid Norberg.
 
 It aims to be a good alternative to all other bittorrent clients
 out there. qBittorrent is fast, stable and provides unicode
@@ -15,14 +13,13 @@ support as well as many features.
 This product includes GeoLite data created by MaxMind, available from
 http://maxmind.com/
 
-### Installation:
+Installation:
+********************************
 For installation, follow the instructions from INSTALL file, but simple:
 
-```
 ./configure
 make && make install
 qbittorrent
-```
 
 will install and execute qBittorrent hopefully without any problem.
 
@@ -32,14 +29,12 @@ http://www.qbittorrent.org
 or our wiki here:
 http://wiki.qbittorrent.org
 
-Use the forum for troubleshooting before reporting bugs:
-http://forum.qbittorrent.org
-
 Please report any bug (or feature request) to:
 http://bugs.qbittorrent.org
 
-You can also meet me (sledgehammer_999) on IRC:
-`#qbittorrent on irc.freenode.net`
+You can also meet me (chris-qBT) on IRC:
+#qbittorrent on irc.freenode.net
 
 ------------------------------------------
-sledgehammer999 <sledgehammer999@qbittorrent.org>
+Christophe Dumez <chris@qbittorrent.org>
+

README.os2

@@ -26,7 +26,7 @@ How to build
 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 begin #####
+##### conf.pri content beginn #####
 BINDIR = ./bin
 INCDIR = ./include
 LIBDIR = ./lib

bootstrap.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-aclocal -I m4
-autoconf

build-aux/compile

@@ -1,347 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2012-10-14.11; # UTC
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

build-aux/install-sh

@@ -1,501 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2013-12-25.23; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-tab='	'
-nl='
-'
-IFS=" $tab$nl"
-
-# Set DOITPROG to "echo" to test this script.
-
-doit=${DOITPROG-}
-doit_exec=${doit:-exec}
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-is_target_a_directory=possibly
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-        case $mode in
-          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
-            echo "$0: invalid mode: $mode" >&2
-            exit 1;;
-        esac
-        shift;;
-
-    -o) chowncmd="$chownprog $2"
-        shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t)
-        is_target_a_directory=always
-        dst_arg=$2
-        # Protect names problematic for 'test' and other utilities.
-        case $dst_arg in
-          -* | [=\(\)!]) dst_arg=./$dst_arg;;
-        esac
-        shift;;
-
-    -T) is_target_a_directory=never;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --) shift
-        break;;
-
-    -*) echo "$0: invalid option: $1" >&2
-        exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-# We allow the use of options -d and -T together, by making -d
-# take the precedence; this is for compatibility with GNU install.
-
-if test -n "$dir_arg"; then
-  if test -n "$dst_arg"; then
-    echo "$0: target directory not allowed when installing a directory." >&2
-    exit 1
-  fi
-fi
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-    # Protect names problematic for 'test' and other utilities.
-    case $dst_arg in
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
-    esac
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call 'install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  if test $# -gt 1 || test "$is_target_a_directory" = always; then
-    if test ! -d "$dst_arg"; then
-      echo "$0: $dst_arg: Is not a directory." >&2
-      exit 1
-    fi
-  fi
-fi
-
-if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-        u_plus_rw=
-      else
-        u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-        u_plus_rw=
-      else
-        u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names problematic for 'test' and other utilities.
-  case $src in
-    -* | [=\(\)!]) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-    dst=$dst_arg
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test "$is_target_a_directory" = never; then
-        echo "$0: $dst_arg: Is a directory" >&2
-        exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      dstdir=`dirname "$dst"`
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-        # Create intermediate dirs using mode 755 as modified by the umask.
-        # This is like FreeBSD 'install' as of 1997-10-28.
-        umask=`umask`
-        case $stripcmd.$umask in
-          # Optimize common cases.
-          *[2367][2367]) mkdir_umask=$umask;;
-          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-          *[0-7])
-            mkdir_umask=`expr $umask + 22 \
-              - $umask % 100 % 40 + $umask % 20 \
-              - $umask % 10 % 4 + $umask % 2
-            `;;
-          *) mkdir_umask=$umask,go-w;;
-        esac
-
-        # With -d, create the new directory with the user-specified mode.
-        # Otherwise, rely on $mkdir_umask.
-        if test -n "$dir_arg"; then
-          mkdir_mode=-m$mode
-        else
-          mkdir_mode=
-        fi
-
-        posix_mkdir=false
-        case $umask in
-          *[123567][0-7][0-7])
-            # POSIX mkdir -p sets u+wx bits regardless of umask, which
-            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-            ;;
-          *)
-            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-            if (umask $mkdir_umask &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-            then
-              if test -z "$dir_arg" || {
-                   # Check for POSIX incompatibilities with -m.
-                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                   # other-writable bit of parent directory when it shouldn't.
-                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-                   case $ls_ld_tmpdir in
-                     d????-?r-*) different_mode=700;;
-                     d????-?--*) different_mode=755;;
-                     *) false;;
-                   esac &&
-                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                   }
-                 }
-              then posix_mkdir=:
-              fi
-              rmdir "$tmpdir/d" "$tmpdir"
-            else
-              # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-            fi
-            trap '' 0;;
-        esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-        umask $mkdir_umask &&
-        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-        /*) prefix='/';;
-        [-=\(\)!]*) prefix='./';;
-        *)  prefix='';;
-      esac
-
-      oIFS=$IFS
-      IFS=/
-      set -f
-      set fnord $dstdir
-      shift
-      set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-        test X"$d" = X && continue
-
-        prefix=$prefix$d
-        if test -d "$prefix"; then
-          prefixes=
-        else
-          if $posix_mkdir; then
-            (umask=$mkdir_umask &&
-             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-            # Don't fail if two instances are running concurrently.
-            test -d "$prefix" || exit 1
-          else
-            case $prefix in
-              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-              *) qprefix=$prefix;;
-            esac
-            prefixes="$prefixes '$qprefix'"
-          fi
-        fi
-        prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-        # Don't fail if two instances are running concurrently.
-        (umask $mkdir_umask &&
-         eval "\$doit_exec \$mkdirprog $prefixes") ||
-          test -d "$dstdir" || exit 1
-        obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
-       set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       set +f &&
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-        # Now remove or move aside any old file at destination location.
-        # We try this two ways since rm can't unlink itself on some
-        # systems and the destination file might be busy for other
-        # reasons.  In this case, the final cleanup might fail but the new
-        # file should still install successfully.
-        {
-          test ! -f "$dst" ||
-          $doit $rmcmd -f "$dst" 2>/dev/null ||
-          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-          } ||
-          { echo "$0: cannot unlink or rename $dst" >&2
-            (exit 1); exit 1
-          }
-        } &&
-
-        # Now rename the file to the real destination.
-        $doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

build-aux/missing

@@ -1,215 +0,0 @@
-#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
-
-scriptversion=2013-10-28.13; # UTC
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
-  exit 1
-fi
-
-case $1 in
-
-  --is-lightweight)
-    # Used by our autoconf macros to check whether the available missing
-    # script is modern enough.
-    exit 0
-    ;;
-
-  --run)
-    # Back-compat with the calling convention used by older automake.
-    shift
-    ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
-  bison     yacc      flex         lex       help2man
-
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: unknown '$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Run the given program, remember its exit status.
-"$@"; st=$?
-
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
-
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch.  This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
-  msg="probably too old"
-elif test $st -eq 127; then
-  # Program was missing.
-  msg="missing on your system"
-else
-  # Program was found and executed, but failed.  Give up.
-  exit $st
-fi
-
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
-
-program_details ()
-{
-  case $1 in
-    aclocal|automake)
-      echo "The '$1' program is part of the GNU Automake package:"
-      echo "<$gnu_software_URL/automake>"
-      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/autoconf>"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-    autoconf|autom4te|autoheader)
-      echo "The '$1' program is part of the GNU Autoconf package:"
-      echo "<$gnu_software_URL/autoconf/>"
-      echo "It also requires GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-  esac
-}
-
-give_advice ()
-{
-  # Normalize program name to check for.
-  normalized_program=`echo "$1" | sed '
-    s/^gnu-//; t
-    s/^gnu//; t
-    s/^g//; t'`
-
-  printf '%s\n' "'$1' is $msg."
-
-  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-  case $normalized_program in
-    autoconf*)
-      echo "You should only need it if you modified 'configure.ac',"
-      echo "or m4 files included by it."
-      program_details 'autoconf'
-      ;;
-    autoheader*)
-      echo "You should only need it if you modified 'acconfig.h' or"
-      echo "$configure_deps."
-      program_details 'autoheader'
-      ;;
-    automake*)
-      echo "You should only need it if you modified 'Makefile.am' or"
-      echo "$configure_deps."
-      program_details 'automake'
-      ;;
-    aclocal*)
-      echo "You should only need it if you modified 'acinclude.m4' or"
-      echo "$configure_deps."
-      program_details 'aclocal'
-      ;;
-   autom4te*)
-      echo "You might have modified some maintainer files that require"
-      echo "the 'autom4te' program to be rebuilt."
-      program_details 'autom4te'
-      ;;
-    bison*|yacc*)
-      echo "You should only need it if you modified a '.y' file."
-      echo "You may want to install the GNU Bison package:"
-      echo "<$gnu_software_URL/bison/>"
-      ;;
-    lex*|flex*)
-      echo "You should only need it if you modified a '.l' file."
-      echo "You may want to install the Fast Lexical Analyzer package:"
-      echo "<$flex_URL>"
-      ;;
-    help2man*)
-      echo "You should only need it if you modified a dependency" \
-           "of a man page."
-      echo "You may want to install the GNU Help2man package:"
-      echo "<$gnu_software_URL/help2man/>"
-    ;;
-    makeinfo*)
-      echo "You should only need it if you modified a '.texi' file, or"
-      echo "any other file indirectly affecting the aspect of the manual."
-      echo "You might want to install the Texinfo package:"
-      echo "<$gnu_software_URL/texinfo/>"
-      echo "The spurious makeinfo call might also be the consequence of"
-      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-      echo "want to install GNU make:"
-      echo "<$gnu_software_URL/make/>"
-      ;;
-    *)
-      echo "You might have modified some files without having the proper"
-      echo "tools for further handling them.  Check the 'README' file, it"
-      echo "often tells you about the needed prerequisites for installing"
-      echo "this package.  You may also peek at any GNU archive site, in"
-      echo "case some other package contains this missing '$1' program."
-      ;;
-  esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
-                       -e '2,$s/^/         /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

codingStyleQtCreator.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorCodeStyle>
-<!-- Written by QtCreator 3.2.82, 2014-11-26T02:08:28. -->
-<qtcreator>
- <data>
-  <variable>CodeStyleData</variable>
-  <valuemap type="QVariantMap">
-   <value type="bool" key="AlignAssignments">true</value>
-   <value type="bool" key="AutoSpacesForTabs">false</value>
-   <value type="bool" key="BindStarToIdentifier">false</value>
-   <value type="bool" key="BindStarToLeftSpecifier">true</value>
-   <value type="bool" key="BindStarToRightSpecifier">false</value>
-   <value type="bool" key="BindStarToTypeName">true</value>
-   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">false</value>
-   <value type="bool" key="IndentAccessSpecifiers">false</value>
-   <value type="bool" key="IndentBlockBody">true</value>
-   <value type="bool" key="IndentBlockBraces">false</value>
-   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
-   <value type="bool" key="IndentClassBraces">false</value>
-   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
-   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
-   <value type="bool" key="IndentEnumBraces">false</value>
-   <value type="bool" key="IndentFunctionBody">true</value>
-   <value type="bool" key="IndentFunctionBraces">false</value>
-   <value type="bool" key="IndentNamespaceBody">true</value>
-   <value type="bool" key="IndentNamespaceBraces">false</value>
-   <value type="int" key="IndentSize">4</value>
-   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
-   <value type="bool" key="IndentSwitchLabels">false</value>
-   <value type="int" key="PaddingMode">1</value>
-   <value type="bool" key="SpacesForTabs">true</value>
-   <value type="int" key="TabSize">4</value>
-  </valuemap>
- </data>
- <data>
-  <variable>DisplayName</variable>
-  <value type="QString">qBittorrent</value>
- </data>
-</qtcreator>

conf.pri.in

@@ -1,16 +0,0 @@
-# @configure_input@
-
-PREFIX = @EXPAND_PREFIX@
-BINDIR = @EXPAND_BINDIR@
-DATADIR = @EXPAND_DATADIR@
-MANPREFIX = @EXPAND_MANDIR@
-
-QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
-INCLUDEPATH += @QBT_CONF_INCLUDES@
-LIBS += @LDFLAGS@ @LIBS@
-
-CONFIG += @QBT_ADD_CONFIG@
-CONFIG -= @QBT_REMOVE_CONFIG@
-
-DEFINES += @QBT_ADD_DEFINES@
-DEFINES -= @QBT_REMOVE_DEFINES@

configure.ac

@@ -1,273 +0,0 @@
-AC_INIT([qbittorrent], [v3.2.0alpha], [bugs.qbittorrent.org], [], [http://www.qbittorrent.org/])
-AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_SED
-AC_LANG(C++)
-AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE
-
-
-
-# Define --wth-* and --enable-* arguments
-
-AC_ARG_WITH(qt4,
-            [AS_HELP_STRING([--with-qt4],
-                            [Compile using Qt4 (default=no)])],
-            [],
-            [with_qt4=no])
-
-AC_ARG_WITH(qtsingleapplication,
-            [AS_HELP_STRING([--with-qtsingleapplication=@<:@system|shipped@:>@],
-                            [Use the shipped qtsingleapplication library or the system one (default=shipped)])],
-            [],
-            [with_qtsingleapplication=shipped])
-
-AC_ARG_WITH(qjson,
-            [AS_HELP_STRING([--with-qjson=@<:@system|shipped@:>@],
-                            [Use the shipped qjson library or the system one (default=shipped) (Qt4 only)])],
-            [],
-            [with_qjson=shipped])
-
-AC_ARG_ENABLE(debug,
-              [AS_HELP_STRING([--enable-debug],
-                              [Enable debug build])],
-              [],
-              [enable_debug=no])
-
-AC_ARG_ENABLE(gui,
-              [AS_HELP_STRING([--disable-gui],
-                              [Disable the GUI for headless running. Disables QtDBus and the GeoIP Database.])],
-              [],
-              [enable_gui=yes])
-
-AC_ARG_ENABLE(systemd,
-              [AS_HELP_STRING([--enable-systemd],
-                              [Install the systemd service file (headless only).])],
-              [],
-              [enable_systemd=no])
-
-AC_ARG_ENABLE(webui,
-              [AS_HELP_STRING([--disable-webui],
-                              [Disable the WebUI.])],
-              [],
-              [enable_webui=yes])
-
-AC_ARG_ENABLE(qt-dbus,
-              [AS_HELP_STRING([--disable-qt-dbus],
-                              [Disable use of QtDBus (GUI only)])],
-              [],
-              [enable_qt_dbus=yes])
-
-# Detect OS
-AC_MSG_CHECKING([whether OS is FreeBSD])
-AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null],
-      [AC_MSG_RESULT([yes])
-      LIBS="-lexecinfo $LIBS"],
-      [AC_MSG_RESULT([no])])
-
-# Require 0.23 pkg-config
-PKG_PROG_PKG_CONFIG([0.23])
-AS_IF([test "x$PKG_CONFIG" = "x"],
-      [AC_MSG_ERROR([Could not find pkg-config])])
-
-# Check which arguments were set and act accordingly
-AC_MSG_CHECKING([whether to enable the Debug build])
-AS_CASE(["x$enable_debug"],
-        ["xno"],
-              [AC_MSG_RESULT([no])
-              QBT_ADD_CONFIG="$QBT_ADD_CONFIG release"
-              QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG debug"],
-        ["xyes"],
-               [AC_MSG_RESULT([yes])
-               QBT_ADD_CONFIG="$QBT_ADD_CONFIG debug"
-               QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG release"],
-        [AC_MSG_RESULT([$enable_debug])
-        AC_MSG_ERROR([Unknown option "$enable_debug". Use either "yes" or "no".])])
-
-AC_MSG_CHECKING([whether to enable the GUI])
-AS_CASE(["x$enable_gui"],
-        ["xyes"],
-               [AC_MSG_RESULT([yes])
-               enable_systemd=[no]
-               QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG nogui"],
-        ["xno"],
-              [AC_MSG_RESULT([no])
-              enable_qt_dbus=[no]
-              QBT_ADD_CONFIG="$QBT_ADD_CONFIG nogui"],
-        [AC_MSG_RESULT([$enable_gui])
-        AC_MSG_ERROR([Unknown option "$enable_gui". Use either "yes" or "no".])])
-
-AC_MSG_CHECKING([whether to install the systemd service file])
-AS_CASE(["x$enable_systemd"],
-        ["xyes"],
-               [AC_MSG_RESULT([yes])
-               QBT_ADD_CONFIG="$QBT_ADD_CONFIG systemd"],
-        ["xno"],
-              [AC_MSG_RESULT([no])
-              QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG systemd"],
-        [AC_MSG_RESULT([$enable_systemd])
-        AC_MSG_ERROR([Unknown option "$enable_systemd". Use either "yes" or "no".])])
-
-AC_MSG_CHECKING([whether to enable the WebUI])
-AS_CASE(["x$enable_webui"],
-        ["xyes"],
-               [AC_MSG_RESULT([yes])
-               QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG nowebui"],
-        ["xno"],
-              [AC_MSG_RESULT([no])
-              QBT_ADD_CONFIG="$QBT_ADD_CONFIG nowebui"],
-        [AC_MSG_RESULT([$enable_webui])
-        AC_MSG_ERROR([Unknown option "$enable_webui". Use either "yes" or "no".])])
-
-AC_MSG_CHECKING([whether Qt4 should be enabled])
-AS_CASE(["x$with_qt4"],
-        ["xno"],
-              [AC_MSG_RESULT([no])
-              FIND_QT5()],
-        ["xyes"],
-               [AC_MSG_RESULT([yes])
-               FIND_QT4()],
-        [AC_MSG_RESULT([$with_qt4])
-        AC_MSG_ERROR([Unknown option "$with_qt4". Use either "yes" or "no".])])
-AS_IF([test "x$QT_QMAKE" = "x"],
-      [AC_MSG_ERROR([Could not find qmake])
-      ])
-
-AC_MSG_CHECKING([whether QtDBus should be enabled])
-AS_CASE(["x$enable_qt_dbus"],
-        ["xyes"],
-               [AC_MSG_RESULT([yes])
-               FIND_QTDBUS()
-               AS_IF([test "x$HAVE_QTDBUS" = "xfalse"],
-                     [AC_MSG_ERROR([Could not find QtDBus])],
-                     [QBT_ADD_CONFIG="$QBT_ADD_CONFIG dbus"]
-                    )],
-        ["xno"],
-              [AC_MSG_RESULT([no])
-              QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG dbus"],
-        [AC_MSG_RESULT([$enable_qt_dbus])
-        AC_MSG_ERROR([Unknown option "$enable_qt_dbus". Use either "yes" or "no".])])
-
-
-AX_BOOST_BASE([1.35])
-# HAVE_BOOST is set to an empty value when Boost is found. I don't know
-# how to test for a set vs unset variable.
-AS_IF([test "x$BOOST_CPPFLAGS" = "x"],
-      [AC_MSG_ERROR([Could not find Boost])],
-      [AC_MSG_NOTICE([Boost CPPFLGAS: $BOOST_CPPFLAGS])
-      CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
-      LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])
-
-AX_BOOST_SYSTEM()
-# HAVE_BOOST_SYSTEM is set to an empty value when Boost.System is found.
-# I don't know how to test for a set vs unset variable.
-AS_IF([test "x$BOOST_SYSTEM_LIB" = "x"],
-      [AC_MSG_ERROR([Could not find Boost.System])],
-      [AC_MSG_NOTICE([Boost.System LIB: $BOOST_SYSTEM_LIB])
-      LIBS="$BOOST_SYSTEM_LIB $LIBS"])
-
-AC_MSG_CHECKING([which qtsingleapplication to use])
-AS_CASE(["x$with_qtsingleapplication"],
-        ["xshipped"],
-                   [AC_MSG_RESULT([shipped])
-                   QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG usesystemqtsingleapplication"],
-        ["xsystem"],
-                  [AC_MSG_RESULT([system])
-                  QBT_ADD_CONFIG="$QBT_ADD_CONFIG usesystemqtsingleapplication"],
-        [AC_MSG_RESULT([$with_qtsingleapplication])
-        AC_MSG_ERROR([Unknown option "$with_qtsingleapplication". Use either "system" or "shipped".])])
-
-AS_IF([test "x$with_qt4" = "xyes"],
-      [AC_MSG_CHECKING([which qjson to use])
-      AS_CASE(["x$with_qjson"],
-              ["xshipped"],
-                         [AC_MSG_RESULT([shipped])
-                         QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG usesystemqjson"],
-              ["xsystem"],
-                         [AC_MSG_RESULT([system])
-                         PKG_CHECK_MODULES(qjson,
-                                          [QJson >= 0.8.1],
-                                          [CPPFLAGS="$qjson_CFLAGS $CPPFLAGS"
-                                          LIBS="$qjson_LIBS $LIBS"])
-                         QBT_ADD_CONFIG="$QBT_ADD_CONFIG usesystemqjson"],
-              [AC_MSG_RESULT([$with_qjson])
-              AC_MSG_ERROR([Unknown option "$with_qjson". Use either "system" or "shipped".])])
-     ])
-
-PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 1.0.6],
-                  [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
-                  LIBS="$libtorrent_LIBS $LIBS"])
-
-PKG_CHECK_MODULES(zlib,
-                 [zlib],
-                 [CPPFLAGS="$zlib_CFLAGS $CPPFLAGS"
-                 LIBS="$zlib_LIBS $LIBS"])
-
-# These are required because autoconf doesn't expand these **particular**
-# vars automatically. And qmake cannot autoexpand them.
-AX_DEFINE_DIR([EXPAND_PREFIX], [prefix])
-AX_DEFINE_DIR([EXPAND_BINDIR], [bindir])
-AX_DEFINE_DIR([EXPAND_DATADIR], [datadir])
-AX_DEFINE_DIR([EXPAND_MANDIR], [mandir])
-
-# Original extract() function contributed by pmzqla
-# $*: Strings to parse
-# Set $QBT_CONF_DEFINES, $QBT_CONF_INCLUDES, $QBT_CONF_EXTRA_CFLAGS
-extract() {
-  if [[ -z "$*" ]]; then
-    echo "Input string required"
-    return 1
-  fi
-
-  # BSD sed needs an actual newline character in the substitute command
-  new_line='
-'
-  # Convert " -" to "\n" if not between quotes and remove possible leading white spaces
-  string=$(echo " $*" | $SED -e "s: -:\\${new_line}:g" -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[[:space:]]*//')
-  SAVEIFS=$IFS
-  IFS=$(printf "\n\b")
-  for i in $string; do
-    case "$(echo "$i" | cut -c1)" in
-      '') ;;
-      D) QBT_CONF_DEFINES="$(echo $i | cut -c2-) $QBT_CONF_DEFINES";;
-      I) QBT_CONF_INCLUDES="$(echo $i | cut -c2-) $QBT_CONF_INCLUDES";;
-      *) QBT_CONF_EXTRA_CFLAGS="-$i $QBT_CONF_EXTRA_CFLAGS";;
-    esac
-  done
-  IFS=$SAVEIFS
-}
-
-extract $CPPFLAGS
-QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
-QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS $CXXFLAGS"
-
-# Substitute the values of these vars in conf.pri.in
-AC_SUBST(QBT_CONF_INCLUDES)
-AC_SUBST(QBT_CONF_EXTRA_CFLAGS)
-AC_SUBST(QBT_ADD_CONFIG)
-AC_SUBST(QBT_REMOVE_CONFIG)
-AC_SUBST(QBT_ADD_DEFINES)
-AC_SUBST(QBT_REMOVE_DEFINES)
-
-AC_OUTPUT(conf.pri)
-AS_IF([test "x$enable_systemd" = "xyes"],
-      [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox.service)])
-
-
-
-AC_MSG_NOTICE([Running qmake to generate the makefile...])
-CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
-
-$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro
-
-ret="$?"
-
-AS_ECHO()
-AS_IF([test "x$ret" = "x0"],
-      [AC_MSG_NOTICE([Good, your configure finished.])],
-      [AC_MSG_ERROR([Failed running $QT_QMAKE to generate the makefile])])
-AS_ECHO()
-

dist/unix/qBittorrent.appdata.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 sledgehammer999 <sledgehammer999@qbittorrent.org> -->
-<component type="desktop">
- <id>qBittorrent.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-2.0 and OpenSSL</project_license>
- <name>qBittorrent</name>
- <summary>A Bittorrent Client</summary>
- <description>
-  <p>
-   Aiming to be a good alternative to all other bittorrent clients out
-   there, qBittorrent is fast, stable and provides unicode support as well
-   as many other features. Additionally, qBittorrent runs and provides those
-   same features on all major platforms (Linux, Mac OS X, Windows, OS/2, FreeBSD).
-  </p>
-  <p>
-   It is programmed in C++ / Qt and uses libtorrent (sometimes called
-   libtorrent-rasterbar) by Arvid Norberg. GeoLite data, created by MaxMind,
-   are included in qBittorrent. Its features include:
-  </p>
-  <ul>
-   <li>Polished µTorrent-like User Interface</li>
-   <li>Well-integrated and extensible Search Engine</li>
-   <li>All Bittorrent extensions (DHT, Peer Exchange, Full encryption, Magnet/BitComet URIs, ...)</li>
-   <li>Remote control through a Web user interface</li>
-   <li>Advanced control over trackers, peers and torrents</li>
-   <li>UPnP / NAT-PMP port forwarding support</li>
-   <li>Available in ~25 languages (Unicode support)</li>
-   <li>Torrent creation tool</li>
-   <li>Advanced RSS support with download filters (inc. regex)</li>
-   <li>Bandwidth scheduler</li>
-   <li>IP Filtering (eMule and PeerGuardian compatible)</li>
-   <li>IPv6 compliant</li>
-   <li>Sequential downloading (aka "Download in order")</li>
-  </ul>
- </description>
- <screenshots>
-  <screenshot type="default">
-   <image width="1200" height="675">
-    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_01.png
-   </image>
-  </screenshot>
-  <screenshot>
-   <image width="1200" height="675">
-    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_02.png
-   </image>
-  </screenshot>
-  <screenshot>
-   <image width="1200" height="675">
-    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_03.png
-   </image>
-  </screenshot>
-  <screenshot>
-   <image width="1200" height="675">
-    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_04.png
-   </image>
-  </screenshot>
- </screenshots>
- <url type="homepage">http://www.qbittorrent.org/</url>
- <update_contact>sledgehammer999@qbittorrent.org</update_contact>
-</component>

dist/unix/systemd/qbittorrent-nox.service.in

@@ -1,11 +0,0 @@
-[Unit]
-Description=qBittorrent Daemon Service
-After=network.target
-
-[Service]
-Type=forking
-User=1000
-ExecStart=@EXPAND_BINDIR@/qbittorrent-nox -d
-
-[Install]
-WantedBy=multi-user.target

dist/windows/UAC.nsh

@@ -1,297 +0,0 @@
-/*** UAC Plug-in ***
-
-Interactive User (MediumIL)        Admin user (HighIL)
-***[Setup.exe]*************      ***[Setup.exe]**************
-*                         *      *                          *
-* +++[.OnInit]+++++++++++ *      * +++[.OnInit]++++++++++++ *
-* + UAC_RunElevated >---+-+----> * +                      + *
-* + NSIS.Quit           + *      * +                      + *
-* +++++++++++++++++++++++ *      * ++++++++++++++++++++++++ *
-*                         *      *                          *
-*                         *      *                          *
-* +++[Section]+++++++++++ *      * +++[Section]++++++++++++ *
-* +                     + *   /--+-+-<UAC_AsUser_ExecShell+ *
-* +++++++++++++++++++++++ *   |  * ++++++++++++++++++++++++ *
-*                         *   |  *                          *
-*  Win32.ShellExecute <---+--/   *                          *
-*                         *      *                          *
-***************************      ****************************
-
-*/
-
-!ifndef UAC_HDR__INC
-!verbose push
-!verbose 3
-!ifndef UAC_VERBOSE  
-	!define UAC_VERBOSE 3
-!endif
-!verbose ${UAC_VERBOSE}
-
-!define UAC_HDR__INC 0x00020400 ;MMmmbbrr
-
-!include LogicLib.nsh
-
-
-
-/* UAC_RunElevated
-**
-** Starts the elevation operation.
-**
-** Return values:
-**
-** $0: Win32 error code (0 on success, 1223 if user aborted elevation dialog, anything else should be treated as a fatal error)
-** $1: If $0==0:
-**     0 UAC is not supported by the OS
-**     1 Started a elevated child process, the current process should act like a wrapper (Call Quit without any further processing)
-**     2 The process is already running @ HighIL (Member of admin group)
-**     3 You should call RunElevated again (This can happen if a user without admin priv. is used in the runas dialog)
-** $2: If $0==0 && $1==1: ExitCode of the elevated fork process (The NSIS errlvl is also set)
-** $3: If $0==0: 1 if the user is a member of the admin group or 0 otherwise
-**/
-!macro UAC_RunElevated
-UAC::_ 0
-!macroend
-!macro UAC_PageElevation_RunElevated
-UAC::_ 0
-!macroend
-/*!macro UAC_OnInitElevation_RunElevated
-UAC::_ 0
-!macroend
-!macro UAC_OnInitElevation_OnGuiInit
-!macroend*/
-
-
-
-/* UAC_GetIntegrityLevel <NSISVar:Output | "s">
-**
-** Get integrity level of current process
-**
-**/
-!macro UAC_GetIntegrityLevel outvar
-UAC::_ 6
-!if "${outvar}" != "s"
-	Pop ${outvar}
-!endif
-!macroend
-
-
-
-/* UAC_IsAdmin
-**
-** Is the current process running with administrator privileges? Result in $0
-**
-** ${If} ${UAC_IsAdmin} ...
-**
-**/
-!macro UAC_IsAdmin
-UAC::_ 2
-!macroend
-!define UAC_IsAdmin `"" UAC_IsAdmin ""`
-!macro _UAC_IsAdmin _a _b _t _f
-!insertmacro _UAC_MakeLL_Cmp _!= 0 2s
-!macroend
-
-
-
-/* UAC_IsInnerInstance
-**
-** Does the current process have a NSIS/UAC parent process that is part of the elevation operation?
-**
-** ${If} ${UAC_IsInnerInstance} ...
-**
-**/
-!macro UAC_IsInnerInstance
-UAC::_ 3
-!macroend
-!define UAC_IsInnerInstance `"" UAC_IsInnerInstance ""`
-!macro _UAC_IsInnerInstance _a _b _t _f
-!insertmacro _UAC_MakeLL_Cmp _!= 0 3s
-!macroend
-
-
-
-/* UAC_PageElevation_OnInit, UAC_PageElevation_OnGuiInit,
-**
-** Helper macros for elevation on a custom elevation page, see the DualMode example for more information.
-**
-**/
-!macro UAC_Notify_OnGuiInit
-UAC::_ 4
-!macroend
-!macro UAC_PageElevation_OnGuiInit
-!insertmacro UAC_Notify_OnGuiInit
-!macroend
-!macro UAC_PageElevation_OnInit
-UAC::_ 5
-${IfThen} ${Errors} ${|} Quit ${|}
-!macroend
-
-
-
-/* UAC_AsUser_Call <Function|Label> <NSISAddressName> <UAC_* flags>
-**
-** Calls a function or label in the user process instance.
-** All the UAC_AsUser_* macros use this helper macro.
-**
-**/
-!define UAC_SYNCREGISTERS 0x1
-;define UAC_SYNCSTACK     0x2
-!define UAC_SYNCOUTDIR    0x4
-!define UAC_SYNCINSTDIR   0x8
-;define UAC_CLEARERRFLAG  0x10
-!macro UAC_AsUser_Call type name flags
-push $0
-Get${type}Address $0 ${name}
-!verbose push
-!verbose ${UAC_VERBOSE}
-!insertmacro _UAC_ParseDefineFlagsToInt _UAC_AsUser_Call__flags ${flags}
-!verbose pop
-StrCpy $0 "1$0:${_UAC_AsUser_Call__flags}"
-!undef _UAC_AsUser_Call__flags
-Exch $0
-UAC::_
-!macroend
-
-
-
-/*
-** UAC_AsUser_GetSection <Flags|InstTypes|Size|Text> <SectionIndex> <NSISVar:Output>
-*/
-!macro UAC_AsUser_GetSection secprop secidx outvar
-!insertmacro _UAC_AsUser_GenOp ${outvar} SectionGet${secprop} ${secidx} ""
-!macroend
-
-
-
-/*
-** UAC_AsUser_GetGlobalVar <NSISVar:SourceAndOutput>
-** UAC_AsUser_GetGlobal <NSISVar:Output> <NSISVar:Source>
-*/
-!macro UAC_AsUser_GetGlobalVar var
-!insertmacro _UAC_AsUser_GenOp ${var} StrCpy "" ${var}
-!macroend
-!macro UAC_AsUser_GetGlobal outvar srcvar
-!insertmacro _UAC_AsUser_GenOp ${outvar} StrCpy "" ${srcvar}
-!macroend
-
-
-
-/*
-** UAC_AsUser_ExecShell <Verb> <ApplicationOrFile> <Parameters> <Working Directory> <SW_*>
-**
-** Call ExecShell in the user process instance.
-**
-*/
-!macro UAC_AsUser_ExecShell verb command params workdir show
-!insertmacro _UAC_IncL
-goto _UAC_L_E_${__UAC_L}
-_UAC_L_F_${__UAC_L}:
-ExecShell "${verb}" "${command}" '${params}' ${show}
-return
-_UAC_L_E_${__UAC_L}:
-!if "${workdir}" != ""
-	push $outdir
-	SetOutPath "${workdir}"
-!endif
-!insertmacro UAC_AsUser_Call Label _UAC_L_F_${__UAC_L} ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR}|${UAC_SYNCINSTDIR} #|${UAC_CLEARERRFLAG}
-!if "${workdir}" != ""
-	pop $outdir 
-	SetOutPath $outdir
-!endif
-!macroend
-
-
-
-!macro _UAC_MakeLL_Cmp cmpop cmp pluginparams
-!insertmacro _LOGICLIB_TEMP
-UAC::_ ${pluginparams}
-pop $_LOGICLIB_TEMP
-!insertmacro ${cmpop} $_LOGICLIB_TEMP ${cmp} `${_t}` `${_f}`
-!macroend
-!macro _UAC_definemath def val1 op val2
-!define /math _UAC_definemath "${val1}" ${op} ${val2}
-!ifdef ${def}
-	!undef ${def}
-!endif
-!define ${def} "${_UAC_definemath}"
-!undef _UAC_definemath
-!macroend
-!macro _UAC_ParseDefineFlags_orin parse outflags
-!searchparse /noerrors ${${parse}} "" _UAC_ParseDefineFlags_orin_f1 "|" _UAC_ParseDefineFlags_orin_f2
-!define _UAC_ParseDefineFlags_orin_this ${_UAC_ParseDefineFlags_orin_f1}
-!undef ${parse}
-!define ${parse} ${_UAC_ParseDefineFlags_orin_f2}
-!define _UAC_ParseDefineFlags_orin_saveout ${${outflags}}
-!undef ${outflags}
-!define /math ${outflags} "${_UAC_ParseDefineFlags_orin_saveout}" | "${_UAC_ParseDefineFlags_orin_this}"
-!undef _UAC_ParseDefineFlags_orin_saveout
-!undef _UAC_ParseDefineFlags_orin_this
-!ifdef _UAC_ParseDefineFlags_orin_f1
-	!undef _UAC_ParseDefineFlags_orin_f1
-	!undef _UAC_ParseDefineFlags_orin_f2
-!endif
-!macroend
-!macro _UAC_ParseDefineFlags_Begin _outdef _in
-!define _UAC_PDF${_outdef}_parse "${_in}"
-!define _UAC_PDF${_outdef}_flags ""
-!define _UAC_PDF${_outdef}_r 0
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x1
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x2
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x4
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x8
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x10
-!macroend
-!macro _UAC_ParseDefineFlags_End _outdef
-!define ${_outdef} ${_UAC_PDF${_outdef}_r}
-!undef _UAC_PDF${_outdef}_r
-!undef _UAC_PDF${_outdef}_flags
-!undef _UAC_PDF${_outdef}_parse
-!macroend
-!macro _UAC_ParseDefineFlags_IncludeFlag _outdef flag
-!if ${_UAC_PDF${_outdef}_flags} & ${flag}
-	!insertmacro _UAC_definemath _UAC_PDF${_outdef}_r ${_UAC_PDF${_outdef}_r} | ${flag}
-!endif
-!macroend
-!macro _UAC_ParseDefineFlagsToInt _outdef _in
-!insertmacro _UAC_ParseDefineFlags_Begin _UAC_ParseDefineFlagsToInt_tmp "${_in}"
-!define ${_outdef} ${_UAC_PDF_UAC_ParseDefineFlagsToInt_tmp_flags}
-!insertmacro _UAC_ParseDefineFlags_End _UAC_ParseDefineFlagsToInt_tmp
-!undef _UAC_ParseDefineFlagsToInt_tmp
-!macroend
-!macro _UAC_IncL
-!insertmacro _UAC_definemath __UAC_L "${__UAC_L}" + 1
-!macroend
-!macro _UAC_AsUser_GenOp outvar op opparam1 opparam2
-!define _UAC_AUGOGR_ID _UAC_AUGOGR_OP${outvar}${op}${opparam1}${opparam2}
-!ifndef ${_UAC_AUGOGR_ID} ;Has this exact action been done before? 
-	!if ${outvar} == $0
-		!define ${_UAC_AUGOGR_ID} $1
-	!else
-		!define ${_UAC_AUGOGR_ID} $0
-	!endif
-	!if "${opparam1}" == ""
-		!define _UAC_AUGOGR_OPP1 ${${_UAC_AUGOGR_ID}}
-		!define _UAC_AUGOGR_OPP2 ${opparam2}
-	!else
-		!define _UAC_AUGOGR_OPP1 ${opparam1}
-		!define _UAC_AUGOGR_OPP2 ${${_UAC_AUGOGR_ID}}
-	!endif	
-	goto ${_UAC_AUGOGR_ID}_C
-	${_UAC_AUGOGR_ID}_F:
-		${op} ${_UAC_AUGOGR_OPP1} ${_UAC_AUGOGR_OPP2}
-		return
-	${_UAC_AUGOGR_ID}_C:
-	!undef _UAC_AUGOGR_OPP1
-	!undef _UAC_AUGOGR_OPP2
-!endif
-push ${${_UAC_AUGOGR_ID}}
-!insertmacro UAC_AsUser_Call Label ${_UAC_AUGOGR_ID}_F ${UAC_SYNCREGISTERS}
-StrCpy ${outvar} ${${_UAC_AUGOGR_ID}}
-pop ${${_UAC_AUGOGR_ID}}
-!undef _UAC_AUGOGR_ID
-!macroend
-
-
-
-!verbose pop
-!endif /* UAC_HDR__INC */

dist/windows/installer-translations/french.nsi

@@ -1,51 +0,0 @@
-;Installer strings
-
-;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
-LangString inst_qbt_req ${LANG_FRENCH} "qBittorrent (requis)"
-;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_dekstop ${LANG_FRENCH} "Créer Raccourci Bureau"
-;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_FRENCH} "Créer Raccourci dans le Menu Démarrer"
-;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
-LangString inst_torrent ${LANG_FRENCH} "Ouvrir fichiers .torrent avec qBittorrent"
-;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
-LangString inst_magnet ${LANG_FRENCH} "Ouvrir liens magnet avec qBittorrent"
-;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_FRENCH} "Ajouter règle Pare-Feu Windows"
-;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_FRENCH} "Ajout règle Pare-Feu Windows"
-;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_FRENCH} "qBittorrent est en cours d'exécution. Veuillez fermer l'application avant l'installation."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_FRENCH} "Une installation précédente a été détectée. Elle sera désinstallée sans supprimer les réglages utilisateur."
-;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_FRENCH} "Désinstallation de la version précédente."
-;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_FRENCH} "Lancer qBittorrent."
-
-
-;------------------------------------
-;Uninstaller strings
-
-;LangString remove_files ${LANG_ENGLISH} "Remove files"
-LangString remove_files ${LANG_FRENCH} "Supprimer fichiers"
-;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
-LangString remove_shortcuts ${LANG_FRENCH} "Supprimer raccourcis"
-;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_FRENCH} "Supprimer associations de fichiers"
-;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_FRENCH} "Supprimer clés de registre"
-;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
-LangString remove_conf ${LANG_FRENCH} "Supprimer fichiers de configuration"
-;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_FRENCH} "Supprimer règle Pare-Feu Windows"
-;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_FRENCH} "Suppression règle Pare-Feu Windows"
-;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_FRENCH} "Supprimer torrents et données cachées"
-;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_FRENCH} "qBittorrent est en cours d'exécution. Veuillez fermer l'application avant la désinstallation."
-;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_FRENCH} "Ne peut pas supprimer l'association du .torrent. Elle est associée avec :"
-;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_FRENCH} "Ne peut pas supprimer l'association du magnet. Elle est associée avec :"

dist/windows/installer-translations/german.nsi

@@ -1,51 +0,0 @@
-;Installer strings
-
-;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
-LangString inst_qbt_req ${LANG_GERMAN} "qBittorrent (erforderlich)"
-;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_dekstop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen"
-;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_GERMAN} "Eintrag im Startmenü erstellen"
-;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
-LangString inst_torrent ${LANG_GERMAN} "Öffne .torrent-Dateien mit qBittorrent"
-;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
-LangString inst_magnet ${LANG_GERMAN} "Öffne Magnet-Links mit qBittorrent"
-;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_GERMAN} "Regel in der Windows Firewall hinzufügen"
-;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_GERMAN} "Füge Regel in der Windows Firewall hinzu"
-;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_GERMAN} "qBittorrent läuft gerade. Bitte das Programm vor der Installation beenden."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_GERMAN} "Eine ältere Installation wurde festgestellt. Diese wird deinstalliert ohne die Benutzereinstellungen zu löschen."
-;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_GERMAN} "Vorherige Version wird deinstalliert."
-;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_GERMAN} "Starte qBittorrent."
-
-
-;------------------------------------
-;Uninstaller strings
-
-;LangString remove_files ${LANG_ENGLISH} "Remove files"
-LangString remove_files ${LANG_GERMAN} "Dateien entfernen"
-;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
-LangString remove_shortcuts ${LANG_GERMAN} "Verknüpfungen entfernen"
-;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_GERMAN} "Datei-Verknüpfungen entfernen"
-;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_GERMAN} "Registry-Einträge entfernen"
-;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
-LangString remove_conf ${LANG_GERMAN} "Einstellungsdateien entfernen"
-;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_GERMAN} "Regel in der Windows Firewall entfernen"
-;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_GERMAN} "Entferne Regel aus der Windows Firewall"
-;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_GERMAN} "Torrents und zwischengespeicherte Daten entfernen"
-;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_GERMAN} "qBittorrent läuft gerade. Bitte das Programm vor der Deinstallation beenden."
-;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_GERMAN} "Dateiverknüpfung mit .torrent-Dateien konnte nicht entfernt werden, da dieser Typ mit diesem Programm verknüpft ist:"
-;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_GERMAN} "Dateiverknüpfung mit Magnet-Links konnte nicht entfernt werden, da dieser Typ mit diesem Programm verknüpft ist:"

dist/windows/installer-translations/tradchinese.nsi

@@ -1,51 +0,0 @@
-;Installer strings
-
-;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
-LangString inst_qbt_req ${LANG_TRADCHINESE} "qBittorrent (必要)"
-;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_dekstop ${LANG_TRADCHINESE} "建立桌面捷徑"
-;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_TRADCHINESE} "建立開始功能表捷徑"
-;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
-LangString inst_torrent ${LANG_TRADCHINESE} "使用 qBittorrent 開啟 .torrent 檔案"
-;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
-LangString inst_magnet ${LANG_TRADCHINESE} "使用 qBittorrent 開啟 magnet 連結"
-;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_TRADCHINESE} "建立 Windows 防火牆規則"
-;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_TRADCHINESE} "正在建立 Windows 防火牆規則"
-;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_TRADCHINESE} "qBittorrent 正在執行中，請先關閉後再進行安裝。"
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_TRADCHINESE} "A previous installation was detected. It will be uninstalled without deleting user settings."
-;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_TRADCHINESE} "正在移除先前版本"
-;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_TRADCHINESE} "啟動 qBittorrent"
-
-
-;------------------------------------
-;Uninstaller strings
-
-;LangString remove_files ${LANG_ENGLISH} "Remove files"
-LangString remove_files ${LANG_TRADCHINESE} "移除程式"
-;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
-LangString remove_shortcuts ${LANG_TRADCHINESE} "移除捷徑"
-;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_TRADCHINESE} "移除檔案關聯"
-;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_TRADCHINESE} "移除登錄檔機碼"
-;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
-LangString remove_conf ${LANG_TRADCHINESE} "移除程式設定"
-;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_TRADCHINESE} "移除 Windows 防火牆規則"
-;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_TRADCHINESE} "正在移除 Windows 防火牆規則"
-;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_TRADCHINESE} "移除 torrent 檔案及快取"
-;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_TRADCHINESE} "qBittorrent 正在執行中，請先關閉後再進行移除。"
-;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_TRADCHINESE} "無法移除 .torrent 關聯，目前連結於:"
-;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_TRADCHINESE} "無法移除 magnet 關聯，目前連結於:"

dist/windows/installer.nsi

@@ -1,211 +0,0 @@
-Section "-hidden"
-
-    ;Search if qBittorrent is already installed.
-    FindFirst $0 $1 "$INSTDIR\uninst.exe"
-    FindClose $0
-    StrCmp $1 "" done
-
-    ;Run the uninstaller of the previous install.
-    DetailPrint $(inst_unist)
-    ExecWait '"$INSTDIR\uninst.exe" /S _?=$INSTDIR'
-    Delete "$INSTDIR\uninst.exe"
-
-    done:
-
-SectionEnd
-
-
-Section $(inst_qbt_req) ;"qBittorrent (required)"
-
-  SectionIn RO
-  
-  ; Set output path to the installation directory.
-  SetOutPath $INSTDIR
-  
-  ;Create 'translations' directory
-  CreateDirectory $INSTDIR\translations
-  
-  ; Put file there  
-  File "qbittorrent.exe"
-  File "qbittorrent.pdb"
-  File "qt.conf"
-  File /oname=translations\qt_ar.qm "translations\qt_ar.qm"
-  File /oname=translations\qt_ca.qm "translations\qt_ca.qm"
-  File /oname=translations\qt_cs.qm "translations\qt_cs.qm"
-  File /oname=translations\qt_da.qm "translations\qt_da.qm"
-  File /oname=translations\qt_de.qm "translations\qt_de.qm"
-  File /oname=translations\qt_en.qm "translations\qt_en.qm"
-  File /oname=translations\qt_es.qm "translations\qt_es.qm"
-  File /oname=translations\qt_fa.qm "translations\qt_fa.qm"
-  File /oname=translations\qt_fi.qm "translations\qt_fi.qm"
-  File /oname=translations\qt_fr.qm "translations\qt_fr.qm"
-  File /oname=translations\qt_gl.qm "translations\qt_gl.qm"
-  File /oname=translations\qt_he.qm "translations\qt_he.qm"
-  File /oname=translations\qt_hu.qm "translations\qt_hu.qm"
-  File /oname=translations\qt_it.qm "translations\qt_it.qm"
-  File /oname=translations\qt_ja.qm "translations\qt_ja.qm"
-  File /oname=translations\qt_ko.qm "translations\qt_ko.qm"
-  File /oname=translations\qt_lt.qm "translations\qt_lt.qm"
-  File /oname=translations\qt_pl.qm "translations\qt_pl.qm"
-  File /oname=translations\qt_pt.qm "translations\qt_pt.qm"
-  File /oname=translations\qt_ru.qm "translations\qt_ru.qm"
-  File /oname=translations\qt_sk.qm "translations\qt_sk.qm"
-  File /oname=translations\qt_sl.qm "translations\qt_sl.qm"
-  File /oname=translations\qt_sv.qm "translations\qt_sv.qm"
-  File /oname=translations\qt_uk.qm "translations\qt_uk.qm"
-  File /oname=translations\qt_zh_CN.qm "translations\qt_zh_CN.qm"
-  File /oname=translations\qt_zh_TW.qm "translations\qt_zh_TW.qm"
-  
-  ; Write the installation path into the registry  
-  WriteRegStr HKLM "Software\qBittorrent" "InstallLocation" "$INSTDIR"
-  
-  ; Write the uninstall keys for Windows
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "DisplayName" "qBittorrent ${PROG_VERSION}"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "UninstallString" '"$INSTDIR\uninst.exe"'
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "DisplayIcon" '"$INSTDIR\qbittorrent.exe",0'
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "Publisher" "The qBittorrent project"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "URLInfoAbout" "http://www.qbittorrent.org"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "DisplayVersion" "${PROG_VERSION}"
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "NoModify" 1
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "NoRepair" 1
-  WriteUninstaller "uninst.exe"  
-  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
-  IntFmt $0 "0x%08X" $0
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "EstimatedSize" "$0"
-  
-  ; qBittorrent ProgID
-  WriteRegStr HKLM "Software\Classes\qBittorrent" "" "qBittorrent Torrent File"
-  WriteRegStr HKLM "Software\Classes\qBittorrent" "FriendlyTypeName" "qBittorrent Torrent File"
-  WriteRegStr HKLM "Software\Classes\qBittorrent\shell" "" "open"
-  WriteRegStr HKLM "Software\Classes\qBittorrent\shell\open\command" "" '"$INSTDIR\qbittorrent.exe" "%1"'
-  WriteRegStr HKLM "Software\Classes\qBittorrent\DefaultIcon" "" '"$INSTDIR\qbittorrent.exe",1'
-  
-SectionEnd
-
-; Optional section (can be disabled by the user)
-Section /o $(inst_dekstop) ;"Create Desktop Shortcut"
-
-  CreateShortCut "$DESKTOP\qBittorrent.lnk" "$INSTDIR\qbittorrent.exe"
-  
-SectionEnd
-
-Section $(inst_startmenu) ;"Create Start Menu Shortcut"
-
-  CreateDirectory "$SMPROGRAMS\qBittorrent"  
-  CreateShortCut "$SMPROGRAMS\qBittorrent\qBittorrent.lnk" "$INSTDIR\qbittorrent.exe"
-  CreateShortCut "$SMPROGRAMS\qBittorrent\Uninstall.lnk" "$INSTDIR\uninst.exe"
-  
-SectionEnd
-
-Section $(inst_torrent) ;"Open .torrent files with qBittorrent"
-
-  ReadRegStr $0 HKLM "Software\Classes\.torrent" ""
-  
-  StrCmp $0 "qBittorrent" clear_errors 0
-  ;Check if empty string
-  StrCmp $0 "" clear_errors 0
-  ;Write old value to OpenWithProgIds
-  WriteRegStr HKLM "Software\Classes\.torrent\OpenWithProgIds" $0 ""
-  
-  clear_errors:
-  ClearErrors
-
-  WriteRegStr HKLM "Software\Classes\.torrent" "" "qBittorrent"
-  WriteRegStr HKLM "Software\Classes\.torrent" "Content Type" "application/x-bittorrent"
-  
-  !insertmacro UAC_AsUser_Call Function inst_torrent_user ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR}|${UAC_SYNCINSTDIR}
-  
-  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
-
-SectionEnd
-
-Function inst_torrent_user
-
-  ReadRegStr $0 HKCU "Software\Classes\.torrent" ""
-  
-  StrCmp $0 "qBittorrent" clear_errors 0
-  ;Check if empty string
-  StrCmp $0 "" clear_errors 0
-  ;Write old value to OpenWithProgIds
-  WriteRegStr HKCU "Software\Classes\.torrent\OpenWithProgIds" $0 ""
-  
-  clear_errors:
-  ClearErrors
-
-  WriteRegStr HKCU "Software\Classes\.torrent" "" "qBittorrent"
-  WriteRegStr HKCU "Software\Classes\.torrent" "Content Type" "application/x-bittorrent"
-
-FunctionEnd
-
-Section $(inst_magnet) ;"Open magnet links with qBittorrent"
-
-  WriteRegStr HKLM "Software\Classes\magnet" "" "URL:Magnet link"
-  WriteRegStr HKLM "Software\Classes\magnet" "Content Type" "application/x-magnet"
-  WriteRegStr HKLM "Software\Classes\magnet" "URL Protocol" ""
-  WriteRegStr HKLM "Software\Classes\magnet\DefaultIcon" "" '"$INSTDIR\qbittorrent.exe",1'
-  WriteRegStr HKLM "Software\Classes\magnet\shell" "" "open"
-  WriteRegStr HKLM "Software\Classes\magnet\shell\open\command" "" '"$INSTDIR\qbittorrent.exe" "%1"'
-  
-  !insertmacro UAC_AsUser_Call Function inst_magnet_user ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR}|${UAC_SYNCINSTDIR}
-
-  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
-
-SectionEnd
-
-Function inst_magnet_user
-
-  WriteRegStr HKCU "Software\Classes\magnet" "" "URL:Magnet link"
-  WriteRegStr HKCU "Software\Classes\magnet" "Content Type" "application/x-magnet"
-  WriteRegStr HKCU "Software\Classes\magnet" "URL Protocol" ""
-  WriteRegStr HKCU "Software\Classes\magnet\DefaultIcon" "" '"$INSTDIR\qbittorrent.exe",1'
-  WriteRegStr HKCU "Software\Classes\magnet\shell" "" "open"
-  WriteRegStr HKCU "Software\Classes\magnet\shell\open\command" "" '"$INSTDIR\qbittorrent.exe" "%1"'
-
-FunctionEnd
-
-Section $(inst_firewall)
-
-  DetailPrint $(inst_firewallinfo)
-  nsisFirewallW::AddAuthorizedApplication "$INSTDIR\qbittorrent.exe" "qBittorrent" 
-    
-SectionEnd
-
-;--------------------------------
-
-Function .onInit
-
-  !insertmacro Init "installer"
-  !insertmacro MUI_LANGDLL_DISPLAY
-
-  ;Search if qBittorrent is already installed.
-  FindFirst $0 $1 "$INSTDIR\uninst.exe"
-  FindClose $0
-  StrCmp $1 "" done
-
-  ;Inform the user
-  MessageBox MB_OKCANCEL|MB_ICONINFORMATION $(inst_uninstall_question) /SD IDOK IDOK done
-  Quit
-
-  done:
-
-FunctionEnd
-
-Function check_instance
-
-  check:
-  FindProcDLL::FindProc "qbittorrent.exe"
-  StrCmp $R0 "1" 0 notfound
-  MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(inst_warning) IDRETRY check IDCANCEL done
-
-  done:
-  Abort
-
-  notfound:
-
-FunctionEnd
-
-Function PageFinishRun
-
-  !insertmacro UAC_AsUser_ExecShell "" "$INSTDIR\qbittorrent.exe" "" "" ""
-
-FunctionEnd

doc/qbittorrent-nox.1

@@ -1,10 +1,10 @@
 .\" This manpage has been automatically generated by docbook2man
 .\" from a DocBook document.  This tool can be found at:
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>.
-.TH "QBITTORRENT\-NOX" "1" "January 16th 2010" "Command line Bittorrent client written in C++ / Qt" ""
+.TH "QBITTORRENT\-NOX" "1" "January 16th 2010" "Command line Bittorrent client written in C++ / Qt4" ""
 
 .SH "NAME"
-qBittorrent\-nox \- a command line Bittorrent client written in C++ / Qt
+qBittorrent\-nox \- a command line Bittorrent client written in C++ / Qt4
 
 .SH "SYNOPSIS"
 
@@ -17,12 +17,12 @@ qBittorrent\-nox \- a command line Bittorrent client written in C++ / Qt
 .PP
 .SH "DESCRIPTION"
 
-\fBqBittorrent-nox\fR is an advanced command-line Bittorrent client written in C++ / Qt
+\fBqBittorrent-nox\fR is an advanced command-line Bittorrent client written in C++ / Qt4,
 using the \fBlibtorrent-rasterbar\fR library by Arvid Norberg. qBittorrent\-nox aims
 to be a good alternative to other command line bittorrent clients and provides features similar to popular graphical clients.
 
-qBittorrent\-nox is fast, stable, light and it supports unicode.
-It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze compatible),
+qBittorrent\-nox is fast, stable, light and it supports unicode. 
+It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze compatible), 
 FAST extension (mainline) and PeX support (utorrent compatible).
 
 qBittorrent\-nox is meant to be controlled via its feature-rich Web UI which is accessible as a default on http://localhost:8080. The Web UI access is secured and the default account user name is "admin" with "adminadmin" as a password.

doc/qbittorrent.1

@@ -1,10 +1,10 @@
 .\" This manpage has been automatically generated by docbook2man
 .\" from a DocBook document.  This tool can be found at:
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>.
-.TH "QBITTORRENT" "1" "January 16th 2010" "Bittorrent client written in C++ / Qt" ""
+.TH "QBITTORRENT" "1" "January 16th 2010" "Bittorrent client written in C++ / Qt4" ""
 
 .SH "NAME"
-qBittorrent \- a Bittorrent client written in C++ / Qt
+qBittorrent \- a Bittorrent client written in C++ / Qt4
 
 .SH "SYNOPSIS"
 
@@ -17,10 +17,10 @@ qBittorrent \- a Bittorrent client written in C++ / Qt
 .PP
 .SH "DESCRIPTION"
 
-\fBqBittorrent\fR is an advanced Bittorrent client written in C++ / Qt,
+\fBqBittorrent\fR is an advanced Bittorrent client written in C++ / Qt4,
 using the \fBlibtorrent-rasterbar\fR library by Arvid Norberg. qBittorrent is similar to uTorrent. qBittorrent
 is fast, stable, light, it supports unicode and it provides a good integrated search engine.
-It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze compatible),
+It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze compatible), 
 FAST extension (mainline) and PeX support (utorrent compatible).
 
 .SH "OPTIONS"

install.os2

@@ -111,7 +111,7 @@ To install QBittorrent, do the following:
 =============
 
 Please create bugreports at http://svn.netlabs.org/qtapps
-Only bug reports with a reproducible bug are accepted. :-)
+Only bug reports with a reproducable bug are accepted. :-)
 
 
 5. CREDITS

m4/ax_boost_base.m4

@@ -1,285 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# DESCRIPTION
-#
-#   Test for the Boost C++ libraries of a particular version (or newer)
-#
-#   If no path to the installed boost library is given the macro searchs
-#   under /usr, /usr/local, /opt and /opt/local and evaluates the
-#   $BOOST_ROOT environment variable. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-#
-#   And sets:
-#
-#     HAVE_BOOST
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2009 Peter Adolphs
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 26
-
-AC_DEFUN([AX_BOOST_BASE],
-[
-AC_ARG_WITH([boost],
-  [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
-    [use Boost library from a standard location (ARG=yes),
-     from the specified location (ARG=<path>),
-     or disable it (ARG=no)
-     @<:@ARG=yes@:>@ ])],
-    [
-    if test "$withval" = "no"; then
-        want_boost="no"
-    elif test "$withval" = "yes"; then
-        want_boost="yes"
-        ac_boost_path=""
-    else
-        want_boost="yes"
-        ac_boost_path="$withval"
-    fi
-    ],
-    [want_boost="yes"])
-
-
-AC_ARG_WITH([boost-libdir],
-        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
-        [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
-        [
-        if test -d "$withval"
-        then
-                ac_boost_lib_path="$withval"
-        else
-                AC_MSG_ERROR(--with-boost-libdir expected directory name)
-        fi
-        ],
-        [ac_boost_lib_path=""]
-)
-
-if test "x$want_boost" = "xyes"; then
-    boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
-    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
-    boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
-    boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
-    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
-        boost_lib_version_req_sub_minor="0"
-        fi
-    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
-    AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
-    succeeded=no
-
-    dnl On 64-bit systems check for system libraries in both lib64 and lib.
-    dnl The former is specified by FHS, but e.g. Debian does not adhere to
-    dnl this (as it rises problems for generic multi-arch support).
-    dnl The last entry in the list is chosen by default when no libraries
-    dnl are found, e.g. when only header-only libraries are installed!
-    libsubdirs="lib"
-    ax_arch=`uname -m`
-    case $ax_arch in
-      x86_64)
-        libsubdirs="lib64 libx32 lib lib64"
-        ;;
-      ppc64|s390x|sparc64|aarch64|ppc64le)
-        libsubdirs="lib64 lib lib64 ppc64le"
-        ;;
-    esac
-
-    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
-    dnl them priority over the other paths since, if libs are found there, they
-    dnl are almost assuredly the ones desired.
-    AC_REQUIRE([AC_CANONICAL_HOST])
-    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
-
-    case ${host_cpu} in
-      i?86)
-        libsubdirs="lib/i386-${host_os} $libsubdirs"
-        ;;
-    esac
-
-    dnl first we check the system location for boost libraries
-    dnl this location ist chosen if boost libraries are installed with the --layout=system option
-    dnl or if you install boost with RPM
-    if test "$ac_boost_path" != ""; then
-        BOOST_CPPFLAGS="-I$ac_boost_path/include"
-        for ac_boost_path_tmp in $libsubdirs; do
-                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
-                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
-                        break
-                fi
-        done
-    elif test "$cross_compiling" != yes; then
-        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
-            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
-                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
-                break;
-            fi
-        done
-    fi
-
-    dnl overwrite ld flags if we have required special directory with
-    dnl --with-boost-libdir parameter
-    if test "$ac_boost_lib_path" != ""; then
-       BOOST_LDFLAGS="-L$ac_boost_lib_path"
-    fi
-
-    CPPFLAGS_SAVED="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-    export CPPFLAGS
-
-    LDFLAGS_SAVED="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-    export LDFLAGS
-
-    AC_REQUIRE([AC_PROG_CXX])
-    AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-    @%:@include <boost/version.hpp>
-    ]], [[
-    #if BOOST_VERSION >= $WANT_BOOST_VERSION
-    // Everything is okay
-    #else
-    #  error Boost version is too old
-    #endif
-    ]])],[
-        AC_MSG_RESULT(yes)
-    succeeded=yes
-    found_system=yes
-        ],[
-        ])
-    AC_LANG_POP([C++])
-
-
-
-    dnl if we found no boost with system layout we search for boost libraries
-    dnl built and installed without the --layout=system option or for a staged(not installed) version
-    if test "x$succeeded" != "xyes"; then
-        CPPFLAGS="$CPPFLAGS_SAVED"
-        LDFLAGS="$LDFLAGS_SAVED"
-        BOOST_CPPFLAGS=
-        BOOST_LDFLAGS=
-        _version=0
-        if test "$ac_boost_path" != ""; then
-            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                    V_CHECK=`expr $_version_tmp \> $_version`
-                    if test "$V_CHECK" = "1" ; then
-                        _version=$_version_tmp
-                    fi
-                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
-                done
-                dnl if nothing found search for layout used in Windows distributions
-                if test -z "$BOOST_CPPFLAGS"; then
-                    if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
-                        BOOST_CPPFLAGS="-I$ac_boost_path"
-                    fi
-                fi
-            fi
-        else
-            if test "$cross_compiling" != yes; then
-                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
-                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                            V_CHECK=`expr $_version_tmp \> $_version`
-                            if test "$V_CHECK" = "1" ; then
-                                _version=$_version_tmp
-                                best_path=$ac_boost_path
-                            fi
-                        done
-                    fi
-                done
-
-                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
-                if test "$ac_boost_lib_path" = ""; then
-                    for libsubdir in $libsubdirs ; do
-                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                    done
-                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
-                fi
-            fi
-
-            if test "x$BOOST_ROOT" != "x"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
-                    version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
-                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
-                        stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
-                    V_CHECK=`expr $stage_version_shorten \>\= $_version`
-                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
-                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
-                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
-                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
-                    fi
-                fi
-            fi
-        fi
-
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        export CPPFLAGS
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-        export LDFLAGS
-
-        AC_LANG_PUSH(C++)
-            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-        @%:@include <boost/version.hpp>
-        ]], [[
-        #if BOOST_VERSION >= $WANT_BOOST_VERSION
-        // Everything is okay
-        #else
-        #  error Boost version is too old
-        #endif
-        ]])],[
-            AC_MSG_RESULT(yes)
-        succeeded=yes
-        found_system=yes
-            ],[
-            ])
-        AC_LANG_POP([C++])
-    fi
-
-    if test "$succeeded" != "yes" ; then
-        if test "$_version" = "0" ; then
-            AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
-        else
-            AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
-        fi
-        # execute ACTION-IF-NOT-FOUND (if present):
-        ifelse([$3], , :, [$3])
-    else
-        AC_SUBST(BOOST_CPPFLAGS)
-        AC_SUBST(BOOST_LDFLAGS)
-        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
-        # execute ACTION-IF-FOUND (if present):
-        ifelse([$2], , :, [$2])
-    fi
-
-    CPPFLAGS="$CPPFLAGS_SAVED"
-    LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-])

m4/ax_boost_system.m4

@@ -1,120 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_boost_system.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_SYSTEM
-#
-# DESCRIPTION
-#
-#   Test for System library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_SYSTEM_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_SYSTEM
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#   Copyright (c) 2008 Daniel Casimiro <dan.casimiro@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 17
-
-AC_DEFUN([AX_BOOST_SYSTEM],
-[
-	AC_ARG_WITH([boost-system],
-	AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@],
-                   [use the System library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-system=boost_system-gcc-mt ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_system_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_system_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-        AC_REQUIRE([AC_CANONICAL_BUILD])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::System library is available,
-					   ax_cv_boost_system,
-        [AC_LANG_PUSH([C++])
-			 CXXFLAGS_SAVE=$CXXFLAGS
-
-			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
-                                   [[boost::system::system_category]])],
-                   ax_cv_boost_system=yes, ax_cv_boost_system=no)
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_system" = "xyes"; then
-			AC_SUBST(BOOST_CPPFLAGS)
-
-			AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-            if test "x$ax_boost_user_system_lib" = "x"; then
-                for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                 [link_system="no"])
-				done
-                if test "x$link_system" != "xyes"; then
-                for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                 [link_system="no"])
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                   [link_system="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_system" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])

m4/ax_define_dir.m4

@@ -1,49 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_define_dir.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
-#
-# DESCRIPTION
-#
-#   This macro sets VARNAME to the expansion of the DIR variable, taking
-#   care of fixing up ${prefix} and such.
-#
-#   VARNAME is then offered as both an output variable and a C preprocessor
-#   symbol.
-#
-#   Example:
-#
-#     AX_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz>
-#   Copyright (c) 2008 Andreas Schwab <schwab@suse.de>
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2008 Alexandre Oliva
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 6
-
-AU_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR])
-AC_DEFUN([AX_DEFINE_DIR], [
-  prefix_NONE=
-  exec_prefix_NONE=
-  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
-dnl refers to ${prefix}.  Thus we have to use `eval' twice.
-  eval ax_define_dir="\"[$]$2\""
-  eval ax_define_dir="\"$ax_define_dir\""
-  AC_SUBST($1, "$ax_define_dir")
-  AC_DEFINE_UNQUOTED($1, "$ax_define_dir", [$3])
-  test "$prefix_NONE" && prefix=NONE
-  test "$exec_prefix_NONE" && exec_prefix=NONE
-])

m4/pkg.m4

@@ -1,214 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
-
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR

m4/qbittorrent.m4

@@ -1,72 +0,0 @@
-# Checking for pkg-config. If found, check for QtCore and query pkg-config
-# for its exec-prefix variable.
-
-# FIND_QT4()
-# Sets the QT_QMAKE variable to the path of Qt4 qmake if found.
-# --------------------------------------
-AC_DEFUN([FIND_QT4],
-[PKG_CHECK_EXISTS([QtCore >= 4.8.0],
-                 [PKG_CHECK_VAR(QT_QMAKE,
-                                [QtCore >= 4.8.0],
-                                [moc_location],
-                                [QT_QMAKE=`AS_DIRNAME(["$QT_QMAKE"])`])
-                 ])
-
-AC_CHECK_FILE([$QT_QMAKE/qmake],
-              [QT_QMAKE="$QT_QMAKE/qmake"],
-              [AC_CHECK_FILE([$QT_QMAKE/qmake-qt4],
-                             [QT_QMAKE="$QT_QMAKE/qmake-qt4"],
-                             [QT_QMAKE=""])
-              ])
-
-AC_MSG_CHECKING([for Qt4 qmake >= 4.8.0])
-AS_IF([test "x$QT_QMAKE" != "x"],
-      [AC_MSG_RESULT([$QT_QMAKE])],
-      [AC_MSG_RESULT([not found])]
-      )
-])
-
-# FIND_QT5()
-# Sets the QT_QMAKE variable to the path of Qt5 qmake if found.
-# --------------------------------------
-AC_DEFUN([FIND_QT5],
-[PKG_CHECK_EXISTS([Qt5Core >= 5.2.0],
-                 [PKG_CHECK_VAR(QT_QMAKE,
-                                [Qt5Core >= 5.2.0],
-                                [host_bins])
-                 ])
-
-AC_CHECK_FILE([$QT_QMAKE/qmake],
-              [QT_QMAKE="$QT_QMAKE/qmake"],
-              [AC_CHECK_FILE([$QT_QMAKE/qmake-qt5],
-                             [QT_QMAKE="$QT_QMAKE/qmake-qt5"],
-                             [QT_QMAKE=""])
-              ])
-
-AC_MSG_CHECKING([for Qt5 qmake >= 5.2.0])
-AS_IF([test "x$QT_QMAKE" != "x"],
-      [AC_MSG_RESULT([$QT_QMAKE])],
-      [AC_MSG_RESULT([not found])]
-      )
-])
-
-# FIND_QTDBUS()
-# Sets the HAVE_QTDBUS variable to true or false.
-# --------------------------------------
-AC_DEFUN([FIND_QTDBUS],
-[AS_IF([test "x$with_qt4" = "xno"],
-       [AC_MSG_CHECKING([for Qt5DBus >= 5.2.0])
-       PKG_CHECK_EXISTS([Qt5DBus >= 5.2.0],
-                        [AC_MSG_RESULT([found])
-                         HAVE_QTDBUS=[true]],
-                        [AC_MSG_RESULT([not found])
-                         HAVE_QTDBUS=[false]])
-       ],
-       [AC_MSG_CHECKING([for QtDBus >= 4.8.0])
-       PKG_CHECK_EXISTS([QtDBus >= 4.8.0],
-                        [AC_MSG_RESULT([found])
-                         HAVE_QTDBUS=[true]],
-                        [AC_MSG_RESULT([not found])
-                         HAVE_QTDBUS=[false]])
-       ])
-])

macxconf.pri

@@ -1,60 +1,67 @@
-# Generated by the configure file
-# Ignore any WARNING about 'conf.pri' missing during configure. The file should be found during make.
-# If not there will be a WARNING again.
-# The first path is used when the source is being build by packagers (pbuilder/sbuild/etc)
-# The second path is used when you manually run the configure script in the root folder (eg when using qt creator)
-exists($$OUT_PWD/../conf.pri) {
-    include($$OUT_PWD/../conf.pri)
-} else {
-    include(conf.pri)
-}
+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
-
-# C++11 support
-lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11
-
-QT_LANG_PATH = ../dist/qt-translations
-DIST_PATH = ../dist/mac
+# Zlib
+LIBS += -lz
 
 document_icon.path = Contents/Resources
-document_icon.files = $$DIST_PATH/qBitTorrentDocument.icns
+document_icon.files = mac/qBitTorrentDocument.icns
 QMAKE_BUNDLE_DATA += document_icon
 
 qt_conf.path = Contents/Resources
-qt_conf.files = $$DIST_PATH/qt.conf
+qt_conf.files = mac/qt.conf
 QMAKE_BUNDLE_DATA += qt_conf
 
-qt_translations.path = Contents/translations
-qt_translations.files = \
-    $$QT_LANG_PATH/qt_ar.qm \
-    $$QT_LANG_PATH/qt_bg.qm \
-    $$QT_LANG_PATH/qt_ca.qm \
-    $$QT_LANG_PATH/qt_cs.qm \
-    $$QT_LANG_PATH/qt_da.qm \
-    $$QT_LANG_PATH/qt_de.qm \
-    $$QT_LANG_PATH/qt_es.qm \
-    $$QT_LANG_PATH/qt_fi.qm \
-    $$QT_LANG_PATH/qt_fr.qm \
-    $$QT_LANG_PATH/qt_gl.qm \
-    $$QT_LANG_PATH/qt_he.qm \
-    $$QT_LANG_PATH/qt_hu.qm \
-    $$QT_LANG_PATH/qt_it.qm \
-    $$QT_LANG_PATH/qt_ja.qm \
-    $$QT_LANG_PATH/qt_ko.qm \
-    $$QT_LANG_PATH/qt_lt.qm \
-    $$QT_LANG_PATH/qt_nl.qm \
-    $$QT_LANG_PATH/qt_pl.qm \
-    $$QT_LANG_PATH/qt_pt.qm \
-    $$QT_LANG_PATH/qt_pt_BR.qm \
-    $$QT_LANG_PATH/qt_ru.qm \
-    $$QT_LANG_PATH/qt_sk.qm \
-    $$QT_LANG_PATH/qt_sv.qm \
-    $$QT_LANG_PATH/qt_tr.qm \
-    $$QT_LANG_PATH/qt_uk.qm \
-    $$QT_LANG_PATH/qt_zh_CN.qm \
-    $$QT_LANG_PATH/qt_zh_TW.qm
+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 = $$DIST_PATH/qbittorrent_mac.icns
-QMAKE_INFO_PLIST = $$DIST_PATH/Info.plist
+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

@@ -1,19 +1,19 @@
-# C++11 support
-lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11
-
 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
+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.pro

@@ -5,15 +5,15 @@ SUBDIRS += src
 include(version.pri)
 include(qm_gen.pri)
 
-# Make target to create release tarball. Use 'make tarball'
-tarball.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ &&
-tarball.commands += git clone . ../$${PROJECT_NAME}-$${PROJECT_VERSION} &&
-tarball.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.git &&
-tarball.commands += rm -f ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.gitignore &&
-tarball.commands += cd .. &&
-tarball.commands += tar czf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar.gz $${PROJECT_NAME}-$${PROJECT_VERSION} &&
-tarball.commands += tar cf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar $${PROJECT_NAME}-$${PROJECT_VERSION} &&
-tarball.commands += xz -f $${PROJECT_NAME}-$${PROJECT_VERSION}.tar &&
-tarball.commands += rm -fR $${PROJECT_NAME}-$${PROJECT_VERSION}
+# 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 += tarball
+QMAKE_EXTRA_TARGETS += dist

qbittorrent.qc

@@ -0,0 +1,25 @@
+<qconf>
+ <name>qbittorrent</name>
+ <profile>qbittorrent.pro</profile>
+ <moddir>qcm</moddir>
+ <datadir/>
+  <dep type='qt4'>
+    <required/>
+  </dep>
+  <dep type='qt-dbus'>
+  </dep>
+  <dep type='pkg-config'>
+    <required/>
+  </dep>
+  <dep type='libtorrent-rasterbar'>
+    <required/>
+  </dep>
+  <dep type='libboost'>
+    <required/>
+  </dep>
+  <dep type='geoip-database'>
+  </dep>
+  <dep type='qtsingleapplication'>
+    <required/>
+  </dep>
+</qconf>

qcm/geoip-database.qcm

@@ -0,0 +1,37 @@
+/*
+-----BEGIN QCMOD-----
+name: geoip-database
+arg: with-geoip-database-embedded, Geoip Database will be embedded in qBittorrent executable (please follow instructions in src/geoip/README)
+-----END QCMOD-----
+*/
+// see  Conf::findPkgConfig
+class qc_geoip_database : public ConfObj
+{
+public:
+	qc_geoip_database(Conf *c) : ConfObj(c) {}
+	QString name() const { return "GeoIP Database (optional)"; }
+	QString shortname() const { return "GeoIP Database"; }
+        QString checkString() const {
+                if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                        return "";
+                return ConfObj::checkString();
+        }
+	bool exec() {
+	if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+		return false;
+	}
+#ifdef Q_WS_X11
+		if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {
+#endif
+			conf->addDefine("WITH_GEOIP_EMBEDDED");
+                        printf(" embedded and");
+			return true;
+#ifdef Q_WS_X11
+		}
+                if(QFile::exists("/usr/share/GeoIP/GeoIP.dat") || QFile::exists("/usr/local/share/GeoIP/GeoIP.dat") || QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
+			return true;
+                printf("\nWarning: GeoIP database was not found at /usr/share/GeoIP/GeoIP.dat or /var/lib/GeoIP/GeoIP.dat\nCountry resolution will be slow.");
+		return false;
+#endif
+	}
+};

qcm/libboost.qcm

@@ -0,0 +1,97 @@
+/*
+-----BEGIN QCMOD-----
+name: libboost
+arg: with-libboost-inc=[path], Path to libboost include files
+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) {}
+  QString name() const { return "libboost"; }
+  QString shortname() const { return "libboost"; }
+
+  QString findBoostLib(QString path, QString lib) const {
+    QString name;
+    QDir libDir(path);
+    QStringList filters;
+    filters << "libboost_"+lib+"*-mt*.so";
+    QStringList result = libDir.entryList(filters, QDir::Files);
+    if(!result.empty()) {
+      name = result.first().mid(3);
+      // Remove .so
+      name.chop(3);
+    } else {
+      // Fall back to non -mt boost lib
+      filters.clear();
+      filters << "libboost_"+lib+"*.so";
+      result = libDir.entryList(filters, QDir::Files);
+      if(!result.empty()) {
+        name = result.first().mid(3);
+        // Remove .so
+        name.chop(3);
+      }
+    }
+    return name;
+  }
+
+  bool exec(){
+    QStringList sl;
+    QString s = conf->getenv("QC_WITH_LIBBOOST_INC");
+    if (!s.isEmpty())
+      sl << s;
+    sl << "/usr/include";
+    sl << "/usr/local/include";
+    bool found = false;
+    foreach (s, sl) {
+      if (conf->checkHeader(s, "boost/format.hpp")
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
+          && conf->checkHeader(s, "boost/filesystem/path.hpp")
+#endif
+         ) {
+        found = true;
+        break;
+      }
+    }
+    if (!found)
+      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 LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
+    required_libs << "filesystem" ;
+#endif
+    //required_libs << "thread";
+    QStringList libDirs;
+    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) {
+      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;
+      }
+    }
+    return true;
+  }
+};

qcm/libmagick.qcm

@@ -0,0 +1,76 @@
+/*
+-----BEGIN QCMOD-----
+name: libmagick
+arg: with-libmagick-inc=[path], Path to libmagick++ include files
+arg: with-libmagick-lib=[path], Path to libmagick++ library files
+-----END QCMOD-----
+*/
+#include <QProcess>
+class qc_libmagick : public ConfObj
+{
+public:
+	qc_libmagick(Conf *c) : ConfObj(c) {}
+	QString name() const { return "ImageMagick library (libmagick++)"; }
+	QString shortname() const { return "libmagick++"; }
+	QString checkString() const {
+		if(!conf->getenv("QC_DISABLE_libmagick").isEmpty())
+			return "";
+		return ConfObj::checkString();
+	}
+	bool exec(){
+		if(!conf->getenv("QC_DISABLE_libmagick").isEmpty())
+			return false;
+		QString s;
+		s = conf->getenv("QC_WITH_LIBMAGICK_INC");
+		if(!s.isEmpty()) {
+			if(!conf->checkHeader(s, "Magick++.h")) {
+				return false;
+    			}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkHeader(s, "Magick++.h")){
+					found = true;
+					break;
+				}
+			}
+			if(!found)
+				return false;
+		}
+		conf->addIncludePath(s);
+
+		s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
+		if(!s.isEmpty()) {
+                        if(!conf->checkLibrary(s, "Magick++")) {
+				return false;
+			}
+		}else{
+			QStringList sl;
+			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
+			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkLibrary(s, "Magick++")) {
+					found = true;
+                                        break;
+				}
+			}
+			if(!found)
+                         	return false;
+		}
+		conf->addLib(QString("-L") + s);
+		QString out = "";
+		QStringList params;
+                params << "--libs";
+		qconf->doCommand("Magick++-config", params, &out);
+		out = out.replace("\n", "");
+		conf->addLib(result.data());
+		conf->addDefine("HAVE_MAGICK");
+		return true;
+	}
+};

qcm/libnotify.qcm

@@ -0,0 +1,60 @@
+/*
+-----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->addExtra("CONFIG += 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;
+			}
+			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

@@ -0,0 +1,24 @@
+/*
+-----BEGIN QCMOD-----
+name: libtorrent-rasterbar
+-----END QCMOD-----
+*/
+// see  Conf::findPkgConfig
+class qc_libtorrent_rasterbar : public ConfObj
+{
+public:
+	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
+	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; }
+	QString shortname() const { return "libtorrent-rasterbar"; }
+	bool exec(){
+		QStringList incs;
+		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]);
+		return true;
+	}
+};

qcm/pkg-config.qcm

@@ -0,0 +1,16 @@
+/*
+-----BEGIN QCMOD-----
+name: pkg-config
+-----END QCMOD-----
+*/
+#include <QProcess>
+class qc_pkg_config : public ConfObj
+{
+public:
+	qc_pkg_config(Conf *c) : ConfObj(c) {}
+	QString name() const { return "pkg-config executable"; }
+	QString shortname() const { return "pkg-config"; }
+	bool exec(){
+		return !conf->findProgram("pkg-config").isEmpty();
+	}
+};

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

@@ -0,0 +1,36 @@
+/*
+-----BEGIN QCMOD-----
+name: Qt >= 4.6
+arg: enable-debug, Enable debug mode
+arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
+-----END QCMOD-----
+*/
+class qc_qt4 : public ConfObj
+{
+public:
+	qc_qt4(Conf *c) : ConfObj(c) {}
+	QString name() const { return "Qt >= 4.6"; }
+	QString shortname() const { return "Qt 4.6"; }
+	bool exec()
+	{
+                // NOX mode
+		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+			conf->addExtra("CONFIG += nox");
+		}
+                // 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

@@ -5,12 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
     win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
     unix {
-      equals(QT_MAJOR_VERSION, 4) {
         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
-      } 
-      equals(QT_MAJOR_VERSION, 5) {
-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
-      }
     } else {
         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
     }