Bump to 3.1.10

Now qBittorrent create global ProgId during installation (using HKLM hive)
and allow to associate .torrent files with it (using HKCU).

Conflicts:
	src/preferences/preferences.h
	src/windows/installer.nsi
	src/windows/uninstaller.nsi

.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,17 +1,13 @@
-language: cpp
+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_0_16 gui=true
-    - lt_branch=RC_0_16 gui=false
-    - lt_branch=RC_1_0  gui=true
-    - lt_branch=RC_1_0  gui=false
-  global:
-    - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
-    - coverity_branch: coverity_scan
+  # 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:
@@ -23,74 +19,35 @@ notifications:
     on_success: change
     on_failure: change 
 
-# container-based builds
-sudo: false
-cache:
-  directories:
-    - $HOME/.ccache
-
-addons:
-  coverity_scan:
-    project:
-      name: "qbittorrent/qBittorrent"
-      description: "Build submitted via Travis CI"
-    build_command_prepend: "./bootstrap.sh && ./configure $qbtconf"
-    build_command: make
-    branch_pattern: $coverity_branch
-    notification_email: sledgehammer999@qbittorrent.org
-  apt:
-    packages:
-    # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
-    - autoconf
-    - automake
-    - colormake
-    - libssl-dev
-    - libboost-dev
-    - libboost-system-dev
-    - libgeoip-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
-    #- libboost-filesystem-dev
-
 before_install:
-  # Only allow specific build for coverity scan, others will stop
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [[ "$lt_branch" == "RC_1_0" && "$gui" == "true" ]]; then exit ; fi
-
   - shopt -s expand_aliases
-  - if ! [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; 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" --with-libgeoip=system"
-  - qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":$PKG_CONFIG_PATH"
-
-  # Options for specific branches
-  - if [[ "$lt_branch" == "RC_0_16" ]]; then qbtconf="$qbtconf --with-libtorrent-rasterbar0.16" ; fi
   # Also setup a virtual display for after_success target when gui == true
-  - if ! $gui; then qbtconf="$qbtconf --disable-gui" ; else export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi
+  - 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
-  - ccache -V && ccache --show-stats && ccache --zero-stats
+
+  - sudo apt-get -qq update
+  # Travis can stall during heavy load if these packages are installed in one step - split the command
+  - sudo apt-get -qq install debhelper qconf colormake libssl-dev libgeoip-dev
+  - sudo apt-get -qq install libboost-dev libboost-filesystem-dev libboost-system-dev
+  - sudo apt-get -qq install libqt4-dev 
 
 install:
-  - if ! [ "$lt_branch" == "dist" ]; then cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch --single-branch ; fi
-  - if ! [ "$lt_branch" == "dist" ]; then cd libtorrent && ./autotool.sh && ./configure $ltconf && make install && cd "$TRAVIS_BUILD_DIR" ; 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 svn://svn.code.sf.net/p/libtorrent/code/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
-  - make install
+  - qt-qconf
+  - ./configure $qbtconf && sudo make install
   
 after_success:
-  - cd "$qbt_path/bin"
-  - export LD_PRELOAD="$libt_path/lib/libtorrent-rasterbar.so:$LD_PRELOAD"
-  - if $gui ; then ./qbittorrent --version ; else ./qbittorrent-nox --version ; fi
-
-after_script:
-  - ccache --show-stats
+  - 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_2_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,12 +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>
-
 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,177 +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:** I will now take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style.
-
-### 1. Curly braces ###
-#### a. Function blocks, class/struct definitions, namespaces ####
-```c++
-int myFunction(int a)
-{
-    //code
-}
-
-myClass::myClass(int *parent)
-    : m_parent(parent)
-{
-    //initialiaze
-}
-
-int myClass::myMethod(int a)
-{
-    //code
-}
-
-class myOtherClass
-{
-public:
-    //code
-protected:
-    //code
-private:
-    //code
-};
-
-namespace id
-{
-    //code
-}
-```
-
-#### 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
-}
-```
-
-### 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 speficic files need other encodings/line endings.
-
-### 5. Initialization lists.###
-Initialization lists should be vertical. This will allow for more easily readable diffs. The inilization 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)
-    : priv_a(a)
-    , priv_b(b)
-    , priv_c(c)
-    , priv_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. 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.

Changelog

@@ -1,252 +1,177 @@
-* Sat Oct 31 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.5
-    - BUGFIX: Fix difficult to reproduce crash. (glassez)
-    - OTHER: Fix Windows' Qt5 build. (Gelmir)
+* Sun Sep 21 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.10
+    - FEATURE: Allow disabling of OS cache. This will prevent RAM increases on Windows when seeding many files. Closes #1699. (sledgehammer999)
+    - FEATURE: Add 'Completed' column. Closes #1241. (sledgehammer999)
+    - FEATURE: Added 'Ratio Limit' column. Closes #936. (sledgehammer999)
+    - FEATURE: Add 'Open' and 'Open Containing Folder' entries in the content's right-click menu. Closes #1143. (sledgehammer999)
+    - FEATURE: Don't listen on IPv6 address by default. Prevents network connectivity problems. Closes #1880. (sledgehammer999)
+    - FEATURE: Added 'Shutdown now' button in shutdown confirmation dialog. Closes #969. (sledgehammer999)
+    - FEATURE: Add peer port column to PeerListWidget. Closes #1650. (Ivanov Juriy)
+    - COSMETIC: Fix weird ratio values when torrent was imported or downloaded history was lost due to crash. (sledgehammer999)
+    - COSMETIC: Use 'μTP' instead of 'uTP'. (sledgehammer999)
+    - COSMETIC: Show the loaded torrents in the transferlist when qBT is launched with a torrent/magnet and the AddNewTorrentDialog is showing. Closes #1564. (sledgehammer999)
+    - COSMETIC: Don't mix finished/unifinished torrents when sorting by ETA. Closes #1688. (sledgehammer999)
+    - COSMETIC: Sort finished torrents by completed date when sorting by queue number. (sledgehammer999)
+    - COSMETIC: Right align numerical values in the transfer list. Partially revert 51a9a9aab. Closes #1903. (sledgehammer999)
+    - COSMETIC: Don't display the Search Engine tab by default. (sledgehammer999)
+    - WINDOWS: Correctly associate torrents and magnet links with qBittorrent under non-admin accounts. Closes #291 #527 #579 #614 #964. (glassez, sledgehammer999)
+    - WINDOWS: Check for python before creating the search engine tab. Prevents the creation of python specific files in the user's PC if no python is found. Closes #1370. (sledgehammer999)
+    - WINDOWS: Don't create keys in the registry if python isn't found. Closes #1370. (sledgehammer999)
+    - WINDOWS: Can now correctly detect 64bit and 32bit python installations on 64bit Windows. Closes #1148 #445 #795 #1708. (sledgehammer999)
+    - WINDOWS: Search first in PATH for python. Closes #956. (sledgehammer999)
+    - OSX: Enable system tray in MACOSX (Nick Korotysh).
+    - OSX: Fix headless (nox) build. (sledgehammer999)
+    - WEBUI: Correctly save/load settings and other improvements (glassez)
+    - WEBUI: Removed broken 'Report a bug' iframe. Closes #1343 (Benjamin Hutchins)
+    - WEBUI: Removed broken 'Documentation'. Improves fix for #1343 (Benjamin Hutchins)
+    - WEBUI: Removed essentially useless 'Visit website' iframe and changed it to a regular link. Improves fix for #1343 (Benjamin Hutchins)
+    - BUGFIX: Fix RSS feed icon. The tmp file gets deleted in the feed destructor. Closes #1639 (sledgehammer999)
+    - BUGFIX: fix issue #1674: AddNewTorrentDialog is shown again and again even if checkbox "dont ask me again" is set (Ivan Sorokin)
+    - BUGFIX: Don't show availability bar for magnet links (Ivan Sorokin)
+    - BUGFIX: Fix crash when the selected torrent disappears from the transfer list. Closes #1661 (sledgehammer999)
+    - BUGFIX: Fix tracker announcing problem(hit-and-run) when many torrents are being active. Closes #1571 (sledgehammer999)
+    - BUGFIX: Count magnet links in the 'downloading' filter and make them prevent system inhibition. Closes #1558 (sledgehammer999)
+    - BUGFIX: Pick up updated plugins. Closes #1745. (sledgehammer999)
+    - BUGFIX: Bring mainwindow in front when notification is clicked and other windows are in front. (sledgehammer999)
+    - BUGFIX: Speedup torrent moving (Ivan Sorokin)
+    - BUGFIX: Fix bug when moving a torrent before the previous move is completed (Ivan Sorokin)
+    - BUGFIX: Add option to hibernate computer in Auto-Shutdown menu (Bruno Barbieri)
+    - BUGFIX: Fix column resizing issues (Bryan Roscoe)
+    - BUGFIX: Fix possible crashes. Closes #1814. (sledgehammer999)
+    - BUGFIX: Limit max cache to 1800MiB for 32bits compiled binaries and to 4GiB for other. Closes #1698. (sledgehammer999)
+    - BUGFIX: Don't localize double numbers in the webui. Closes #1525. (sledgehammer999)
+    - BUGFIX: Don't shrink transferlist rows when scrolling horizontally. Closes #1613. (sledgehammer999)
+    - BUGFIX: When qBT is launched with a magnet don't show it in the transferlist while the metadata are being loaded in the background. (sledgehammer999)
+    - BUGFIX: Show disk space while retrieving metadata. Closes #1693. (sledgehammer999)
+    - BUGFIX: Don't disable DHT/LSD/UPnP in the GUI when anonymous mode is enabled. (sledgehammer999)
+    - BUGFIX: Possible fix for crash in RSS code. Closes #1901. (sledgehammer999)
+    - BUGFIX: Fixed SMTP emailing code (Ivanov Juriy, sledgehammer999)
+    - BUGFIX: Don't display the context menu in 'Content' and 'HTTP Sources' buttons when no torrent is selected. It prevents crashes. Closes #1906, #1900. (sledgehammer999)
+    - BUGFIX: Don't translate file extensions. Closes #1907. (sledgehammer999)
+    - BUGFIX: Fix available disk space label on single file torrents. (sledgehammer999)
+    - BUGFIX: Show stalled downloads that are uploading under the 'Active' filter. Closes #1654." (sledgehammer999)
+    - BUGFIX: fix import torrent with "Keep incomplete torrents in:" enabled (lojack5)
+    - BUGFIX: Send a spoofed user agent for the search engines(fixes some of them) (Martin Janco)
+    - BUGFIX: Support URLs that redirect to magnet links (Gelmir)
+    - BUGFIX: Consider queued items before deciding to 'auto-shutdown on downloads completion'. Closes #1942. (sledgehammer999)
 
-* Sat Oct 10 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.4
-    - FEATURE: Select the file of single file torrents when opening destination folder (pmzqla)
-    - BUGFIX: Fix crash with invalid favicon. Closes #3632. (glassez)
-    - BUGFIX: Try to download favicon.png when the download of favicon.ico fails (pmzqla)
-    - BUGFIX: Try to avoid loading a corrupted configuration file. Also log errors encountered while saving/loading the configuration. Closes #3503. (sledgehammer999)
-    - BUGFIX: Allow adding torrent link from Torcache (jsayol)
-    - BUGFIX: Don't limit the number of torrents that can be announced to the tracker/dht/lsd. Closes #3473. (sledgehammer999)
-    - BUGFIX: Fix potential crash when memory allocation failed. Closes #3877. (Chocobo1)
-    - COSMETIC: Change Queue buttons order in the Toolbar (GUI & Web UI) (ngosang)
-    - COSMETIC: Move option "Ignore transfer limits on local network" to Speed page (Chocobo1)
-    - COSMETIC: Move option "Confirm torrent deletion" to Behavior page (Chocobo1)
-    - COSMETIC: Fix typos. Make `μTP` untranslatable. Use American variation of words. Closes #3654. (sledgehammer999)
-    - COSMETIC: Optimize text color for dark themes. Closes #3633 and #3815. (sledgehammer999)
-    - COSMETIC: Show current label in the torrent context menu. Closes #3776. (sledgehammer999)
-    - WEBUI: Add save_path to /query/torrents (Casey Bodley)
-    - WEBUI: Bump API_VERSION to 5
-    - SEARCH: Fix python detection when the 'Anaconda' software is installed. Closes #3731. (sledgehammer999)
-    - RSS: Handle magnet links as torrents instead of news URLs. Closes #3560 (ngosang)
-    - RSS: Trim elements text in RSS articles (ngosang)
-    - RSS: Fix contextual menu in RSS torrents list (ngosang)
-    - RSS: Improve error handling when a RSS feed doesn't contain torrents (ngosang)
-    - RSS: More precise message and code simplification in RSS feeds deletion (ngosang)
-    - RSS: Don't hide the elements in Unread list when clicked (ngosang)
-    - RSS: Allow multiple selection in RSS torrents list (ngosang)
-    - RSS: Simplify string translation (ngosang)
-    - RSS: Handle more types of RSS feeds (ngosang)
-    - RSS: Fix RSS panel position not saved (ngosang)
-    - RSS: Fix forgetting label changes to first item in RSS rule list. (Gelmir)
-    - RSS: Add label to UI when a new one is creating during rule addition. (Gelmir)
-    - RSS: Removes refresh message when adding a new feed (ngosang)
-    - RSS: Fix RSS crash when deleting RSS feeds. Closes #997, #2152, #2461, #3718, #3747, #3766, #3806, #3814, #3829 and #3846. (ngosang)
-    - RSS: Sort labels in RSS Downloader dialog, closes #3140. (Chocobo1)
-    - WINDOWS: Correctly show german letters in the installer. Closes #3574, #3566. (sledgehammer999)
-    - WINDOWS: Fix file selection on Explorer when the filename contains weird characters. Closes #3185. (sledgehammer999)
-    - WINDOWS: Fix wrong default download directory in Windows. Closes #2625. (Chocobo1)
-    - WINDOWS: Fix German translation of the installer. (netswap)
-    - LINUX: Fix broken .desktop file icon for some locales. See #3905. (sledgehammer999)
-    - OTHER: Fix ppc64le detection during configure (sledgehammer999)
-    - OTHER: Don't use sed in configure. Closes #3169. (pmzqla)
-    - OTHER: Fix broken donation link. Closes #3771. (sledgehammer999)
-    - OTHER: Add forum link in README. Closes #3853. (sledgehammer999)
-    - OTHER: New translation: Esperanto
-    - OTHER: Fix Qt5 nox build on non-Windows. (sledgehammer999)
+* Tue Apr 29 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9.2
+    - OTHER: The v3.1.9.1 Windows build was broken
 
-* Sun Aug 02 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.3
-    - BUGFIX: Fix crash when closing a search tab while search is running (pmzqla)
-    - SEARCH: Other minor search fixes and improvements (pmzqla)
+* Mon Apr 28 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9.1
+    - OTHER: This is an excuse to produce new builds with an OpenSSL version that isn't affected by the heartbleed bug for Windows and Mac. This bug should only affect the WebUI and only if HTTPS/SSL authentication was enabled.
 
-* Sat Aug 01 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.2
-    - FEATURE: Allow to force reannounce DHT too (Chocobo1)
-    - FEATURE: Implement an option to disable confirmation of torrent recheck (blaxspirit)
-    - FEATURE: Allow to copy all the trackers with a keyboard shortcut (pmzqla)
-    - BUGFIX: Fix torrent renaming. Closes #3398 (ngosang)
-    - BUGFIX: Fix localhost address (::ffff:127.0.0.1) is not recognized when connecting to WebUI (Chocobo1)
-    - BUGFIX: Fix '&' character in label name becomes accelerator key, closes #3454. (Chocobo1)
-    - BUGFIX: Fix HTTP header parsing when torrent filename contains a semicolon. Closes #3511.
-    - BUGFIX: Fix installing search plugin from local file. (sledgehammer999)
-    - BUGFIX: Fix installing search plugin by drag-n-dropping file. (sledgehammer999)
-    - COSMETIC: Update color scheme of completed.png icon. (sledgehammer999)
-    - COSMETIC: Fix printing of the copyright symbol in the About dialog. (sledgehammer999)
-    - COSMETIC: Minor changes in Preview File dialog (ngosang)
-    - COSMETIC: Add Force Resume icon (ngosang)
-    - COSMETIC: Add count of unread items to RSS tab label (pmzqla)
-    - WEBUI: Ports between 1 and 65535 as in the GUI. Closes #1602 (ngosang)
-    - WEBUI: Fix an error in Content tab when the torrent doesn't have metadata (ngosang)
-    - WEBUI: New option Web UI port UPNP. Closes #3358 (ngosang)
-    - WEBUI: Fix API Content Types. Closes #3393 (ngosang)
-    - WEBUI: Fix empty trackers addition (ngosang)
-    - WEBUI: Torrent download from hash. Closes #1173 (ngosang)
-    - WEBUI: Fix sort by queue number (ngosang)
-    - WEBUI: Open external links in a new window/tab (ngosang)
-    - WEBUI: Massive increase in performance. (ngosang)
-    - SEARCH: Search status per tab (DoumanAsh)
-    - SEARCH: Remove the word 'torrent' in ExtraTorrent results (ngosang)
-    - SEARCH: Prefer python3 over python2 on Linux and OS X (pmzqla)
-    - SEARCH: Show notification if Python is not found and a search is started (pmzqla)
-    - SEARCH: Update link to the Windows Python installer (pmzqla)
-    - SEARCH: Improve checks for python. Print python version and path to log. (sledgehammer999)
-    - SEARCH: Improve Python detection (ngosang)
-    - OTHER: Improvements on the build system (Chocobo1)
-    - OTHER: Bump minimum libtorrent version required to 1.0.6/0.16.19. (sledgehammer999)
-    - OTHER: New translation: Slovenian
+* 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)
 
-* Sat Jul 11 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.1
-    - FEATURE: Change default preferences (ngosang)
-    - FEATURE: Add "Add link to torrent" menu in TrayIconMenu. Closes #2918. (Chocobo1)
-    - FEATURE: Allow to Open files from the properties pane by pressing "Enter" (pmzqla)
-    - FEATURE: Add checkbox option for IpFilterTrackers. (Chocobo1)
-    - FEATURE: Download-from-URL textbox change focus on tab key (Mayank Asthana)
-    - FEATURE: Increase priority value of "High" (pmzqla)
-    - FEATURE: Add 16 KiB, 8 MiB and 16 MiB piece sizes in Torrent Creator (ngosang)
-    - BUGFIX: Disable Auto piece size when creating a new torrent (ngosang)
-    - BUGFIX: Set default focus to cancel button in delete confirm dlg, closes #3085 (Chocobo1)
-    - BUGFIX: Set default focus to ok button in add new torrent dlg (Chocobo1)
-    - BUGFIX: Set default focus to no button in exit confirm box (Chocobo1)
-    - BUGFIX: Fix Start Minimized checkbox in Options (ngosang)
-    - BUGFIX: Remove limits on alternative speeds setting (LazyBui)
-    - BUGFIX: Fix sorting torrents by ETA (pmzqla)
-    - BUGFIX: Improve ratio calculation formula. Closes #3096. (Chocobo1)
-    - BUGFIX: Clear missing files flag when resuming or force rechecking. Fixes issues in #2750. (sledgehammer999)
-    - BUGFIX: Delete tempfile when downloading favicon.ico. Closes #3257. (sledgehammer999)
-    - BUGFIX: Don't close downloadFromURL dialog when showing empty url warning (Chocobo1)
-    - BUGFIX: Minimize to tray only if the relevant option is enabled. (sledgehammer999)
-    - BUGFIX: Update disk space label after changing partition, closes #3309. (Chocobo1)
-    - BUGFIX: Don't use a default upload limit. Closes #3275. (sledgehammer999)
-    - BUGFIX: Fix Properties bar size when started minimized to tray. Closes #3206. (sledgehammer999)
-    - COSMETIC: Change option text "Confirmation on exit when torrents are active" (Chocobo1)
-    - COSMETIC: Enable to choose dark/light tray icons on all platforms. (Chocobo1)
-    - COSMETIC: Use AllUppercase for label text (Chocobo1)
-    - COSMETIC: changes in typography (ngosang)
-    - COSMETIC: Menu revamp (Chocobo1)
-    - COSMETIC: Revamp general tab info (Chocobo1)
-    - COSMETIC: Better update message for users (Chocobo1)
-    - COSMETIC: Fix ugly 'C++' wrapping in About dialog. (glassez)
-    - WEBUI: Fix login and logout relative URLs (ngosang)
-    - WEBUI: Fix resumeAll and pauseAll. Closes #3016 (ngosang)
-    - WEBUI: Changes in title bar (ngosang)
-    - WEBUI: Complete translatable strings (ngosang)
-    - WEBUI: Minor changes in style (ngosang)
-    - WEBUI: Fix Max connections and Time active in transfer information (ngosang)
-    - WEBUI: New config - Global maximum number of upload slots (ngosang)
-    - WEBUI: Display wasted data with friendly units. Closes #2994 (ngosang)
-    - WEBUI: add delay in shutdown command in order to send out response msg (Chocobo1)
-    - WEBUI: Option to hide Top Toolbar (ngosang)
-    - WEBUI: Reorder the tabs/groups in Options window (ngosang)
-    - WEBUI: Add new options (ngosang)
-    - WEBUI: Increase API_VERSION due to changes in #3279, #3197, #3226 and #3040 (ngosang)
-    - WEBUI: Add Web Seeds (HTTP Sources) tab (ngosang)
-    - WEBUI: Don't update the tabs if tab's panel is collapsed (ngosang)
-    - WEBUI: Fix alternative global rate limits. (ngosang)
-    - SEARCH: Fix thepiratebay. Closes #3012 (ngosang)
-    - SEARCH: Improve torrentz engine to return more results (ngosang)
-    - SEARCH: Change width of columns in search tab. Closes #764 (ngosang)
-    - SEARCH: Make strings translatable in seach engine (ngosang)
-    - SEARCH: Aborting search engine process during closure. Close #2671 (DoumanAsh)
-    - SEARCH: Perform searches in parallel (DoumanAsh)
-    - SEARCH: Add Demonoid search engine (ngosang)
-    - SEARCH: Minor fixes in search engines (ngosang)
-    - SEARCH: Show the version of search engines (ngosang)
-    - SEARCH: Update Legit Torrent to remove sgmllib (DoumanAsh)
-    - SEARCH: Update KickassTorrents (ngosang)
-    - SEARCH: Update BTDigg (ngosang)
-    - SEARCH: Update Torrentz (ngosang)
-    - SEARCH: Update ExtraTorrent (ngosang)
-    - SEARCH: Update TorrentReactor (ngosang)
-    - SEARCH: Fix Python 2 implementation of Torrentz (ngosang)
-    - SEARCH: Cosmetic changes in search engine (ngosang)
-    - SEARCH: Fix column sort in search engine. Closes #2621 (ngosang)
-    - RSS: Update matching RSS articles while editing rules (pmzqla)
-    - WINDOWS: Fix python detection from registry when multiple versions are installed (sledgehammer999)
-    - LINUX: Fixes Linux issue for when the theme doesn't have a corresponding icon. (sledgehammer999)
-    - OTHER: Correctly detect FreeBSD when configuring. (sledgehammer999, yurivict)
-    - OTHER: Add translator to credits.
-    - OTHER: New translation: Indonesian.
-    - OTHER: Split Chinese locales into Chinese Simplified, Chinese Traditional(Taiwan), Chinese Traditional(Hong Kong). (sledgehammer999)
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.8
+    - BUGFIX: Really fix build of v3.1.6
 
-* 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).
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.7
+    - BUGFIX: Fix build of v3.1.6
+
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.6
+    - BUGFIX: Fix 'preview file' regression. Closes #1285. (sledgehammer999)
+    - BUGFIX: Fix peers and seeds sorting in transfer list. (Angel Alonso)
+    - BUGFIX: Fix btdigg search engine. (BTDigg research team)
+    - BUGFIX: Save statistics every 15min and only if there was new traffic. Fixes #1288 and partially #1272. (sledgehammer999)
+    - BUGFIX: Fix share ratio text in the 'general' tab. (sledgehammer999)
+    - BUGFIX: Output a more generic message when blocking IPs and don't use italics in the log. (sledgehammer999)
+    - BUGFIX: Allow 2 decimals when setting the share ratio. Closes #1303. (sledgehammer999)
+    - BUGFIX: Fix extratorrents search plugin. (sledgehammer999)
+    - BUGFIX: Use shorter names for amount columns in main UI (Gelmir)
+    - BUGFIX: Fix overstretched options dialog. Closes #1293. (sledgehammer999)
+    - BUGFIX: Don't show a popup menu when no torrent is selected. (sledgehammer999)
+    - BUGFIX: Launch external programs async and don't block. Closes #1252. (sledgehammer999)
+    - BUGFIX: Don't re-announce to trackers when torrent is paused. Closes #1310. (sledgehammer999)
+    - BUGFIX: Bring dialog boxes in the front when qbt doesn't have focus. (sledgehammer999)
+    - BUGFIX: Correctly resize 'name' column of the content tab. Closes #1360. (sledgehammer999)
+    - BUGFIX: Correctly restore 'name' column width when loading magnet links in the 'Add new torrent dialog'. Closes #1334. (sledgehammer999)
+    - WEBUI: Fix sorting by size in WebUI when non-default locale used. (Vladimir Golovnev)
+    - UI: Reposition statistics menu item. (sledgehammer999)
+    - UI: Convert more accurately decimal numbers to text. (sledgehammer999)
+    - WINDOWS/OSX: Improvements on the behavior of the program updater(closes #1282) (sledgehammer999)
+    - LINUX: Explicitle tell that we don't support freedesktop's startup notify standard. Fixes GNOME issues. Closes #1217. (sledgehammer999)
+    - LINUX: Add our WM_CLASS in the .desktop file so window managers know how to group our windows. (sledgehammer999)
+    - OTHER: Sync translations from Transifex.
+
+* Thu 16 Jan 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.5
+    - BUGFIX: Fix compilation with Qt 4.7. Closes #1215. (sledgehammer999)
+    - BUGFIX: Third attempt at fixing saving settings on OS shutdown. (sledgehammer999)
+    - BUGFIX: Preview now correctly uses the selected file. Closes #1222 #1182. (sledgehammer999)
+    - BUGFIX: Allow to resize the columns in Add New Torrent dialog. Closes #1207 #676 (sledgehammer999)
+    - BUGFIX: Ensure that at least one column in the tranferlist is always visible. Closes #1165. (sledgehammer999)
+    - BUGFIX: Ensure that the options window will always be placed onscreen. Closes #1226. (sledgehammer999)
+    - BUGFIX: Delete temporary files after they aren't needed. Closes #1188. (sledgehammer999)
+    - BUGFIX: Correctly detect libtorrent version. (sledgehammer999)
+    - BUGFIX: Various code cppcheck fixes (Konstantin Goncharik)
+    - BUGFIX: Remove isohunt search engine and update thepiratebay url (sledgehammer999)
+    - BUGFIX: Fix rss settings corruption when checking regexp and going to other rule. (Gelmir)
+    - BUGFIX: Don't count paused torrents for the autoshutdown. Closes #1280. (sledgehammer999)
+    - LINUX: Fix notifications with xfce4-notifyd.
+    - OSX: Added basic retina support. Closes #1251. (Sébastien Lavoie)
+    - OTHER: Sync translations from Transifex.
+
+* Sun 29 Dec 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.4
+    - FEATURE: Statistics dialog (Gelmir)
+    - FEATURE: Tooltips explaining each peer's connection flags (sledgehammer999)
+    - FEATURE: Win/Mac Check for program updates every 15min and allow the user to manually check for updates through the help menu. (sledgehammer999)
+    - BUGFIX: Better dialog message for torrent delete confirmation (sledgehammer999)
+    - BUGFIX: Fix resizing grip location. Closes #1146. (sledgehammer999)
+    - BUGFIX: Lock toolbar in place. Closes #1144. (sledgehammer999)
+    - BUGFIX: Second attempt at fixing saving settings on shutdown. (sledgehammer999)
+    - BUGFIX: Sort labels in 'Add new torrent' dialog. Closes #1150 #411. (sledgehammer999)
+    - LINUX: Fix build under Ubuntu 13.10 (sledgehammer999)
+    - LINUX: Make sleep and shutdown functions work on systemd's logind (Faheem Pervez)
+
+* Mon Nov 20 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.3
+    - FEATURE: Add a key shortcut to "Add link to torrent..." (Angel Alonso)
+    - BUGFIX: Make all columns and headers use the same text alignment in the transferlist. (sledgehammer999)
+    - BUGFIX: Fix build system for Unix/Linux. (sledgehammer999)
+    - BUGFIX: Case insensitive sort in Peers list. Closes #1066. (sledgehammer999)
+    - BUGFIX: Small optimization of WebUI responses when there isn't a data payload. (sledgehammer999)
+    - BUGFIX: Hide empty folders after filtering. Closes #74. (sledgehammer999)
+    - BUGFIX: Expand folders when filtering files. Closes #1076. (sledgehammer999)
+    - BUGFIX: Updated search plugin's URL (Zach Thibeau)
+    - BUGFIX: Strip some png to fix incorrect sRGB profiles. (Angel Alonso)
+    - BUGFIX: Fixed font issues on OSX Mavericks (Zach Thibeau)
+    - BUGFIX: Improve text in the About dialog (Artem S. Tashkinov)
+    - BUGFIX: Always show a peer IP address as a tool tip (Artem S. Tashkinov)
+    - BUGFIX: Fix inhibit system functionality. Closes #766. (sledgehammer999)
+    - BUGFIX: WebUI: Don't gzip too small payloads. (sledgehammer999)
+    - BUGFIX: Correctly detect if the browser supports gzip compression. (sledgehammer999)
+    - BUGFIX: Fix WebUI link to 'Anonymous mode' explanation. Closes #1093. (sledgehammer999)
+    - BUGFIX: Correctly update tracker tier number in the trackers tab. Closes #1075. (sledgehammer999)
+    - BUGFIX: Speed improvements.(sledgehammer999)
+    - OTHER: Updated translations.
+    
+* Tue Nov 05 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.2
+    - BUGFIX: Fix WebUI gzip compression. Closes #1037. (sledgehammer999)
+    - BUGFIX: Fix compilation with qt < 4.8.0. Closes #1043. (sledgehammer999)
+    - OTHER: Updated translations.
+
+* Mon Oct 28 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.1
+    - FEATURE: Show external IP in the log. Closes #968. (sledgehammer999)
+    - FEATURE: Enable gzip compression in the webui. It should be faster now. (sledgehammer999)
+    - FEATURE: Torrents show more states(queued for checking, downloading metadata, allocating, checking resume). (sledgehammer999)
+    - FEATURE: Reenable "force reannounce" to all trackers. (sledgehammer999)
+    - FEATURE: Allow to clear the UI lock password. Closes #973. (sledgehammer999)
+    - FEATURE: New translations: English(Australia) and English(United Kingdom)
+    - BUGFIX: Expose all available translation in the WebUI. Closes #976. (sledgehammer999)
+    - BUGFIX: Copy IP copied wrong data. Closes #970 (sledgehammer999)
+    - BUGFIX: "Preview file..." didn't work on single file torrents. (sledgehammer999)
+    - BUGFIX: Fix and improve the scheduler (Gelmir and sledgehammer999)
+    - BUGFIX: RSS fixes. Closes #960, #998 (Gelmir)
+    - BUGFIX: Fix 'append label to save path' with magnet links. (sledgehammer999)
+    - BUGFIX: Can download up to 10MB .torrent file when a link is provided. Closes #879 (sledgehammer999)
+    - OTHER: Updated translations.
+    - LINUX: Fix missing conf.pri error (leigh123linux)
+    - WINDOWS: Don't remove file associations if they aren't our own. (sledgehammer999)
 
 * Sat Oct 12 2013 - Christophe Dumez <chris@qbittorrent.org> and sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.0
     - FEATURE: Add command line option to daemonize qbittorrent-nox (ngaro)

INSTALL

@@ -14,7 +14,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.16.19 OR >= 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.
 
@@ -44,7 +44,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.16.19 OR >= 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.md

@@ -1,10 +1,9 @@
 qBittorrent - A BitTorrent client in Qt
 ------------------------------------------
 
-[![Build Status](https://travis-ci.org/qbittorrent/qBittorrent.svg?branch=v3_2_x)](https://travis-ci.org/qbittorrent/qBittorrent)
-[![Coverity Status](https://scan.coverity.com/projects/5494/badge.svg)](https://scan.coverity.com/projects/5494)
+[![Build Status](https://travis-ci.org/qbittorrent/qBittorrent.png?branch=v3_1_x)](https://travis-ci.org/qbittorrent/qBittorrent)
 ********************************
-### Description:
+###Description:
 qBittorrent is a bittorrent client programmed in C++ / Qt that uses
 libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
 
@@ -32,9 +31,6 @@ 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
 
@@ -43,3 +39,4 @@ You can also meet me (sledgehammer_999) on IRC:
 
 ------------------------------------------
 sledgehammer999 <sledgehammer999@qbittorrent.org>
+

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:

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,309 +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(qt5,
-            [AS_HELP_STRING([--with-qt5],
-                            [Compile using Qt5 (default=no)])],
-            [],
-            [with_qt5=no])
-
-AC_ARG_WITH(libtorrent-rasterbar0.16,
-            [AS_HELP_STRING([--with-libtorrent-rasterbar0.16],
-                            [Compile using libtorrent-rasterbar 0.16.x series (default=no)])],
-            [],
-            [with_libtorrent_rasterbar0_16=no])
-
-AC_ARG_WITH(geoip-database-embedded,
-            [AS_HELP_STRING([--with-geoip-database-embedded],
-                            [Embed the GeoIP database in the qBittorrent executable (please follow instructions in src/gui/geoip/README) (default=no)])],
-            [],
-            [with_geoip_database_embedded=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]
-              enable_geoip_database=[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 Qt5 should be enabled])
-AS_CASE(["x$with_qt5"],
-        ["xno"],
-              [AC_MSG_RESULT([no])
-              FIND_QT4()],
-        ["xyes"],
-               [AC_MSG_RESULT([yes])
-               FIND_QT5()],
-        [AC_MSG_RESULT([$with_qt5])
-        AC_MSG_ERROR([Unknown option "$with_qt5". 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([whether to compile using libtorrent-rasterbar 0.16.x])
-AS_CASE(["x$with_libtorrent_rasterbar0_16"],
-        ["xno"],
-              [AC_MSG_RESULT([no])
-              PKG_CHECK_MODULES(libtorrent,
-                               [libtorrent-rasterbar >= 1.0.6],
-                               [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
-                               LIBS="$libtorrent_LIBS $LIBS"])],
-        ["xyes"],
-               [AC_MSG_RESULT([yes])
-               PKG_CHECK_MODULES(libtorrent,
-                                [libtorrent-rasterbar >= 0.16.19],
-                                [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
-                                LIBS="$libtorrent_LIBS $LIBS"])],
-        [AC_MSG_RESULT([$with_libtorrent_rasterbar0_16])
-        AC_MSG_ERROR([Unknown option "$with_libtorrent_rasterbar0_16". Use either "yes" or "no".])])
-
-AC_MSG_CHECKING([whether to embed the GeoIP database])
-AS_CASE(["x$with_geoip_database_embedded"],
-        ["xno"],
-              [AC_MSG_RESULT([no])
-              QBT_REMOVE_DEFINES="$QBT_REMOVE_DEFINES WITH_GEOIP_EMBEDDED"],
-        ["xyes"],
-               [AC_MSG_RESULT([yes])
-               QBT_ADD_DEFINES="$QBT_ADD_DEFINES WITH_GEOIP_EMBEDDED"],
-        [AC_MSG_RESULT([$with_geoip_database_embedded])
-        AC_MSG_ERROR([Unknown option "$with_geoip_database_embedded". Use either "yes" or "no".])])
-
-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_qt5" = "xno"],
-      [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(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/installer-translations/french.nsi

@@ -1,49 +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 exécution. Veuillez fermer l'application avant l'installation."
-;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 fichiers associés"
-;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 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,49 +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 am 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_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 in 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:"

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,7 +17,7 @@ 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.
 

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,7 +17,7 @@ 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), 

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_qt5" = "xyes"],
-       [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,61 +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
-CONFIG += 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

@@ -3,8 +3,7 @@ exists(conf.pri) {
     include(conf.pri)
 }
 
-LIBS += \
-    -ltorrent-rasterbar \
+LIBS += -ltorrent-rasterbar \
         -lboost_thread \
         -lboost_system \
         -lboost_filesystem \

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;
+        }
+};