Bump to 3.2.0

.gitignore

@@ -2,19 +2,13 @@ src/gui/geoip/GeoIP.dat
 src/gui/geoip/GeoIP.dat.gz
 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
@@ -25,7 +19,6 @@ src/lang/qbittorrent_*.qm
 .qmake.stash
 src/qbittorrent.app
 *.dmg
-
 #Autotools junk
 aclocal.m4
 autom4te.cache/*

.travis.yml

@@ -1,22 +1,16 @@
-language: cpp
+language:
-
+  - cpp
-os:
-  - linux
-  - osx
-osx_image: xcode7
 
 env:
-  matrix:
+  # use libtorrent 0.15.10
-    # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
+  # uncomment when Travis doesn't use Ubuntu 12.04 LTS, which has libtorrent 0.15.10 as package
-    #- lt_branch=dist gui=true
+  #- lt_source=from_dist gui=true
-    #- lt_branch=dist gui=false
+  #- lt_source=from_dist gui=false
-    - lt_branch=RC_1_0 qt=5 gui=true
+  # use libtorrent 0.16.X from RC_0_16 svn branch
-    - lt_branch=RC_1_0 qt=5 gui=false
+  - lt_source=from_svnRC_0_16 gui=true
-    - lt_branch=RC_1_0 qt=4 gui=true
+  - lt_source=from_svnRC_0_16 gui=false
-    - lt_branch=RC_1_0 qt=4 gui=false
+  - lt_source=from_svnRC_1_0 gui=true
-  global:
+  - lt_source=from_svnRC_1_0 gui=false
-    - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
-    - coverity_branch: coverity_scan
 
 branches:
   except:
@@ -26,131 +20,41 @@ branches:
 notifications:
   email:
     on_success: change
-    on_failure: change
+    on_failure: change 
-
-# container-based builds
-#sudo: false
-cache: ccache
-
-# opt-in Ubuntu Trusty
-sudo: required
-dist: trusty
-
-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:
-    #sources:
-    # sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
-    #- ubuntu-toolchain-r-test
-    #- boost-latest
-    packages:
-    # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
-    - autoconf
-    - automake
-    - colormake
-    - libssl-dev
-    - libboost-dev
-    - libboost-system-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
 
 before_install:
-  # only allow specific build for coverity scan, others will stop
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true ]; then exit ; fi
-
   - shopt -s expand_aliases
-  - alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system)
+  - alias sudo="sudo "
-  #- libt_path="$HOME/libt_install"
+  # Using nprocs/2 sometimes may fail (gcc is killed by system), just use two threads
-  #- ltconf="$ltconf --prefix="$libt_path" --disable-geoip"
+  - alias make="colormake -j2 "
-  - qbt_path="$HOME/qbt_install"
-  - qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":$PKG_CONFIG_PATH"
 
-  # options for specific branches
+  # Also setup a virtual display for after_success target when gui == true
-  - if [ "$qt" = 4 ]; then qbtconf="$qbtconf --with-qt4" ; 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
-  - if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; fi
+  - qbtconf="$qbtconf --with-qt4"
-  - |
+  - ltconf=" --with-libgeoip=system"
-    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      # setup virtual display for after_success target
-      if [ "$gui" = true ]; then export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi ;
-    fi
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      qbtconf="$qbtconf --disable-qt-dbus" ;
-    fi
 
-  # print settings
+  - echo settings
-  - echo $lt_branch
+  - echo $lt_source
-  - echo $gui
   - echo $ltconf
+  - echo $gui
   - echo $qbtconf
 
+  - sudo apt-get -qq update
+  # Travis can stall during heavy load if these packages are installed in one step - split the command
+  - sudo apt-get -qq install debhelper autoconf automake colormake libssl-dev libgeoip-dev
+  # uncomment when Travis doesn't use Ubuntu 12.04 LTS, which has libtorrent 0.15.10 as package
+  #- sudo apt-get -qq install libboost-dev libboost-filesystem-dev libboost-system-dev
+  - sudo apt-get -qq install libboost-dev libboost-system-dev
+  - sudo apt-get -qq install libqt4-dev 
+
 install:
-  - |
+  #- if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
-    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+  - if [[ "$lt_source" == "from_svnRC_0_16" ]]; then qbtconf="$qbtconf --with-libtorrent-rasterbar0.16" && 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
-      # libtorrent
+  - if [[ "$lt_source" == "from_svnRC_1_0" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_1_0 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
-      sudo add-apt-repository --yes ppa:qbittorrent-team/qbittorrent-stable ;
-      sudo apt-get update -qq ;
-      sudo apt-get install -qq libtorrent-rasterbar-dev ;
-
-      # build libtorrent from source
-      #if [ "$lt_branch" != "dist" ]; then
-        #cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch ;
-        #cd libtorrent && ./autotool.sh && ./configure $ltconf && make install ;
-      #fi ;
-
-      # Qt
-      if [ "$qt" = 4 ]; then sudo apt-get -qq install qt4-default libqt4-dev ; fi ;
-      if [ "$qt" = 5 ]; then sudo apt-get -qq install qt5-default qtbase5-dev qttools5-dev-tools ; fi ;
-
-      # ccache
-      if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
-        dpkg-query -L ccache && export use_ccache=true ;
-        ccache -V && ccache --show-stats && ccache --zero-stats ;
-      fi ;
-    fi
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      # dependencies
-      brew update > /dev/null ;
-      brew install colormake ccache ;
-      brew outdated "pkg-config" || brew upgrade "pkg-config" ;
-      # libtorrent-rasterbar 1.0.9
-      brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/477d5060fa093883204d70323965375353e03084/Formula/libtorrent-rasterbar.rb ;
-
-      # Qt
-      if [ "$qt" = 4 ]; then brew install qt && ln -s /usr/local/Cellar/qt/4.8.7_2/plugins /usr/local ; fi ;
-      if [ "$qt" = 5 ]; then brew install qt5 && brew link --force qt5 && ln -s /usr/local/Cellar/qt5/5.6.0/plugins /usr/local ; fi ;
-
-      # ccache
-      if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
-        export PATH="/usr/local/opt/ccache/libexec:$PATH" && export use_ccache=true ;
-        ccache -V && ccache --show-stats && ccache --zero-stats ;
-      fi ;
-    fi
 
 script:
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # skip usual build when running coverity scan
+  - ./bootstrap.sh
-  - cd "$TRAVIS_BUILD_DIR" && ./bootstrap.sh && ./configure $qbtconf
+  - ./configure $qbtconf && sudo make install
-  - |
+  
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      sed -i "" -e "s/^\(CC.*&&\).*$/\1 $CC/" src/Makefile ;  # workaround for Qt & ccache: https://bugreports.qt.io/browse/QTBUG-31034
-      sed -i "" -e "s/^\(CXX.*&&\).*$/\1 $CXX/" src/Makefile ;
-      sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs -Wno-inconsistent-missing-override/' src/Makefile ;
-    fi
-  - make && make install
-
 after_success:
-  - if [ "$gui" = true ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi
+  - if $gui ; then qbittorrent --version ; else qbittorrent-nox --version ; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd "$qbt_path/bin" ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cd "$TRAVIS_BUILD_DIR/src/" && macdeployqt "$qbt_exe.app" && cd "$qbt_exe.app/Contents/MacOS" ; fi
-  - ./$qbt_exe --version
-
-after_script:
-  - if [ "$use_ccache" = true ]; then ccache --show-stats ; fi

.tx/config

@@ -1,9 +1,8 @@
 [main]
 host = https://www.transifex.com
 
-[qbittorrent.qbittorrent_v3_3_x]
+[qbittorrent.qbittorrent_v3_2_x]
 file_filter = src/lang/qbittorrent_<lang>.ts
-lang_map = pt: pt_PT
 source_file = src/lang/qbittorrent_en.ts
 source_lang = en
 type = QT

5B7CC9A2.asc

@@ -1,53 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
-
-mQINBFcNIIwBEACpGHvHW9ku7rwCSc2Dv4gh3MO3HPoP7Ba4RiEKwa7SCbPzc0DL
-JypV4gNfnrpiO7bWVh5v+otbZTkQeNXWbx6hDUa2e5GCCuJifIu3PxpmMcNJFvvF
-nk5QRf6dtz4Sm2x6joYprvsEUjyk+wHC016/0g7yhc/w0sclXlpKK+8Pl5DFrf5C
-i5uljy3oJgl54D2yYAvxu3BrdTVKhLVYADUf1Fl3b5pV7VJwr+9wGuTqkORe1rpi
-9NGWXUaTmKF8+XAJxlbYIUOZQpQ02clFxz0T7o/+m74N8tK9j7g8H2Q3QwtKi0q1
-gI48LqI/EuZHIaRz/3pEVISlIpWzGqBL/G4I/UtzJLHyvySsqWXAKllKpk97XX77
-XxFy3VL3fR7o4IohAj5fD083X8tuBIP2dxmHzxHTWveKBlEV6C4MdtVRow8ia3lu
-RKLz6PF0hBBpebAP4MWAN8cy4ePBCe9BvyI2+3tPgqtlC2tEZLnRru6mtagPi4sj
-Yo/iFkSQdTXrxeyrMJh161gsWl16JeAfz4Dq8IBoUA1hXIjfM9FcIv1rCY6Y8JwS
-TtWMGYtzIcqE71wZxqnJuyFZkgC14NDTLgUwLf8XJOTWlMW9CY+tStjjw+sNoIPf
-p7YQCmss4p5J8flnxH4xJ8ogOHxENidA+Z/J9mtGjxXIXHavPlO3IEg/DwARAQAB
-tHFzbGVkZ2VoYW1tZXI5OTkgKFVzZWQgZm9yIHNpZ25pbmcgcUJpdHRvcnJlbnQg
-c291cmNlIHRhcmJhbGxzIGFuZCBiaW5hcmllcyB2Mi4pIDxzbGVkZ2VoYW1tZXI5
-OTlAcWJpdHRvcnJlbnQub3JnPokCNwQTAQgAIQUCVw0gjAIbAwULCQgHAgYVCAkK
-CwIEFgIDAQIeAQIXgAAKCRBuSi0CW3zJojB2D/0bKlelRDQDtWzfRyxrdhe5pgAt
-x1AsN/Cl7h8zlbAw38bL+jQ2/GmtzwzEqPfQc7IFnbeg0PZ58p7Hikj9h6JEhkyA
-1qekkriclUmblEwDne3TjPixqgoBfNcDQu74dT08XpM8auFQo31/jJ104903o0O5
-+CPOPn2KTdwpcSpwAVIj/3H96gZWegJDNpdByJUVbzYCt1erJ6I0ZURKhzU1VTJj
-ZdEGB2YsvYpt5rsi41IYZZG33jMsPxSDDNJ/MiLXxkn08ZawNET6fnkEJJ37n9Pw
-82lTZjFEFU+KTMT7dNjIejWCRgHVLgW8sO2lCPqMiFfWymD/N3sFpBO+UI86y5ds
-hfGFAWcgSq9pVjuW4sbX3PntBnoNd+geDD1Ic4rP3jHRe5HuYGhtHO6xv/r7HeY5
-HiShCTSSDBJqFmhfjrCo0nISKnzyxgO/rY9vFlwXsKkTyL7s53ONkjwK34WmGnya
-tXdjBWShzAiTfF5hephfBSszmoBG2C8Jcu6P5n4buBY4RCsEa+6jE0R1vCtmpVwx
-WrXOeN2kGYMpAkPK1L69Le0FofgUDKlaFMv7KRl4R367xNRukYrsKwVlontJ+Y72
-X5t1BeRn8VSp0IzhssNXM8a4bTE8lvs889DOS2vgWEHIi0iyIesJYWPs4AKUw4rG
-EDwWxtTS0a7Rfx3DxLkCDQRXDSCMARAAqMIVJizEJp205c546IN75xeYiFszNXcs
-3768IY8bOoWj+rTwt2wIwtL/3O5K2dG79CSt2H5o6BPKmq43tOO60YW3Yk3m9BB/
-gnAVqk0QOPr5O8+yeBzdElU8CZh6y6zZMWugSkNmTDm6jZzPhgNjcjrit/dl9+0D
-GqJQcqoD8WzEWNcWrMHVz9cDewnLSVkwR758mZMaIiL7R10MZ++tNrC0j69UINqx
-+9z1r1J07+NNnxqSTxVRcbjPYtM9E+tUiVFS2HPWN9ShVDkBAEdoWh90qzRaMiFl
-2NGNGOD1iHx/xr06RMeGEEXt2vhSlhfMW2YQW+UD2jzlFbARf53v39MUKKscGuIp
-BhxGw3JCq4l6qLW/bDkgnoXlOhZDmhQm6OpsjAyk9IEdd3ponSc7yYD3mUkJKR9e
-TaALD5t6TQGyNHakb4UfoXtE2RR78cbPlLIwag7eQ8GsNA+dfjowmOZdojx3ROsH
-ZdGQwb0YFLjuKAusA3TY+lCfbS6kzE2iI2DuaW+3dICcLrYuibbVb0CBNHyD+8KE
-tczdur/wm0lhqyVJkGyZKZT8C2cPxywKgy1Rn6F8Yfmj0Lna3nvtaZu0ZUS4/8Li
-t5PcOso1lSmYBuD6yq+GEAMCnUmn1Pm8eZRMlxxQuTPvyJKQrRDhbtAAr472MSno
-JKlS4SfaUF0AEQEAAYkCHwQYAQgACQUCVw0gjAIbDAAKCRBuSi0CW3zJomZDD/9I
-Jmzd5hiEzntlp84pyIJcfyIRe4KImvldAy6T02OSIbF1HzCNnwmqIPob6MOdMZ+K
-NwMK0htRkrRr/zM034+lBiWKZt+tVYHu49ioTYXEjAc5qDJE09Sq7HceQnhgE48f
-1n54XGT5G2w5gw+/a8Qn1SceE44VwXafL3E1gKaOrrsb1UH/AJhp+W4VMu+7bLXu
-7h1tN6v2PhvCYvBt3zyy8Q8xfJ2x7/D1lbF8ATJAiZ/km9x5bRm7OGRliVYaUe1n
-yR42fZOj3CBmAR0+lZLgjriqdMXrs+qlBbrmAhkn0XPQXAeaPifKoKIGDAUWIsqD
-HqM7imMGT+MR9APfSw8M4enOJWL+HnKpVBEARCEDpaFpJ3u7QRucFybpEhvIymoN
-ftyw+urId2Eg2K33NypeZo3M1K2LC65f2Ta7f/sZcIDUTbgW+m334fgVl1KptDA5
-DX3U9lTci7mi4uPuAFtbWrB1di4jYrxXYuzFm5g4xTb0Hw3kYIB6WXF+I7i0JaGO
-THxPC5X5lIAZrYrkxh+1n1Y1CY+TC8JcTzwORJIbFFm9tD/BHXa4849k4DVvFYCZ
-khq+/56FKZfoVByhB+x+2GaMlsBm1uPniO4lAakFPpIi0kaap4UVayQ/7ak+Bhsc
-AIHZUy6NtgZkuvW3xdpwp07LYo2ilhMI8RnzmtoRmg==
-=tDGM
------END PGP PUBLIC KEY BLOCK-----

AUTHORS

@@ -79,11 +79,6 @@ Images Authors:
 
 * file: src/icons/oxygen/checked.png
   copyright: Victor Buinsky <allok.victor@gmail.com>
-  
-* file: src/icons/skin/ratio.png
-  copyright: Fatcow Web Hosting
-  license: Creative Commons Attribution 3.0 License
-  url: http://www.fatcow.com/free-icons
 
 Translations authors:
 * files: src/lang/*.ts

CMakeLists.txt

@@ -1,65 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-cmake_policy(VERSION 3.5)
-
-project(qBittorrent VERSION 3.4.0.0)
-
-set(VER_MAJOR ${qBittorrent_VERSION_MAJOR})
-set(VER_MINOR ${qBittorrent_VERSION_MINOR})
-set(VER_BUGFIX ${qBittorrent_VERSION_PATCH})
-set(VER_BUILD ${qBittorrent_VERSION_TWEAK})
-set(VER_STATUS "alpha") # Should be empty for stable releases!
-
-# Don't touch the rest part
-set(PROJECT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}")
-
-if (NOT VER_BUILD EQUAL 0)
-    set(PROJECT_VERSION "${PROJECT_VERSION}.${VER_BUILD}")
-endif()
-
-set(PROJECT_VERSION "${PROJECT_VERSION}${VER_STATUS}")
-
-add_definitions(-DVERSION_MAJOR=${VER_MAJOR})
-add_definitions(-DVERSION_MINOR=${VER_MINOR})
-add_definitions(-DVERSION_BUGFIX=${VER_BUGFIX})
-add_definitions(-DVERSION_BUILD=${VER_BUILD})
-
-# os2 {
-#     DEFINES += VERSION=\'\"v$${PROJECT_VERSION}\"\'
-# } else {
-add_definitions(-DVERSION="v${PROJECT_VERSION}")
-# }
-list(APPEND CMAKE_MODULE_PATH ${qBittorrent_SOURCE_DIR}/cmake/Modules)
-
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og")
-if (UNIX AND NOT APPLE)
-    include(GNUInstallDirs)
-endif (UNIX AND NOT APPLE)
-
-if(WIN32)
-    include(winconf)
-endif(WIN32)
-
-# we need options here, because they are used not only in "src" subdir, but in the "dist" dir too
-include(CMakeDependentOption)
-
-option(QT5 "Compile using Qt5" ON)
-option(SYSTEM_QTSINGLEAPPLICATION
-    "Use the system qtsingleapplication library or shipped one otherwise")
-cmake_dependent_option(SYSTEM_QJSON
-    "Use the shipped qjson library or the system one (Qt4 only)" OFF "NOT QT5" OFF)
-
-option(GUI "Allows to disable GUI for headless running. Disables QtDBus and the GeoIP Database" ON)
-
-option(WEBUI "Allows to disable the WebUI." ON)
-
-if (WIN32)
-    option(STACKTRACE_WIN "")
-else (WIN32)
-    cmake_dependent_option(SYSTEMD "Install the systemd service file (headless only)" OFF
-        "NOT GUI" OFF)
-    cmake_dependent_option(DBUS "Enable use of QtDBus (GUI only)" ON "GUI" OFF)
-endif(WIN32)
-
-
-add_subdirectory(src)
-add_subdirectory(dist)

CODING_GUIDELINES.md

@@ -1,8 +1,6 @@
 All new code must follow the following coding guidelines.  
 If you make changes in a file that still uses another coding style, make sure that you follow these guidelines for your changes instead.  
-**Note 1:** I will not take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style.  
+**Note:** 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.
-**Note 2:** You can use the `uncrustify` program/tool to clean up any source file. Use it with the `uncrustify.cfg` configuration file found in the root folder.  
-**Note 3:** There is also a style for QtCreator but it doesn't cover all cases. In QtCreator `Tools->Options...->C++->Code Style->Import...` and choose the `codingStyleQtCreator.xml` file found in the root folder.  
 
 ### 1. Curly braces ###
 #### a. Function blocks, class/struct definitions, namespaces ####
@@ -12,43 +10,31 @@ int myFunction(int a)
     //code
 }
 
-void myFunction() {} // empty body
+myClass::myClass(int *parent)
-
-MyClass::MyClass(int *parent)
     : m_parent(parent)
 {
-    //initialize
+    //initialiaze
 }
 
-int MyClass::myMethod(int a)
+int myClass::myMethod(int a)
 {
     //code
 }
 
-class MyOtherClass
+class myOtherClass
 {
 public:
     //code
-    
 protected:
     //code
-    
 private:
     //code
 };
 
-namespace Name
+namespace id
 {
     //code
 }
-
-// Lambdas
-[](int arg1, int arg2) -> bool { return arg1 < arg2; }
-
-[this](int arg)
-{
-    this->acc += arg;
-}
 ```
 
 #### b. Other code blocks ####
@@ -89,16 +75,6 @@ default:
 }
 ```
 
-#### d. Brace enclosed initializers ####
-Unlike single-line functions, you must not insert spaces between the brackets and concluded expressions.<br/>
-But you must insert a space between the variable name and initializer.
-```c++
-Class obj {}; // empty
-Class obj {expr};
-Class obj {expr1, /*...,*/ exprN};
-QVariantMap map {{"key1", 5}, {"key2", 10}};
-```
-
 ### 2. If blocks ###
 #### a. Multiple tests ####
 ```c++
@@ -143,16 +119,16 @@ Generally it will depend on the particular piece of code and would be determined
 
 ### 4. File encoding and line endings.###
 
-UTF-8 and Unix-like line ending (LF). Unless some platform specific files need other encodings/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 initialization colon should be indented and in its own line along with first argument. The rest of the arguments should be indented too and have the comma prepended.
+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)
-    : m_a(a)
+    : priv_a(a)
-    , m_b(b)
+    , priv_b(b)
-    , m_c(c)
+    , priv_c(c)
-    , m_d(d)
+    , priv_d(d)
 {
     //code
 }
@@ -161,7 +137,7 @@ myClass::myClass(int a, int b, int c, int d)
 ### 6. Enums.###
 Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
 ```c++
-enum Days
+enum days
 {
     Monday,
     Tuesday,
@@ -173,74 +149,7 @@ enum Days
 };
 ```
 
-### 7. Names.###
+### 7. Misc.###
-All names should be camelCased.
-
-#### a. Type names and namespaces ####
-Type names and namespaces start with Upper case letter (except POD types).
-```c++
-class ClassName {};
-
-struct StructName {};
-
-enum EnumName {};
-
-typedef QList<ClassName> SomeList;
-
-namespace NamespaceName
-{
-}
-```
-
-#### b. Variable names ####
-Variable names start with lower case letter.
-```c++
-int myVar;
-```
-
-#### c. Private member variable names ####
-Private member variable names start with lower case letter and should have ```m_``` prefix.
-```c++
-class MyClass
-{
-    int m_myVar;
-}
-```
-
-### 8. Header inclusion order.###
-The headers should be placed in the following order:
- 1. Module header (in .cpp)
- 2. System/Qt/Boost etc. headers (splitted in subcategories if you have many).
- 3. Application headers, starting from *Base* headers.
-
-The headers should be ordered alphabetically within each group (subgroup).<br/>
-<br/>
-Example:
-```c++
-// examplewidget.cpp
-
-#include "examplewidget.h"
-
-#include <cmath>
-#include <cstdio>
-
-#include <QDateTime>
-#include <QList>
-#include <QString>
-#include <QUrl>
-
-#include <libtorrent/version.hpp>
-
-#include "base/bittorrent/session.h"
-#include "base/bittorrent/infohash.h"
-#include "base/utils/fs.h"
-#include "base/utils/misc.h"
-#include "base/utils/string.h"
-#include "ui_examplewidget.h"
-
-```
-
-### 9. Misc.###
 
 * Line breaks for long lines with operation:
 
@@ -250,51 +159,11 @@ a += "b"
   + "d";
 ```
 
-* **auto** keyword
-
-We allow the use of the **auto** keyword only where it is strictly necessary 
-(for example, to declare a lambda object, etc.), or where it **enhances** the readability of the code.
-Declarations for which one can gather enough information about the object interface (type) from its name 
-or the usage pattern (an iterator or a loop variable are good examples of clear patterns) 
-or the right part of the expression nicely fit here.<br/>
-<br/>
-When weighing whether to use an auto-typed variable please think about potential reviewers of your code, 
-who will read it as a plain diff (on github.com, for instance). Please make sure that such reviewers can 
-understand the code completely and without excessive effort.<br/>
-<br/>
-Some valid use cases:
-```c++
-template <typename List>
-void doSomethingWithList(const List &list)
-{
-    foreach (const auto &item, list) {
-        // we don't know item type here so we use 'auto' keyword
-        // do something with item
-    }
-}
-
-for (auto it = container.begin(), end = container.end(); it != end; ++it) {
-    // we don't need to know the exact iterator type,
-    // because all iterators have the same interface
-}
-
-auto spinBox = static_cast<QSpinBox*>(sender());
-// we know the variable type based on the right-hand expression
-```
-
 * Space around operations eg `a = b + c` or `a=b+c`:
 
-Before and after the assignment and other binary (and ternary) operators there should be a space.<br/>
+Before and after the assignment there should be a space. One exception could be: for loops.
-There should not be a space between increment/decrement and its operand.<br/>
-Some valid use cases:
 ```c++
-a += 20;
+for (int a=0; a<b; ++b) {
-a = (b <= MAX_B ? b : MAX_B);
-++a;
-b--;
-
-for (int a = 0; a < b; ++b) {
-    // code
 }
 ```
 
@@ -304,5 +173,5 @@ for (int a = 0; a < b; ++b) {
 
 * Method definitions aren't allowed in header files
 
-###10. Not covered above###
+###8. Not covered above###
 If something isn't covered above, just follow the same style the file you are editing has. If that particular detail isn't present in the file you are editing, then use whatever the rest of the project uses.

CONTRIBUTING.md

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

COPYING

@@ -12,15 +12,15 @@ exception statement from your version.
 
 ----------
 
-                    GNU GENERAL PUBLIC LICENSE
+		    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                        51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -70,7 +70,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                    GNU GENERAL PUBLIC LICENSE
+		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -269,7 +269,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -291,4 +291,64 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

Changelog

@@ -1,276 +1,3 @@
-* Sun Sep 11 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.7
-    - FEATURE: Delete torrent+files with Shift+Delete (pieniacy)
-    - BUGFIX: Fix 6-hour speedplot point push rate. Close #5545 (Daniel Segesdi)
-    - BUGFIX: Avoid spawning a new explorer.exe process when selecting "Open containing folder". Closes #5564. (Chocobo1)
-    - BUGFIX: Fix loading of new geoip db due to an artificial size limit. (SagePtr)
-    - BUGFIX: Better error handling and logging with smtp communication. (Brian Kendall)
-    - SEARCH: Remove KickassTorrents search engine (ngosang)
-    - SEARCH: Remove BTDigg search engine (ngosang)
-    - SEARCH: Update Torrentz search engine (ngosang)
-    
-* Wed Jul 20 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.6
-    - BUGFIX: Do not create save folder in advance (glassez)
-    - BUGFIX: Fix upper-bound limit of command line for "Run External Program" in Windows. Closes #5399. (Chocobo1)
-    - BUGFIX: Invoke system's cmd.exe directly. (Chocobo1)
-    - BUGFIX: Workaround space issues in file path for running external program on Windows. (Chocobo1)
-    - BUGFIX: Fix icons are missing when using RTL languages in Options dialog. Closes #5398. (Chocobo1)
-
-* Mon Jun 20 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.5
-    - FEATURE: Implement Torrent Management Mode(TMM) (glassez)
-    - FEATURE: New cookies management dialog and various related fixes (glassez)
-    - FEATURE: Use unique temp directories (temp_path/<truncated_torrent_hash>). Closes #5154. (glassez)
-    - FEATURE: Display notifications when a torrent is added. Closes #334 and #915. (sledgehammer999)
-    - FEATURE: Sort labels with natural sort algorithm in the right-click menu. Closes #3919. (Chocobo1)
-    - FEATURE: Add option to automatically remove .torrent files upon adding (Eugene Shalygin)
-    - FEATURE: Add option to bind directly to an IP instead of using a network Interface (Sjoerd van der Berg, sledgehammer999)
-    - FEATURE: Detailed tooltips on the progress and availability bars in the General button of each torrent. (Eugene Shalygin)
-    - FEATURE: Let user able to specifiy a filter when choosing an IP filter file (Chocobo1)
-    - FEATURE: Improve usability of "Run External Program". Users can write (platform dependent) shell scripts now. (Chocobo1)
-    - PERFORMANCE: Optimize drawing in speed graph (Anton Lashkov, Chocobo1)
-    - BUGFIX: Fix memory leak. (sledgehammer999)
-    - BUGFIX: Fix resizing bug in "add torrent dialog". Closes #5036. (Chocobo1)
-    - BUGFIX: Fix qBittorrent doesn't exit immediately when "all donwloads are done -> exit" option enabled. (glassez, Chocobo1)
-    - BUGFIX: Display the filepath when a torrent fails to load. Closes #100 and #805. (sledgehammer999)
-    - BUGFIX: Fix Add tracker dialog empty trackers (ngosang)
-    - BUGFIX: Fix Add tracker dialog URL download (ngosang)
-    - BUGFIX: Fix torrent adding with existing data (glassez)
-    - BUGFIX: Try to find incomplete files for new torrent (glassez)
-    - BUGFIX: Fix rechecking after torrent is finished (glassez)
-    - BUGFIX: Fix duplicate network interfaces. Closes #5131 (ngosang)
-    - BUGFIX: Fix .!qB extension is added when disabled (glassez)
-    - BUGFIX: Fix "IP Filtering - Apply to trackers" wasn't being applied. Closes #5217. (Chocobo1)
-    - BUGFIX: Don't resize the Country column needlessly (thalieht)
-    - BUGFIX: Fix crashing when exiting the program while the Options window was showing. Closes #4871, #5049. (Chocobo1)
-    - BUGFIX: Fix parsing of eMule .DAT filters. Closes #5281. (thalieht, sledgehammer999)
-    - WEBUI: Implement in setting/removing/showing categories. (buinsky)
-    - WEBUI: Add 'Added on' column in Webui. Closes #5145,#1092,#738 (Ibrahim Tachijian)
-    - WEBUI: Add command to get the logs (pmzqla)
-    - WEBUI: Expose Add trackers feature (pmzqla)
-    - WEBUI: Bump API_VERSION and API_VERSION_MIN to 10. (sledgehammer999)
-    - SEARCH: Implement search filters in the proxy model. (Eugene Shalygin)
-    - SEARCH: Optimize widgets inside of the search tab (Eugene Shalygin)
-    - SEARCH: Remove duplicated code from search tab and widget (Eugene Shalygin)
-    - SEARCH: Use nova2dl.py script instead of DownloadManager. Closes #5026. (glassez)
-    - SEARCH: Various UI cleanups and optimizations. (Chocobo1, ngosang)
-    - SEARCH: Fix Torrentz, Mininova, LegitTorrents, PirateBay plugins (ngosang)
-    - SEARCH: Fix toolbar resizing when m_searchFilter appears/disappears. Closes #5120. (Chocobo1)
-    - SEARCH: Use QPalette::LinkVisited color for downloaded items in search results (Eugene Shalygin)
-    - SEARCH: Update Python version requirements (min 2.7.9 / 3.3.0) (ngosang)
-    - SEARCH: Remove filters from Torrentreactor, BTDigg and Demonoid. It is done in the GUI now. (ngosang)
-    - RSS: default refresh interval to 30 mins (botmtl)
-    - COSMETIC: Improve TransferListDelegate::sizeHint (Chocobo1)
-    - COSMETIC: Fix long text clipping. Closes #5091. (Chocobo1)
-    - COSMETIC: Minor change in Stats dialog (ngosang)
-    - COSMETIC: Fix Update all button height in RSS tab (ngosang)
-    - COSMETIC: Disable `comboHideZero` when `checkHideZero` is unchecked. (Chocobo1)
-    - COSMETIC: Disable `checkLimituTPConnections` when `checkuTP` is unchecked. (Chocobo1)
-    - COSMETIC: Enable word wrap for "Run external program" help text (Chocobo1)
-    - COSMETIC: Fix mutually exclusive radio buttons can be unselected. (Chocobo1)
-    - COSMETIC: Set About tab font-size to default (zywo)
-    - COSMETIC: Improve wordings in "Auto download torrent" section (Chocobo1)
-    - COSMETIC: Change "Auto download torrent" default save path to "default location". (Chocobo1)
-    - COSMETIC: Change ambiguous text "Copy selected" to "Copy IP:port" (Chocobo1)
-    - COSMETIC: Improve error messages for "Auto download torrents" (Chocobo1)
-    - COSMETIC: Slim down 'Downloads' page of options window. (sledgehammer999)
-    - COSMETIC: Cleanup Connection page in Option dialog. Closes #845. (Chocobo1)
-    - COSMETIC: Fix reload button size is not the same size as "..." button in options dialog. (Chocobo1)
-    - WINDOWS: Let Windows handle all widgets scaling. (Chocobo1)
-    - WINDOWS: Improve stack trace for windows by including source filenames and line numbers (SeigneurSerpent)
-    - OSX: Fix qt5 bundle on OSX. Closes #4014. (sledgehammer999)
-    - OTHER: Make AddNewTorrentDialog behavior uniform (glassez)
-    - OTHER: Optimize the shutdown dialog (Chocobo1)
-    - OTHER: Enable access to shutdown functions when configured with `--disable-gui` option (Chocobo1)
-    - OTHER: Delete Import Torrent Dialog. Just use the "add new torrent" dialog. (glassez)
-    - OTHER: Optimize code for natural sorting (Chocobo1)
-    - OTHER: Use new alert dispathing API for libtorrent 1.1.x (glassez)
-    - OTHER: Fix gcc 6 compilation with qmake. See #5237. (sledgehammer999)
-
-
-* Tue Mar 29 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.4
-    - FEATURE: Download more pieces in "Download first and last pieces first" feature (ngosang)
-    - FEATURE: Unlock first column in peerlist too (thalieht)
-    - FEATURE: Add "Hide zero values" option. Closes #3543. (Chocobo1)
-    - FEATURE: Add a "remaining" column to the torrent content model (Ben Lau)
-    - FEATURE: Allow to toggle columns in peerlist (thalieht)
-    - FEATURE: Add ability to filter log messages by type. (sledgehammer999)
-    - FEATURE: Add ability to write the log to file. (sledgehammer999)
-    - FEATURE: Add 'never show again' checkbox/pref to auto-exit confirm dialog (d3fault, sledgehammer999, Chocobo1)
-    - PERFORMANCE: Perform fastresume data saving in separate thread (glassez)
-    - PERFORMANCE: Optimize session startup (glassez)
-    - BUGFIX: Save resume data using QSaveFile (Qt5 only). This reduces chances of corrupt files. (glassez)
-    - BUGFIX: Check torrent file permissions before opening (birdie-github)
-    - BUGFIX: Always update native session's announce_ip setting (Jesse Connop)
-    - BUGFIX: Fix loading *.magnet files from watched folders. Closes #4701. (sledgehammer999)
-    - BUGFIX: Fix upgrade corrupted fastresume file (glassez)
-    - BUGFIX: Fix total values for "Seeds" & "Peers" (Chocobo1)
-    - BUGFIX: Fix potential race condition. Closes #4742. (Chocobo1)
-    - BUGFIX: Don't merge trackers for private torrents. Closes #2928. (sledgehammer999)
-    - BUGFIX: Fix double buttons in "Add New Torrent" dialog. (Chocobo1)
-    - BUGFIX: Fix malformed date header in email. Closes #4828. (Chocobo1)
-    - BUGFIX: Save "Run external program" input as is. Closes #4830. (Chocobo1)
-    - BUGFIX: Enable "filename" column in peers list again. Crash is fixed now. (Eugene Shalygin)
-    - BUGFIX: Don't display warning when folder name stayed the same after rename. (sledgehammer999)
-    - BUGFIX: Fix selection of Portuguese translation files. (sledgehammer999)
-    - BUGFIX: Fix selection of Esperanto locale. Closes #4999. (sledgehammer999)
-    - BUGFIX: Fix "caja" file manager opens the file instead of opens the directory. Closes #5003. (Chocobo1)
-    - BUGFIX: Fix periodic latency spikes on Windows with WiFi connections. Closes #4209. (sledgehammer999)
-    - BUGFIX: Potentially fix a random crash coming from the sidepanel (sledgehammer999, ngosang)
-    - WEBUI: Fix max_ratio precision. Closes #4707 (ngosang)
-    - WEBUI: Fix JavaScript exception on WebUI load (buinsky)
-    - WEBUI: Fix translation (buinsky)
-    - WEBUI: Submit the label in the new label dialog on pressing enter key (buinsky)
-    - WEBUI: Check WebUI username and password length. Closes #4191 (ngosang)
-    - WEBUI: Minor changes in CSS styles (ngosang)
-    - WEBUI: Add "Added on" and "Completion on" fields to query/torrents query response (buinsky)
-    - WEBUI: Do not try to parse request message when content-length is 0 (Dan Seminara)
-    - WEBUI: Support SSL certificate bundles. Issue #4896. (UnDifferential)
-    - WEBUI: Change the order of the values of speed labels (buinsky)
-    - WEBUI: Bump WebUI API_VERSION
-    - SEARCH: Update PirateBay plugin. (ngosang)
-    - SEARCH: Added TorLock search engine (ngosang)
-    - COSMETIC: Fix splash screen staying on top of all windows. Closes #1391. (sledgehammer999)
-    - COSMETIC: Rearrange advanced settings (Chocobo1)
-    - COSMETIC: Cleanup "about" dialog (Chocobo1)
-    - COSMETIC: Cleanup "Add New Torrent" dialog (Chocobo1)
-    - COSMETIC: Use short date in addnewtorrentdialog (Chocobo1)
-    - COSMETIC: Change "Free disk space" to "Free space on disk" (Chocobo1)
-    - COSMETIC: Let OS handle DPI scaling for now. Should let Qt do the work when it's more mature. (Chocobo1)
-    - COSMETIC: Put comment_lbl in QScrollArea. Closes #4881. (Chocobo1)
-    - COSMETIC: Change the order of the values of speed labels (buinsky)
-    - COSMETIC: Cleanup the Log tab (Chocobo1)
-    - COSMETIC: Cleanup the RSS tab (Chocobo1)
-    - OTHER: Set "Show splash screen on start up" option default to off (Chocobo1)
-    - OTHER: Support for cross-compilation with MXE (Boris Nagaev)
-    - OTHER: Add basic (and unofficial) cmake support (Eugene Shalygin)
-    - OTHER: Move some URLs overs to https (funkydude)
-    - OTHER: Add appveyor support (Chocobo1)
-    - OTHER: TravisCI: switch to Trusty image. Closes #4953. (Chocobo1)
-    - OTHER: Many other internal code restructuring, cleaning and fixing.
-
-* Thu Jan 21 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.3
-    - BUGFIX: Temporarily disable "filename" column of peers view. It has a bug that causes frequent crashes. See issue #4597.
-    - WEBUI: Move style of dynamic table header to CSS (buinsky)
-    - WEBUI: Fix unnecessary updates of torrent peers table (buinsky)
-
-* Tue Jan 19 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.2
-    - FEATURE: Add a new column to peers list that shows list of files which are downloaded right now from a peer. (evsh)
-    - FEATURE: Improve the "Watch folders" UI. Closes #4300. You'll need to redo your watch folders settings. (sledgehammer999, glassez)
-    - FEATURE: Support loading multiple magnets/hashes/urls per .magnet file in the watched folder(one per line). Closes #217. (sledgehammer999)
-    - BUGFIX: Fix resolution of peer host names. Closes #4307. (sledgehammer999)
-    - BUGFIX: Don't recheck twice after 'Force Recheck' with 'Recheck torrents on completion' enabled. Closes #4274. (sledgehammer999)
-    - BUGFIX: Don't apply some settings again if they weren't changed. Closes #4278. (sledgehammer999)
-    - BUGFIX: Update ISO 3166 country codes. Closes #3942. (Chocobo1)
-    - BUGFIX: Fix moving torrents to Temp after app restart. Closes #4434. (glassez)
-    - BUGFIX: Fix crash in favicon code due to null pointer dereference. (glassez)
-    - BUGFIX: Move the 'qBittorrent-resume' file even when no magnets were recovered. Also make sure to rename it with a unique name. Closes #4334. (sledgehammer999)
-    - BUGFIX: Don't add the watch folder before the user closes the Preferences window. (sledgehammer999)
-    - BUGFIX: Remove watch folders permanently only if the user accepts the Preferences dialog. (sledgehammer999)
-    - BUGFIX: Better handling of cookies in the download manager (glassez)
-    - BUGFIX: Use the download manager for RSS, the program updater and the dns updater. (glassez)
-    - BUGFIX: Fix reconfigure additional trackers (glassez)
-    - BUGFIX: Fix loading corrupted .fastresume file (glassez)
-    - WEBUI: Show filtered torrents number (buinsky)
-    - WEBUI: Fix paused, active and inactive filters (buinsky)
-    - WEBUI: Fixed bug when uploading several files and only the last one was considered. (naikel)
-    - WEBUI: Implemented WebUI interface for the new Watched Folders feature (naikel)
-    - WEBUI: Fix possible showing "qBittorrent client is not reachable" message on deleting torrents. (buinsky)
-    - WEBUI: Don't show "Limit download speed" menu item for downloaded torrents. (buinsky)
-    - WEBUI: Update webui run program parameters (buinsky)
-    - WEBUI: Allow to remove the label assigned to a torrent (pmzqla)
-    - WEBUI: Repair translation (buinsky)
-    - WEBUI: Remember last opened tab (buinsky)
-    - WEBUI: Bump WebUI API_VERSION and API_VERSION_MIN.
-    - COSMETIC: Update native names for Chinese locales. Closes #4381. (sledgehammer999)
-    - COSMETIC: Rename column header in Content view. (Chocobo1)
-    - COSMETIC: Edit speed limits and upload ratio icons (buinsky)
-    - SEARCH: Code refactoring. (glassez)
-    - SEARCH: Fix PirateBay plugin implementation for Python 3 (ngosang)
-    - SEARCH: Update PirateBay URL. Closes #4470 (ngosang)
-    - RSS: Code refactoring. (glassez)
-    - LINUX: Fix build. (sledgehammer999)
-    - OSX: Set qBittorrent as default torrent app in  Mac OS (dmitry.viktorov)
-    - OTHER: Fix lrelease version due to the default Qt5 build (Fabio Alessandro Locati)
-    - OTHER: Indicate to the user that he's going to download the new version. Indicate from the installer that the old version was detected and no settings will be deleted. Closes #4320. (sledgehammer999)
-    - OTHER: Don't require GUI libs for qt4 nox build. Closes #4404. (sledgehammer999)
-    - OTHER: Fix cross-compilation (bnagaev)
-    - OTHER: Allow GeoIP in nox builds (glassez)
-
-* Tue Dec 08 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.1
-    - FEATURE: New "Set as default label" option in Add torrent dialog. (takiz)
-    - FEATURE: Support wildcards for filtering torrent list and torrent content (vlakoff)
-    - BUGFIX: Fix -1 is displayed instead of the infinity symbol (Chocobo1)
-    - BUGFIX: Fix scan dirs settings saving. Closes #4254, #4239, #4187. (glassez)
-    - BUGFIX: Exported torrents now use name instead of hash. Closes #4205. (glassez)
-    - BUGFIX: Improve upgrade to v3.3.0. Now undownloaded magnets will be migrated too. Fixes #4195. (glassez)
-    - BUGFIX: Fix wrong encoding for listen failed error message. (glassez)
-    - BUGFIX: Fix RSS not automarking articles as read. (glassez)
-    - BUGFIX: Fix possible deadlock during application exit. (sledgehammer999)
-    - WEBUI: Cookies support on WebUI when downloading torrent from a URL. (Naikel Aparicio)
-    - WEBUI: Modified download and upload windows to allow autocompletion of browsers. (Naikel Aparicio)
-    - WEBUI: Fixed the spinner in the WebUI upload page. (Naikel Aparicio)
-    - WEBUI: Modified height of the WebUI download page. (Naikel Aparicio)
-    - WEBUI: Fixed all the JavaScript functions for download and upload pages. (Naikel Aparicio)
-    - WEBUI: Add seeds tab to WebUI (buinsky)
-    - WEBUI: Bump WebUI API_VERSION.
-    - COSMETIC: Cleanup "Trackers", "Peers", "HTTP Sources", "Speed" and "Content" page layout (Chocobo1)
-    - COSMETIC: Reduce mainwindow border width (Chocobo1)
-    - COSMETIC: Use QLineEdit built-in ClearButton (Qt5 only) (Chocobo1)
-    - COSMETIC: Change text description for half-open connection (Chocobo1)
-    - OTHER: Change update URL to FossHub. Closes #4188. (sledgehammer999)
-    
-
-* Sun Nov 29 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.0
-    - FEATURE: Huge core code refactoring. Problems with labels, temp folders etc should be eliminated. Smoother UI should be observed too. (glassez)
-    - FEATURE: Speed graph (Anton Lashkov)
-    - FEATURE: Add multiple peers in Peers addition dialog. Closes #1563, #2245, #3133, #1419, #3287, #1419 (ngosang)
-    - FEATURE: Allow to copy all peers with a keyboard shortcut (ngosang)
-    - FEATURE: Use GeoIP2 database, allows for country resolution of IPv6 peers. It is no longer embedded in the program but downloaded and updated monthly. (glassez)
-    - FEATURE: Add more "Run External Program" parameters, closes #3053, #238, #1291, #1522. (Chocobo1, glassez)
-    - FEATURE: Add an option to allow the use of proxies only for torrents. Closes #2701. (pmzqla)
-    - FEATURE: Detect network interface state changes. It should detect VPN connection resets. (Pawel Polewicz)
-    - FEATURE: Switch to using c++11 (glassez)
-    - FEATURE: Automatically add trackers to new downloads. (ngosang)
-    - FEATURE: You can now choose the path to download for watched folders. (dsimakov, sledgehammer999)
-    - FEATURE: Switch to Qt5 by default.
-    - BUGFIX: Fix progress calculation in Content tab. Closes #2639 Closes #2752 (ngosang)
-    - BUGFIX: Fix label filter. Closes #3429. (glassez)
-    - BUGFIX: Fix "Run External Program Launches too Early" issue, closes #2107. (Chocobo1)
-    - BUGFIX: Don't remove torrent contents parent folder, even it is empty. Closes #2244. (Chocobo1)
-    - BUGFIX: Always apply filter for manually banned IPs. Related #3988. (sledgehammer999)
-    - BUGFIX: Fix reporting of tracker status. Closes #3101. (sledgehammer999)
-    - BUGFIX: Don't connect to "any interface" when the configured network interface is missing. Closes #3943, #2741, #1159, #844 and #143. (sledgehammer999)
-    - BUGFIX: Fix reordering of first column with Qt5. Closes #2835. (sledgehammer999)
-    - COSMETIC: Add back "qBittorrent" in program updater title, closes #3549. (Chocobo1)
-    - COSMETIC: Use infinity symbol rather than -1 for nb_connections (pmzqla)
-    - COSMETIC: Move uTP options to it's own section (Chocobo1)
-    - COSMETIC: Fix availability bar & progress bar height being too small on high DPI displays (Chocobo1)
-    - COSMETIC: Fix availability label & progress label clipped on high DPI displays, closes #3237. (Chocobo1)
-    - COSMETIC: Add tooltips/legend for availability bar & progress bar (Chocobo1)
-    - COSMETIC: Use theme color for background in PropertiesWidget (Chocobo1)
-    - COSMETIC: Replace horizontal line with border in bottom panel (Chocobo1)
-    - COSMETIC: Various visual changes in the side panel. (Chocobo1)
-    - COSMETIC: Use thin border for transfer list (Chocobo1)
-    - COSMETIC: Make URL in "Add Torrent File..." clickable. Closes #3928. (Chocobo1)
-    - COSMETIC: New view for errored torrents. (sledgehammer999)
-    - WEBUI: Add information in General tab (ngosang)
-    - WEBUI: Reorder "Super seeding mode" option in right click menu (ngosang)
-    - WEBUI: Clean up JavaScript code (ngosang)
-    - WEBUI: Added labels support. #648 (Felipe Barriga Richards, ngosnag)
-    - WEBUI: Fix accessing the WebUI through IPv6 (ngosang)
-    - WEBUI: Bump WebUI API_VERSION to 6.
-    - WEBUI: Change selected color to differentiate from the progressbar. (Daniel Peukert, ngosang)
-    - SEARCH: Add "Copy description page URL" button in search tab. Closes #2371. (pmzqla)
-    - SEARCH: Add https_proxy env variable. This forces Python to use the HTTP proxy for HTTPS connections. (pmzqla)
-    - SEARCH: Detect new plugin URL from clipboard (ngosang)
-    - SEARCH: Update Torrentz trackers (ngosang)
-    - WINDOWS: Fix german translation of the installer (netswap)
-    - NOX: Don't ask the user questions in nox build when in non-interactive mode. Closes #3875. (sledgehammer999)
-    - OTHER: Fixed typos, spelling correction (dartraiden)
-    - OTHER: Fix need for restart to enable/disable peer countries resolution. (glassez)
-    - OTHER: Unload the GeoIP db when disabled. (sledgehammer999)
-    - OTHER: Reduce max value of "Disk cache size" to 1536MB for 32bit. Closes to #4028. (Chocobo1)
-    - OTHER: Make "Download in sequential order" and "Download first and last piece first" options independent. (glassez)
-
 * Sun May 10 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.0
     - FEATURE: Show actual protocol for listen success/failure in the log. Needs libtorrent v1.0.0 (Gelmir)
     - FEATURE: Support per tracker re-announce. Needs libtorrent v1.0.0 (Gelmir)

INSTALL

@@ -14,11 +14,15 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 1.0.6)
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.15.0)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 
-    - libboost >= 1.35.x (libboost-system)
+    - libboost 1.34.x (libboost-filesystem°) + libasio
+      or
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem°)
+      
+    °libboost-filesystem is not needed if libtorrent-rasterbar >= v0.16.x is used
 
     - python >= 2.3 (needed by search engine)
         * Run time only dependency
@@ -40,7 +44,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= v1.0.6)
+    - libtorrent-rasterbar by Arvid Norberg (>= v0.15.0)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 

README.md

@@ -1,11 +1,9 @@
 qBittorrent - A BitTorrent client in Qt
 ------------------------------------------
 
-[![TravisCI Status](https://travis-ci.org/qbittorrent/qBittorrent.svg?branch=master)](https://travis-ci.org/qbittorrent/qBittorrent)
+[![Build Status](https://travis-ci.org/qbittorrent/qBittorrent.png?branch=master)](https://travis-ci.org/qbittorrent/qBittorrent)
-[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/qbittorrent/qBittorrent?branch=master&svg=true)](https://ci.appveyor.com/project/qbittorrent/qBittorrent)
-[![Coverity Status](https://scan.coverity.com/projects/5494/badge.svg)](https://scan.coverity.com/projects/5494)
 ********************************
-### Description:
+###Description:
 qBittorrent is a bittorrent client programmed in C++ / Qt that uses
 libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
 
@@ -14,7 +12,7 @@ out there. qBittorrent is fast, stable and provides unicode
 support as well as many features.
 
 This product includes GeoLite data created by MaxMind, available from
-https://www.maxmind.com/
+http://maxmind.com/
 
 ### Installation:
 For installation, follow the instructions from INSTALL file, but simple:
@@ -27,22 +25,12 @@ qbittorrent
 
 will install and execute qBittorrent hopefully without any problem.
 
-### Public key:
-Starting from v3.3.4 all source tarballs and binaries are signed.<br />
-The key currently used is 4096R/[5B7CC9A2](https://pgp.mit.edu/pks/lookup?op=get&search=0x6E4A2D025B7CC9A2) with fingerprint `D8F3DA77AAC6741053599C136E4A2D025B7CC9A2`.<br />
-You can also download it from [here](https://github.com/qbittorrent/qBittorrent/raw/master/5B7CC9A2.asc).<br />
-**PREVIOUSLY** the following key was used to sign the v3.3.4 source tarballs and v3.3.4 Windows installer **only**: 4096R/[520EC6F6](https://pgp.mit.edu/pks/lookup?op=get&search=0xA1ACCAE4520EC6F6) with fingerprint `F4A5FD201B117B1C2AB590E2A1ACCAE4520EC6F6`.<br />
-
-### Misc:
 For more information please visit:
 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
 
@@ -51,3 +39,4 @@ You can also meet me (sledgehammer_999) on IRC:
 
 ------------------------------------------
 sledgehammer999 <sledgehammer999@qbittorrent.org>
+

README.os2

@@ -26,7 +26,7 @@ How to build
 First you need to create the conf.pri file in the same dir as this readme.os2 is.
 the conf.pri file has the following content:
 
-##### conf.pri content begin #####
+##### conf.pri content beginn #####
 BINDIR = ./bin
 INCDIR = ./include
 LIBDIR = ./lib

appveyor.yml

@@ -1,52 +0,0 @@
-version: '{branch}-{build}'
-
-# Do not build on tags (GitHub only)
-skip_tags: true
-
-os: Visual Studio 2015
-
-environment:
-  REPO_DIR: &REPO_DIR c:\qbittorrent
-  CACHE_DIR: &CACHE_DIR c:\qbt_cache
-
-  QBT_VER_URL: http://builds.shiki.hu/appveyor/version
-  QBT_LIB_URL: http://builds.shiki.hu/appveyor/qbt_libraries.7z
-
-# project directory
-clone_folder: *REPO_DIR
-
-# cache size should < 100MB (after compressing with fastest option):
-# see: https://www.appveyor.com/docs/build-cache#save-update-cache-before-build-finishes
-cache:
-  - *CACHE_DIR
-
-install:
-  # check if library needs update
-  - appveyor DownloadFile "%QBT_VER_URL%" -FileName "c:\version_new" && SET /P newVersion=<"c:\version_new"
-  - IF EXIST "%CACHE_DIR%\version" (SET /P oldVersion=<"%CACHE_DIR%\version")
-  - IF NOT EXIST "%CACHE_DIR%\version" (SET updateCache=1)
-  - IF NOT "%oldVersion%" == "%newVersion%" (SET updateCache=1)
-  # update library
-  - IF "%updateCache%" == "1" (ECHO "--- Will redownload libraries ---" &&
-      RMDIR /S /Q "%CACHE_DIR%" & MKDIR "%CACHE_DIR%" &&
-      appveyor DownloadFile "%QBT_LIB_URL%" -FileName "c:\qbt_lib.7z" && 7z x "c:\qbt_lib.7z" -o"%CACHE_DIR%" > nul &&
-      COPY "c:\version_new" "%CACHE_DIR%\version")
-  # Qt stay compressed in cache
-  - 7z x "%CACHE_DIR%\qt5_32.7z" -o"c:\qbt" > nul
-
-before_build:
-  # setup env
-  - CALL "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvars32.bat"
-  - SET PATH=%PATH%;c:\qbt\qt5_32\bin;%CACHE_DIR%\jom;
-  # setup project
-  - COPY /Y "%CACHE_DIR%\winconf.pri" "%REPO_DIR%"
-  - COPY /Y "%CACHE_DIR%\winconf-msvc.pri" "%REPO_DIR%"
-  # workarounds
-  - MKLINK /J "c:\qbt\base" "%CACHE_DIR%\base"
-
-build_script:
-  - cd "%REPO_DIR%"
-  - qmake qbittorrent.pro && cd src && qmake src.pro
-  - jom -j2 -f Makefile.Release
-
-test: off

bootstrap.sh

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

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -1,106 +0,0 @@
-# - Try to find libtorrent-rasterbar
-#
-# If not using pkg-config, you can pre-set LibtorrentRasterbar_CUSTOM_DEFINITIONS
-# for definitions unrelated to Boost's separate compilation (which are already
-# decided by the LibtorrentRasterbar_USE_STATIC_LIBS variable).
-#
-# Once done this will define
-#  LibtorrentRasterbar_FOUND - System has libtorrent-rasterbar
-#  LibtorrentRasterbar_INCLUDE_DIRS - The libtorrent-rasterbar include directories
-#  LibtorrentRasterbar_LIBRARIES - The libraries needed to use libtorrent-rasterbar
-#  LibtorrentRasterbar_DEFINITIONS - Compiler switches required for using libtorrent-rasterbar
-#  LibtorrentRasterbar_OPENSSL_ENABLED - libtorrent-rasterbar uses and links against OpenSSL
-
-find_package(Threads REQUIRED)
-find_package(PkgConfig QUIET)
-
-if(PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_LIBTORRENT_RASTERBAR QUIET libtorrent-rasterbar)
-endif()
-
-if(LibtorrentRasterbar_USE_STATIC_LIBS)
-    set(LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
-endif()
-
-if(PC_LIBTORRENT_RASTERBAR_FOUND)
-    set(LibtorrentRasterbar_DEFINITIONS ${PC_LIBTORRENT_RASTERBAR_CFLAGS})
-else()
-    if(LibtorrentRasterbar_CUSTOM_DEFINITIONS)
-        set(LibtorrentRasterbar_DEFINITIONS ${LibtorrentRasterbar_CUSTOM_DEFINITIONS})
-    else()
-        # Without pkg-config, we can't possibly figure out the correct build flags.
-        # libtorrent is very picky about those. Let's take a set of defaults and
-        # hope that they apply. If not, you the user are on your own.
-        set(LibtorrentRasterbar_DEFINITIONS
-            -DTORRENT_USE_OPENSSL
-            -DTORRENT_DISABLE_GEO_IP
-            -DBOOST_ASIO_ENABLE_CANCELIO
-            -DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64)
-    endif()
-
-    if(NOT LibtorrentRasterbar_USE_STATIC_LIBS)
-        list(APPEND LibtorrentRasterbar_DEFINITIONS
-            -DTORRENT_LINKING_SHARED
-            -DBOOST_SYSTEM_DYN_LINK -DBOOST_CHRONO_DYN_LINK)
-    endif()
-endif()
-
-message(STATUS "libtorrent definitions: ${LibtorrentRasterbar_DEFINITIONS}")
-
-find_path(LibtorrentRasterbar_INCLUDE_DIR libtorrent
-          HINTS ${PC_LIBTORRENT_RASTERBAR_INCLUDEDIR} ${PC_LIBTORRENT_RASTERBAR_INCLUDE_DIRS}
-          PATH_SUFFIXES libtorrent-rasterbar)
-
-find_library(LibtorrentRasterbar_LIBRARY NAMES torrent-rasterbar libtorrent
-             HINTS ${PC_LIBTORRENT_RASTERBAR_LIBDIR} ${PC_LIBTORRENT_RASTERBAR_LIBRARY_DIRS})
-
-if(LibtorrentRasterbar_USE_STATIC_LIBS)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ${LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-endif()
-
-set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIR})
-
-if(NOT Boost_SYSTEM_FOUND OR NOT Boost_CHRONO_FOUND OR NOT Boost_RANDOM_FOUND)
-    find_package(Boost REQUIRED COMPONENTS date_time system chrono random thread)
-    set(LibtorrentRasterbar_LIBRARIES
-        ${LibtorrentRasterbar_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-    set(LibtorrentRasterbar_INCLUDE_DIRS
-        ${LibtorrentRasterbar_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-endif()
-
-list(FIND LibtorrentRasterbar_DEFINITIONS -DTORRENT_USE_OPENSSL LibtorrentRasterbar_ENCRYPTION_INDEX)
-if(LibtorrentRasterbar_ENCRYPTION_INDEX GREATER -1)
-    find_package(OpenSSL REQUIRED)
-    set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} ${OPENSSL_LIBRARIES})
-    set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS})
-    set(LibtorrentRasterbar_OPENSSL_ENABLED ON)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LibtorrentRasterbar_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(LibtorrentRasterbar DEFAULT_MSG
-                                  LibtorrentRasterbar_LIBRARY
-                                  LibtorrentRasterbar_INCLUDE_DIR
-                                  Boost_SYSTEM_FOUND
-                                  Boost_CHRONO_FOUND
-                                  Boost_RANDOM_FOUND)
-
-mark_as_advanced(LibtorrentRasterbar_INCLUDE_DIR LibtorrentRasterbar_LIBRARY
-    LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES
-    LibtorrentRasterbar_ENCRYPTION_INDEX)
-
-if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::LibTorrent)
-    add_library(LibtorrentRasterbar::LibTorrent UNKNOWN IMPORTED)
-
-    set_target_properties(LibtorrentRasterbar::LibTorrent PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-        IMPORTED_LOCATION "${LibtorrentRasterbar_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"
-        INTERFACE_LINK_LIBRARIES "${LibtorrentRasterbar_LIBRARIES}"
-        INTERFACE_COMPILE_OPTIONS "${LibtorrentRasterbar_DEFINITIONS}"
-    )
-endif()

cmake/Modules/FindQtSingleApplication.cmake

@@ -1,94 +0,0 @@
-# - Try to find the QtSingleApplication includes and library
-# which defines
-#
-# QTSINGLEAPPLICATION_FOUND - system has QtSingleApplication
-# QTSINGLEAPPLICATION_INCLUDE_DIR - where to find header QtSingleApplication
-# QTSINGLEAPPLICATION_LIBRARIES - the libraries to link against to use QtSingleApplication
-# QTSINGLEAPPLICATION_LIBRARY - where to find the QtSingleApplication library (not for general use)
-
-# copyright (c) 2013 TI_Eugene ti.eugene@gmail.com
-#
-# Redistribution and use is allowed according to the terms of the FreeBSD license.
-
-SET(QTSINGLEAPPLICATION_FOUND FALSE)
-
-IF(QT4_FOUND)
-    message(STATUS "Looking for Qt4 single application library")
-    FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication
-                # standard locations
-                /usr/include
-                /usr/include/QtSolutions
-                # qt4 location except mac's frameworks
-                "${QT_INCLUDE_DIR}/QtSolutions"
-                # mac's frameworks
-                ${FRAMEWORK_INCLUDE_DIR}/QtSolutions
-    )
-
-    SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES}
-        QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
-    FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
-        NAMES ${QTSINGLEAPPLICATION_NAMES}
-        PATHS ${QT_LIBRARY_DIR}
-    )
-ELSEIF(Qt5Widgets_FOUND)
-    message(STATUS "Looking for Qt5 single application library")
-    FOREACH(TOP_INCLUDE_PATH in ${Qt5Widgets_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
-        FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication ${TOP_INCLUDE_PATH}/QtSolutions)
-
-        IF(QTSINGLEAPPLICATION_INCLUDE_DIR)
-            BREAK()
-        ENDIF()
-    ENDFOREACH()
-
-    SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES}
-        Qt5Solutions_SingleApplication-2.6 libQt5Solutions_SingleApplication-2.6
-        QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
-    GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION)
-    GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
-
-    FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
-        NAMES ${QTSINGLEAPPLICATION_NAMES}
-        PATHS ${QT5_WIDGETSLIBRARYPATH}
-    )
-ENDIF()
-
-IF (QTSINGLEAPPLICATION_LIBRARY AND QTSINGLEAPPLICATION_INCLUDE_DIR)
-
-    SET(QTSINGLEAPPLICATION_LIBRARIES ${QTSINGLEAPPLICATION_LIBRARY})
-    SET(QTSINGLEAPPLICATION_FOUND TRUE)
-
-    IF (CYGWIN)
-        IF(BUILD_SHARED_LIBS)
-        # No need to define QTSINGLEAPPLICATION_USE_DLL here, because it's default for Cygwin.
-        ELSE(BUILD_SHARED_LIBS)
-        SET (QTSINGLEAPPLICATION_DEFINITIONS -DQTSINGLEAPPLICATION_STATIC)
-        ENDIF(BUILD_SHARED_LIBS)
-    ENDIF (CYGWIN)
-
-ENDIF (QTSINGLEAPPLICATION_LIBRARY AND QTSINGLEAPPLICATION_INCLUDE_DIR)
-
-IF (QTSINGLEAPPLICATION_FOUND)
-  IF (NOT QtSingleApplication_FIND_QUIETLY)
-    MESSAGE(STATUS "Found QtSingleApplication: ${QTSINGLEAPPLICATION_LIBRARY}")
-    MESSAGE(STATUS "         includes: ${QTSINGLEAPPLICATION_INCLUDE_DIR}")
-  ENDIF (NOT QtSingleApplication_FIND_QUIETLY)
-ELSE (QTSINGLEAPPLICATION_FOUND)
-  IF (QtSingleApplication_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find QtSingleApplication library")
-  ENDIF (QtSingleApplication_FIND_REQUIRED)
-ENDIF (QTSINGLEAPPLICATION_FOUND)
-
-MARK_AS_ADVANCED(QTSINGLEAPPLICATION_INCLUDE_DIR QTSINGLEAPPLICATION_LIBRARY)
-
-if(NOT TARGET QtSingleApplication::QtSingleApplication)
-    add_library(QtSingleApplication::QtSingleApplication UNKNOWN IMPORTED)
-    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}"
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}"
-    )
-    if(EXISTS "${QTSINGLEAPPLICATION_LIBRARY}")
-    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-        IMPORTED_LOCATION "${QTSINGLEAPPLICATION_LIBRARY}")
-    endif()
-endif(NOT TARGET QtSingleApplication::QtSingleApplication)

cmake/Modules/FindSystemd.cmake

@@ -1,23 +0,0 @@
-#######
-# Find systemd service dir
-# sets variables
-# SYSTEMD_FOUND
-# SYSTEMD_SERVICES_INSTALL_DIR
-if (NOT SYSTEMD_FOUND)
-    pkg_check_modules(SYSTEMD "systemd")
-endif(NOT SYSTEMD_FOUND)
-
-if (SYSTEMD_FOUND AND "${SYSTEMD_SERVICES_INSTALL_DIR}" STREQUAL "")
-    execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE}
-        --variable=systemdsystemunitdir systemd
-        OUTPUT_VARIABLE SYSTEMD_SERVICES_INSTALL_DIR)
-    string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_SERVICES_INSTALL_DIR
-        "${SYSTEMD_SERVICES_INSTALL_DIR}")
-elseif (NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR)
-    message (FATAL_ERROR "Variable SYSTEMD_SERVICES_INSTALL_DIR is\
-        defined, but we can't find systemd using pkg-config")
-endif()
-
-if (SYSTEMD_FOUND)
-    message(STATUS "systemd services install dir: ${SYSTEMD_SERVICES_INSTALL_DIR}")
-endif(SYSTEMD_FOUND)

cmake/Modules/MacroConfigureMSVCRuntime.cmake

@@ -1,38 +0,0 @@
-macro(configure_msvc_runtime)
-    if(MSVC)
-        # Default to statically-linked runtime.
-        if("${MSVC_RUNTIME}" STREQUAL "")
-            set(MSVC_RUNTIME "static")
-        endif()
-        # Set compiler options.
-        set(variables
-            CMAKE_C_FLAGS_DEBUG
-            CMAKE_C_FLAGS_MINSIZEREL
-            CMAKE_C_FLAGS_RELEASE
-            CMAKE_C_FLAGS_RELWITHDEBINFO
-            CMAKE_CXX_FLAGS_DEBUG
-            CMAKE_CXX_FLAGS_MINSIZEREL
-            CMAKE_CXX_FLAGS_RELEASE
-            CMAKE_CXX_FLAGS_RELWITHDEBINFO
-        )
-        if(${MSVC_RUNTIME} STREQUAL "static")
-            message(STATUS
-                "MSVC -> forcing use of statically-linked runtime."
-            )
-            foreach(variable ${variables})
-                if(${variable} MATCHES "/MD")
-                    string(REGEX REPLACE "/MD" "/MT" ${variable} "${${variable}}")
-                endif()
-            endforeach()
-        else()
-            message(STATUS
-                "MSVC -> forcing use of dynamically-linked runtime."
-            )
-            foreach(variable ${variables})
-                if(${variable} MATCHES "/MT")
-                    string(REGEX REPLACE "/MT" "/MD" ${variable} "${${variable}}")
-                endif()
-            endforeach()
-        endif()
-    endif()
-endmacro()

cmake/Modules/MacroLinkQtComponents.cmake

@@ -1,16 +0,0 @@
-# - macro similar to target_link_libraries, which links Qt components
-# names of the components are pased in Qt4/Qt5 agnostic way (Core, DBus, Xml...)
-# and the macro links Qt4 ones if QT4_FOUND is set or Qt5 ones if not
-
-macro (target_link_qt_components target)
-if (QT4_FOUND)
-    foreach(_cmp ${ARGN})
-        list(APPEND _QT_CMPNTS "Qt4::Qt${_cmp}")
-    endforeach()
-else (QT4_FOUND)
-    foreach(_cmp ${ARGN})
-        list(APPEND _QT_CMPNTS "Qt5::${_cmp}")
-    endforeach()
-endif (QT4_FOUND)
-    target_link_libraries(${target} ${_QT_CMPNTS})
-endmacro()

cmake/Modules/QbtTargetSources.cmake

@@ -1,17 +0,0 @@
-# a helper function which appends source to the main qBt target
-# the target name is read from QBT_TARGET_NAME variable
-# sources file names are relative to the the ${qbt_executable_SOURCE_DIR}
-
-function (qbt_target_sources)
-    set (_sources_rel "")
-    foreach (_source IN ITEMS ${ARGN})
-        if (IS_ABSOLUTE "${_source}")
-            set(source_abs "${_source}")
-        else()
-            get_filename_component(_source_abs "${_source}" ABSOLUTE)
-        endif()
-        file (RELATIVE_PATH _source_rel "${qbt_executable_SOURCE_DIR}" "${_source_abs}")
-        list (APPEND _sources_rel "${_source_rel}")
-    endforeach()
-    target_sources (${QBT_TARGET_NAME} PRIVATE "${_sources_rel}")
-endfunction (qbt_target_sources)

cmake/Modules/winconf-mingw.cmake

@@ -1,14 +0,0 @@
-if (STACKTRACE_WIN)
-    if ("${WINXXBITS}" NOT STREQUAL "Win64")
-        add_compile_options(-fno-omit-frame-pointer)
-    endif ("${WINXXBITS}" NOT STREQUAL "Win64")
-    link_libraries(libdbghelp  -Wl,--export-all-symbols)
-endif (STACKTRACE_WIN)
-
-if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
-    link_libraries(-Wl,--dynamicbase)
-endif()
-
-# LIBS += libadvapi32 libshell32 libuser32
-# LIBS += libcrypto.dll libssl.dll libwsock32 libws2_32 libz libiconv.dll
-# LIBS += libpowrprof

cmake/Modules/winconf-msvc.cmake

@@ -1,21 +0,0 @@
-if (STACKTRACE_WIN)
-    if ("${WINXXBITS}" STREQUAL "Win64")
-        add_compile_options(-Zi)
-    else ("${WINXXBITS}" STREQUAL "Win64")
-        # i686 arch requires frame pointer preservation
-        add_compile_options(-Oy-)
-    endif ("${WINXXBITS}" STREQUAL "Win64")
-    link_libraries(dbghelp.lib)
-endif (STACKTRACE_WIN)
-
-# Enable Wide characters
-add_definitions(-DTORRENT_USE_WPATH)
-
-if (NOT QT5)
-    # Qt4 does not detect it itself
-    add_definitions(-DQ_COMPILER_INITIALIZER_LISTS)
-endif (NOT QT5)
-
-include(MacroConfigureMSVCRuntime)
-set(MSVC_RUNTIME "dynamic")
-configure_msvc_runtime()

cmake/Modules/winconf.cmake

@@ -1,86 +0,0 @@
-# Settings for compiling qBittorrent on Windows
-
-# We want to link with static version of
-# libtorrent
-set(LibtorrentRasterbar_USE_STATIC_LIBS True)
-set(LibtorrentRasterbar_CUSTOM_DEFINITIONS 
-    -DBOOST_ALL_NO_LIB -DBOOST_ASIO_HASH_MAP_BUCKETS=1021
-    -DBOOST_ASIO_SEPARATE_COMPILATION
-    -DBOOST_EXCEPTION_DISABLE
-    -DBOOST_SYSTEM_STATIC_LINK=1
-    -DTORRENT_USE_OPENSSL
-    -DUNICODE
-    -D_UNICODE
-    -DWIN32
-    -D_WIN32
-    -DWIN32_LEAN_AND_MEAN
-    -D_WIN32_WINNT=0x0501
-    -D_WIN32_IE=0x0500
-    -D_CRT_SECURE_NO_DEPRECATE
-    -D_SCL_SECURE_NO_DEPRECATE
-    -D__USE_W32_SOCKETS
-    -D_FILE_OFFSET_BITS=64)
-
-# and boost
-set(Boost_USE_STATIC_LIBS  True)
-# set(Boost_USE_STATIC_RUNTIME True)
-
-# Here we assume that all required libraries are installed into the same prefix
-# with usual unix subdirectories (bin, lib, include)
-# if so, we just need to set CMAKE_SYSTEM_PREFIX_PATH
-# If it is not the case, individual paths need to be specified manually (see below)
-set(COMMON_INSTALL_PREFIX "c:/usr")
-list(APPEND CMAKE_SYSTEM_PREFIX_PATH "${COMMON_INSTALL_PREFIX}")
-
-# If two version of Qt are installed, separate prefixes are needed most likely
-set(QT4_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt4")
-set(QT5_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt5")
-
-# it is safe to set Qt dirs even if their files are directly in the prefix
-# Qt4
-if(NOT QT5)
-    LIST(APPEND CMAKE_PROGRAM_PATH  "${QT4_INSTALL_PREFIX}/bin/")
-endif(NOT QT5)
-
-# Qt5
-set(Qt5_DIR "${QT5_INSTALL_PREFIX}/lib/cmake/Qt5")
-
-# And now we can set specific values for the Boost and libtorrent libraries.
-# The following values are generated from the paths listed above just for an example
-# they have to be set to actual locations
-
-# Boost
-# set(BOOST_ROOT "${COMMON_INSTALL_PREFIX}")
-# set(Boost_version_suffix "1_59")
-# if a link like boost-version/boost -> boost was created or the boost directory was renamed in the same way,
-# the following needs adjustment
-# set(BOOST_INCLUDEDIR "${COMMON_INSTALL_PREFIX}/include/boost-${Boost_version_suffix}")
-# set(BOOST_LIBRARYDIR "${COMMON_INSTALL_PREFIX}/lib/")
-
-# libtorrent
-
-# set(PC_LIBTORRENT_RASTERBAR_INCLUDEDIR "${COMMON_INSTALL_PREFIX}")
-# set(PC_LIBTORRENT_RASTERBAR_LIBDIR "${COMMON_INSTALL_PREFIX}/lib")
-
-set(AUTOGEN_TARGETS_FOLDER "generated")
-
-set(CMAKE_INSTALL_BINDIR ".")
-
-# Test 32/64 bits
-if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    message(STATUS "Target is 64 bits")
-    if (WIN32)
-        set(WINXXBITS Win64)
-    endif(WIN32)
-else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    message(STATUS "Target is 32 bits")
-    if (WIN32)
-        set(WINXXBITS Win32)
-    endif(WIN32)
-endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-
-if (MSVC)
-    include(winconf-msvc)
-else (MSVC)
-    include(winconf-mingw)
-endif (MSVC)

codingStyleQtCreator.xml

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

conf.pri.in

@@ -6,14 +6,8 @@ DATADIR = @EXPAND_DATADIR@
 MANPREFIX = @EXPAND_MANDIR@
 
 QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
-
+INCLUDEPATH += @QBT_CONF_INCLUDES@
-EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@
+LIBS += @LDFLAGS@ @LIBS@
-EXTERNAL_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS
-INCLUDEPATH += $$EXTERNAL_INCLUDES
-
-EXTERNAL_LIBS = @LDFLAGS@ @LIBS@
-EXTERNAL_LIBS -= $$QMAKE_DEFAULT_LIBDIRS
-LIBS += $$EXTERNAL_LIBS
 
 CONFIG += @QBT_ADD_CONFIG@
 CONFIG -= @QBT_REMOVE_CONFIG@

configure

@@ -601,10 +601,10 @@ EXPAND_BINDIR
 EXPAND_PREFIX
 zlib_LIBS
 zlib_CFLAGS
-libtorrent_LIBS
-libtorrent_CFLAGS
 qjson_LIBS
 qjson_CFLAGS
+libtorrent_LIBS
+libtorrent_CFLAGS
 BOOST_SYSTEM_LIB
 BOOST_LDFLAGS
 BOOST_CPPFLAGS
@@ -690,7 +690,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -715,7 +714,9 @@ ac_user_opts='
 enable_option_checking
 enable_dependency_tracking
 enable_silent_rules
-with_qt4
+with_qt5
+with_libtorrent_rasterbar0_16
+with_geoip_database_embedded
 with_qtsingleapplication
 with_qjson
 enable_debug
@@ -742,10 +743,10 @@ PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 QT_QMAKE
-qjson_CFLAGS
-qjson_LIBS
 libtorrent_CFLAGS
 libtorrent_LIBS
+qjson_CFLAGS
+qjson_LIBS
 zlib_CFLAGS
 zlib_LIBS'
 
@@ -786,7 +787,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1039,15 +1039,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1185,7 +1176,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1338,7 +1329,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1393,13 +1383,20 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-qt4              Compile using Qt4 (default=no)
+  --with-qt5              Compile using Qt5 (default=no)
+  --with-libtorrent-rasterbar0.16
+                          Compile using libtorrent-rasterbar 0.16.x series
+                          (default=no)
+  --with-geoip-database-embedded
+                          Embed the GeoIP database in the qBittorrent
+                          executable (please follow instructions in
+                          src/geoip/README) (default=no)
   --with-qtsingleapplication=[system|shipped]
                           Use the shipped qtsingleapplication library or the
                           system one (default=shipped)
   --with-qjson=[system|shipped]
                           Use the shipped qjson library or the system one
-                          (default=shipped) (Qt4 only)
+                          (default=shipped) (Qt4 only
   --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]
@@ -1429,14 +1426,14 @@ Some influential environment variables:
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
-  QT_QMAKE    value of host_bins for Qt5Core >= 5.2.0, overriding pkg-config
+  QT_QMAKE    value of moc_location for QtCore >= 4.8.0, overriding pkg-config
-  qjson_CFLAGS
-              C compiler flags for qjson, overriding pkg-config
-  qjson_LIBS  linker flags for qjson, overriding pkg-config
   libtorrent_CFLAGS
               C compiler flags for libtorrent, overriding pkg-config
   libtorrent_LIBS
               linker flags for libtorrent, overriding pkg-config
+  qjson_CFLAGS
+              C compiler flags for qjson, overriding pkg-config
+  qjson_LIBS  linker flags for qjson, overriding pkg-config
   zlib_CFLAGS C compiler flags for zlib, overriding pkg-config
   zlib_LIBS   linker flags for zlib, overriding pkg-config
 
@@ -3278,7 +3275,7 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-am__api_version='1.15'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3467,7 +3464,7 @@ else
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh+set}" != xset; then
+if test x"${install_sh}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3858,8 +3855,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target (and possibly the TAP driver).  The
+# We need awk for the "check" target.  The system "awk" is bad on
-# system "awk" is bad on some platforms.
+# some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -4179,11 +4176,29 @@ fi
 # Define --wth-* and --enable-* arguments
 
 
-# Check whether --with-qt4 was given.
+# Check whether --with-qt5 was given.
-if test "${with_qt4+set}" = set; then :
+if test "${with_qt5+set}" = set; then :
-  withval=$with_qt4;
+  withval=$with_qt5;
 else
-  with_qt4=no
+  with_qt5=no
+fi
+
+
+
+# Check whether --with-libtorrent-rasterbar0.16 was given.
+if test "${with_libtorrent_rasterbar0_16+set}" = set; then :
+  withval=$with_libtorrent_rasterbar0_16;
+else
+  with_libtorrent_rasterbar0_16=no
+fi
+
+
+
+# Check whether --with-geoip-database-embedded was given.
+if test "${with_geoip_database_embedded+set}" = set; then :
+  withval=$with_geoip_database_embedded;
+else
+  with_geoip_database_embedded=no
 fi
 
 
@@ -4248,7 +4263,7 @@ fi
 # Detect OS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is FreeBSD" >&5
 $as_echo_n "checking whether OS is FreeBSD... " >&6; }
-if expr "$host_os" : ".*freebsd.*" > /dev/null; then :
+if test "x$host_os" = "x*FreeBSD*"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
       LIBS="-lexecinfo $LIBS"
@@ -4414,6 +4429,7 @@ $as_echo "yes" >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
               enable_qt_dbus=no
+              enable_geoip_database=no
               QBT_ADD_CONFIG="$QBT_ADD_CONFIG nogui" ;; #(
   *) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gui" >&5
@@ -4455,106 +4471,13 @@ $as_echo "$enable_webui" >&6; }
         as_fn_error $? "Unknown option \"$enable_webui\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt4 should be enabled" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt5 should be enabled" >&5
-$as_echo_n "checking whether Qt4 should be enabled... " >&6; }
+$as_echo_n "checking whether Qt5 should be enabled... " >&6; }
-case "x$with_qt4" in #(
+case "x$with_qt5" in #(
   "xno") :
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
               if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-
-if test -n "$QT_QMAKE"; then
-    pkg_cv_QT_QMAKE="$QT_QMAKE"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_QT_QMAKE=`$PKG_CONFIG --variable="host_bins" "Qt5Core >= 5.2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-QT_QMAKE=$pkg_cv_QT_QMAKE
-
-if test "x$QT_QMAKE" = x""; then :
-
-fi
-
-fi
-
-as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake" >&5
-$as_echo_n "checking for $QT_QMAKE/qmake... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$QT_QMAKE/qmake"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-  QT_QMAKE="$QT_QMAKE/qmake"
-else
-  as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake-qt5" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake-qt5" >&5
-$as_echo_n "checking for $QT_QMAKE/qmake-qt5... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$QT_QMAKE/qmake-qt5"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-  QT_QMAKE="$QT_QMAKE/qmake-qt5"
-else
-  QT_QMAKE=""
-fi
-
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 qmake >= 5.2.0" >&5
-$as_echo_n "checking for Qt5 qmake >= 5.2.0... " >&6; }
-if test "x$QT_QMAKE" != "x"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_QMAKE" >&5
-$as_echo "$QT_QMAKE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-
-fi
- ;; #(
-  "xyes") :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-               if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.8.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "QtCore >= 4.8.0") 2>&5
   ac_status=$?
@@ -4666,12 +4589,105 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
 
+fi
+ ;; #(
+  "xyes") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+               if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+
+if test -n "$QT_QMAKE"; then
+    pkg_cv_QT_QMAKE="$QT_QMAKE"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_QT_QMAKE=`$PKG_CONFIG --variable="host_bins" "Qt5Core >= 5.2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+QT_QMAKE=$pkg_cv_QT_QMAKE
+
+if test "x$QT_QMAKE" = x""; then :
+
+fi
+
+fi
+
+as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake" >&5
+$as_echo_n "checking for $QT_QMAKE/qmake... " >&6; }
+if eval \${$as_ac_File+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "$QT_QMAKE/qmake"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+  QT_QMAKE="$QT_QMAKE/qmake"
+else
+  as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake-qt5" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake-qt5" >&5
+$as_echo_n "checking for $QT_QMAKE/qmake-qt5... " >&6; }
+if eval \${$as_ac_File+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "$QT_QMAKE/qmake-qt5"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+  QT_QMAKE="$QT_QMAKE/qmake-qt5"
+else
+  QT_QMAKE=""
+fi
+
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 qmake >= 5.2.0" >&5
+$as_echo_n "checking for Qt5 qmake >= 5.2.0... " >&6; }
+if test "x$QT_QMAKE" != "x"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_QMAKE" >&5
+$as_echo "$QT_QMAKE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
 fi
  ;; #(
   *) :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_qt4" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_qt5" >&5
-$as_echo "$with_qt4" >&6; }
+$as_echo "$with_qt5" >&6; }
-        as_fn_error $? "Unknown option \"$with_qt4\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;;
+        as_fn_error $? "Unknown option \"$with_qt5\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;;
 esac
 if test "x$QT_QMAKE" = "x"; then :
   as_fn_error $? "Could not find qmake" "$LINENO" 5
@@ -4684,7 +4700,7 @@ case "x$enable_qt_dbus" in #(
   "xyes") :
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-               if test "x$with_qt4" = "xno"; then :
+               if test "x$with_qt5" = "xyes"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5DBus >= 5.2.0" >&5
 $as_echo_n "checking for Qt5DBus >= 5.2.0... " >&6; }
        if test -n "$PKG_CONFIG" && \
@@ -4795,11 +4811,8 @@ $as_echo_n "checking for boostlib >= $boost_lib_version_req... " >&6; }
                         libsubdirs="lib"
     ax_arch=`uname -m`
     case $ax_arch in
-      x86_64)
+      x86_64|ppc64|s390x|sparc64|aarch64)
-        libsubdirs="lib64 libx32 lib lib64"
+        libsubdirs="lib64 lib lib64"
-        ;;
-      ppc64|s390x|sparc64|aarch64|ppc64le)
-        libsubdirs="lib64 lib lib64 ppc64le"
         ;;
     esac
 
@@ -4890,10 +4903,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
             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
@@ -4906,11 +4915,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
                     VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
                     BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
                 done
-                                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
@@ -5290,6 +5294,222 @@ $as_echo "$as_me: Boost.System LIB: $BOOST_SYSTEM_LIB" >&6;}
       LIBS="$BOOST_SYSTEM_LIB $LIBS"
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compile using libtorrent-raser 0.16.x" >&5
+$as_echo_n "checking whether to compile using libtorrent-raser 0.16.x... " >&6; }
+case "x$with_libtorrent_rasterbar0_16" in #(
+  "xno") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtorrent" >&5
+$as_echo_n "checking for libtorrent... " >&6; }
+
+if test -n "$libtorrent_CFLAGS"; then
+    pkg_cv_libtorrent_CFLAGS="$libtorrent_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.0.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$libtorrent_LIBS"; then
+    pkg_cv_libtorrent_LIBS="$libtorrent_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.0.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.0.0" 2>&1`
+        else
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.0.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$libtorrent_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.0.0) were not met:
+
+$libtorrent_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables libtorrent_CFLAGS
+and libtorrent_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "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.
+
+Alternatively, you may set the environment variables libtorrent_CFLAGS
+and libtorrent_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	libtorrent_CFLAGS=$pkg_cv_libtorrent_CFLAGS
+	libtorrent_LIBS=$pkg_cv_libtorrent_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
+                               LIBS="$libtorrent_LIBS $LIBS"
+fi ;; #(
+  "xyes") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtorrent" >&5
+$as_echo_n "checking for libtorrent... " >&6; }
+
+if test -n "$libtorrent_CFLAGS"; then
+    pkg_cv_libtorrent_CFLAGS="$libtorrent_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 0.16.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 0.16.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 0.16.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$libtorrent_LIBS"; then
+    pkg_cv_libtorrent_LIBS="$libtorrent_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 0.16.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 0.16.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 0.16.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 0.16.0" 2>&1`
+        else
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 0.16.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$libtorrent_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libtorrent-rasterbar >= 0.16.0) were not met:
+
+$libtorrent_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables libtorrent_CFLAGS
+and libtorrent_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "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.
+
+Alternatively, you may set the environment variables libtorrent_CFLAGS
+and libtorrent_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	libtorrent_CFLAGS=$pkg_cv_libtorrent_CFLAGS
+	libtorrent_LIBS=$pkg_cv_libtorrent_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
+                                LIBS="$libtorrent_LIBS $LIBS"
+fi ;; #(
+  *) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libtorrent_rasterbar0_16" >&5
+$as_echo "$with_libtorrent_rasterbar0_16" >&6; }
+        as_fn_error $? "Unknown option \"$with_libtorrent_rasterbar0_16\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to embed the GeoIP database" >&5
+$as_echo_n "checking whether to embed the GeoIP database... " >&6; }
+case "x$with_geoip_database_embedded" in #(
+  "xno") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+              QBT_REMOVE_DEFINES="$QBT_REMOVE_DEFINES WITH_GEOIP_EMBEDDED" ;; #(
+  "xyes") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+               QBT_ADD_DEFINES="$QBT_ADD_DEFINES WITH_GEOIP_EMBEDDED" ;; #(
+  *) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_geoip_database_embedded" >&5
+$as_echo "$with_geoip_database_embedded" >&6; }
+        as_fn_error $? "Unknown option \"$with_geoip_database_embedded\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;;
+esac
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which qtsingleapplication to use" >&5
 $as_echo_n "checking which qtsingleapplication to use... " >&6; }
 case "x$with_qtsingleapplication" in #(
@@ -5307,7 +5527,7 @@ $as_echo "$with_qtsingleapplication" >&6; }
         as_fn_error $? "Unknown option \"$with_qtsingleapplication\". Use either \"system\" or \"shipped\"." "$LINENO" 5 ;;
 esac
 
-if test "x$with_qt4" = "xyes"; then :
+if test "x$with_qt5" = "xno"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which qjson to use" >&5
 $as_echo_n "checking which qjson to use... " >&6; }
       case "x$with_qjson" in #(
@@ -5420,99 +5640,6 @@ esac
 fi
 
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtorrent" >&5
-$as_echo_n "checking for libtorrent... " >&6; }
-
-if test -n "$libtorrent_CFLAGS"; then
-    pkg_cv_libtorrent_CFLAGS="$libtorrent_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.0.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.0.6") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.0.6" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$libtorrent_LIBS"; then
-    pkg_cv_libtorrent_LIBS="$libtorrent_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.0.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.0.6") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.0.6" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.0.6" 2>&1`
-        else
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.0.6" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$libtorrent_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.0.6) were not met:
-
-$libtorrent_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables libtorrent_CFLAGS
-and libtorrent_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "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.
-
-Alternatively, you may set the environment variables libtorrent_CFLAGS
-and libtorrent_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	libtorrent_CFLAGS=$pkg_cv_libtorrent_CFLAGS
-	libtorrent_LIBS=$pkg_cv_libtorrent_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
-                  LIBS="$libtorrent_LIBS $LIBS"
-fi
-
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
 $as_echo_n "checking for zlib... " >&6; }
@@ -5674,18 +5801,15 @@ _ACEOF
 
 # Original extract() function contributed by pmzqla
 # $*: Strings to parse
-# Set $QBT_CONF_DEFINES, $QBT_CONF_INCLUDES, $QBT_CONF_EXTRA_CFLAGS
+# Set $DEFINES, $INCLUDES, $OTHER
 extract() {
   if [ -z "$*" ]; then
     echo "Input string required"
     return 1
   fi
 
-  # BSD sed needs an actual newline character in the substitute command
+  # Convert " -" to "\n" if not between quotes
-  new_line='
+  string=$(echo " $*" | $SED -e 's: -:\n:g' -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g")
-'
-  # 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
@@ -8345,7 +8469,7 @@ fi
 $as_echo "$as_me: Running qmake to generate the makefile..." >&6;}
 CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
 
-$QT_QMAKE -r $CONFDIR/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE"
+$QT_QMAKE -r $CONFDIR/qbittorrent.pro
 
 ret="$?"
 

configure.ac

@@ -12,11 +12,23 @@ AM_INIT_AUTOMAKE
 
 # Define --wth-* and --enable-* arguments
 
-AC_ARG_WITH(qt4,
+AC_ARG_WITH(qt5,
-            [AS_HELP_STRING([--with-qt4],
+            [AS_HELP_STRING([--with-qt5],
-                            [Compile using Qt4 (default=no)])],
+                            [Compile using Qt5 (default=no)])],
             [],
-            [with_qt4=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/geoip/README) (default=no)])],
+            [],
+            [with_geoip_database_embedded=no])
 
 AC_ARG_WITH(qtsingleapplication,
             [AS_HELP_STRING([--with-qtsingleapplication=@<:@system|shipped@:>@],
@@ -26,7 +38,7 @@ AC_ARG_WITH(qtsingleapplication,
 
 AC_ARG_WITH(qjson,
             [AS_HELP_STRING([--with-qjson=@<:@system|shipped@:>@],
-                            [Use the shipped qjson library or the system one (default=shipped) (Qt4 only)])],
+                            [Use the shipped qjson library or the system one (default=shipped) (Qt4 only])],
             [],
             [with_qjson=shipped])
 
@@ -62,7 +74,7 @@ AC_ARG_ENABLE(qt-dbus,
 
 # Detect OS
 AC_MSG_CHECKING([whether OS is FreeBSD])
-AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null],
+AS_IF([test "x$host_os" = "x*FreeBSD*"],
       [AC_MSG_RESULT([yes])
       LIBS="-lexecinfo $LIBS"],
       [AC_MSG_RESULT([no])])
@@ -95,6 +107,7 @@ AS_CASE(["x$enable_gui"],
         ["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".])])
@@ -121,16 +134,16 @@ AS_CASE(["x$enable_webui"],
         [AC_MSG_RESULT([$enable_webui])
         AC_MSG_ERROR([Unknown option "$enable_webui". Use either "yes" or "no".])])
 
-AC_MSG_CHECKING([whether Qt4 should be enabled])
+AC_MSG_CHECKING([whether Qt5 should be enabled])
-AS_CASE(["x$with_qt4"],
+AS_CASE(["x$with_qt5"],
         ["xno"],
               [AC_MSG_RESULT([no])
-              FIND_QT5()],
+              FIND_QT4()],
         ["xyes"],
                [AC_MSG_RESULT([yes])
-               FIND_QT4()],
+               FIND_QT5()],
-        [AC_MSG_RESULT([$with_qt4])
+        [AC_MSG_RESULT([$with_qt5])
-        AC_MSG_ERROR([Unknown option "$with_qt4". Use either "yes" or "no".])])
+        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])
       ])
@@ -168,6 +181,34 @@ AS_IF([test "x$BOOST_SYSTEM_LIB" = "x"],
       [AC_MSG_NOTICE([Boost.System LIB: $BOOST_SYSTEM_LIB])
       LIBS="$BOOST_SYSTEM_LIB $LIBS"])
 
+AC_MSG_CHECKING([whether to compile using libtorrent-raser 0.16.x])
+AS_CASE(["x$with_libtorrent_rasterbar0_16"],
+        ["xno"],
+              [AC_MSG_RESULT([no])
+              PKG_CHECK_MODULES(libtorrent,
+                               [libtorrent-rasterbar >= 1.0.0],
+                               [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
+                               LIBS="$libtorrent_LIBS $LIBS"])],
+        ["xyes"],
+               [AC_MSG_RESULT([yes])
+               PKG_CHECK_MODULES(libtorrent,
+                                [libtorrent-rasterbar >= 0.16.0],
+                                [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"],
@@ -179,7 +220,7 @@ AS_CASE(["x$with_qtsingleapplication"],
         [AC_MSG_RESULT([$with_qtsingleapplication])
         AC_MSG_ERROR([Unknown option "$with_qtsingleapplication". Use either "system" or "shipped".])])
 
-AS_IF([test "x$with_qt4" = "xyes"],
+AS_IF([test "x$with_qt5" = "xno"],
       [AC_MSG_CHECKING([which qjson to use])
       AS_CASE(["x$with_qjson"],
               ["xshipped"],
@@ -196,11 +237,6 @@ AS_IF([test "x$with_qt4" = "xyes"],
               AC_MSG_ERROR([Unknown option "$with_qjson". Use either "system" or "shipped".])])
      ])
 
-PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 1.0.6],
-                  [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
-                  LIBS="$libtorrent_LIBS $LIBS"])
-
 PKG_CHECK_MODULES(zlib,
                  [zlib],
                  [CPPFLAGS="$zlib_CFLAGS $CPPFLAGS"
@@ -215,18 +251,15 @@ 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
+# Set $DEFINES, $INCLUDES, $OTHER
 extract() {
   if [[ -z "$*" ]]; then
     echo "Input string required"
     return 1
   fi
 
-  # BSD sed needs an actual newline character in the substitute command
+  # Convert " -" to "\n" if not between quotes
-  new_line='
+  string=$(echo " $*" | $SED -e 's: -:\n:g' -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g")
-'
-  # 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
@@ -261,7 +294,7 @@ AS_IF([test "x$enable_systemd" = "xyes"],
 AC_MSG_NOTICE([Running qmake to generate the makefile...])
 CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
 
-$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE"
+$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro
 
 ret="$?"
 

dist/CMakeLists.txt

@@ -1,10 +0,0 @@
-if (APPLE)
-    add_subdirectory(mac)
-else (APPLE)
-    if (UNIX)
-        add_subdirectory(unix)
-    endif (UNIX)
-    if (WIN32)
-        add_subdirectory(windows)
-    endif (WIN32)
-endif (APPLE)

dist/mac/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.7</string>
+	<string>3.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>
@@ -59,7 +59,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2016 The qBittorrent project</string>
+	<string>Copyright © 2006-2015 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/mac/bundle.cmake

@@ -1,2 +0,0 @@
-include(BundleUtilities)
-fixup_bundle("$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/qbittorrent.app" "" "")

dist/unix/CMakeLists.txt

@@ -1,37 +0,0 @@
-if (SYSTEMD)
-    find_package(Systemd)
-    if (SYSTEMD_FOUND)
-        set(EXPAND_BINDIR ${CMAKE_INSTALL_FULL_BINDIR})
-        configure_file(systemd/qbittorrent-nox.service.in ${CMAKE_CURRENT_BINARY_DIR}/qbittorrent-nox.service @ONLY)
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qbittorrent-nox.service
-            DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
-            COMPONENT data)
-    endif(SYSTEMD_FOUND)
-endif(SYSTEMD)
-
-
-if (GUI)
-    list(APPEND MAN_FILES ${qBittorrent_SOURCE_DIR}/doc/qbittorrent.1)
-else (GUI)
-    list(APPEND MAN_FILES ${qBittorrent_SOURCE_DIR}/doc/qbittorrent-nox.1)
-endif (GUI)
-
-install(FILES ${MAN_FILES}
-        DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
-        COMPONENT doc)
-
-install(DIRECTORY menuicons/
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
-        FILES_MATCHING PATTERN "*.png")
-
-install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.png
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/
-        COMPONENT data)
-
-install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qBittorrent.desktop
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/
-        COMPONENT data)
-
-install(FILES qBittorrent.appdata.xml
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/
-        COMPONENT data)

dist/unix/qBittorrent.appdata.xml

@@ -57,5 +57,5 @@
   </screenshot>
  </screenshots>
  <url type="homepage">http://www.qbittorrent.org/</url>
- <update_contact>sledgehammer999@qbittorrent.org</update_contact>
+ <updatecontact>sledgehammer999@qbittorrent.org</updatecontact>
 </component>

dist/windows/CMakeLists.txt

@@ -1 +0,0 @@
-install(FILES qt.conf DESTINATION ${CMAKE_INSTALL_BINDIR})

dist/windows/README.txt

@@ -11,7 +11,7 @@ TRANSLATORS:
 5. Save the files with utf8 encoding and BOM.
 6. Submit your changes: 1) as a pull request to the official git repo or
    2) open an issue to the bugtracker and attach them or 3) via email or
-   4)the same way you provide the translations for qbt itself
+   4)the same way you provide the tranlations for qbt itself
 
 PACKAGERS:
 
@@ -41,10 +41,7 @@ installer-translations
 translations
 	qt_ar.qm
 	...
-        (all the .qm files found in the 'translations' folder of your Qt install. Those files differ between Qt4 and Qt5.
+        (all the .qm files found in dist/qt-translations in every source release)
-	 If you want to distribute Qt4 translations it is better to use the ones found in this repo under the path "dist/qt-translations".
-	 They contain extra languages not distributed via the official qt4 sources.
-	 Don't forget to edit the filelist in installer.nsi + uninstaller.nsi to include all your .qm files.)
 	qt_zh_TW.qm
 installer.nsi
 license.txt

dist/windows/installer-translations/afrikaans.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_AFRIKAANS} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_AFRIKAANS} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_AFRIKAANS} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_AFRIKAANS} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_AFRIKAANS} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/albanian.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_ALBANIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_ALBANIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ALBANIAN} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_ALBANIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ALBANIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/arabic.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_ARABIC} "اضافة قاعدة للجدار ال
 LangString inst_firewallinfo ${LANG_ARABIC} "جاري اضافة القاعدة للجدار الناري"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ARABIC} "البرنامج يعمل. يرجى اغلاقه قبل البدء في التنصيب"
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_ARABIC} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ARABIC} "جاري ازالة النسخة السابقة من البرنامج"
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/basque.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_BASQUE} "Gehitu Windows Suhesi araua"
 LangString inst_firewallinfo ${LANG_BASQUE} "Windows Suhesi araua gehitzen"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_BASQUE} "qBittorrent ekinean dago. Mesedez itxi aplikazioa ezarri aurretik."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_BASQUE} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_BASQUE} "Aurreko bertsioa kentzen."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/belarusian.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_BELARUSIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_BELARUSIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_BELARUSIAN} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_BELARUSIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_BELARUSIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/bosnian.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_BOSNIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_BOSNIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_BOSNIAN} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_BOSNIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_BOSNIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/breton.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_BRETON} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_BRETON} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_BRETON} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_BRETON} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_BRETON} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/bulgarian.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_BULGARIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_BULGARIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_BULGARIAN} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_BULGARIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_BULGARIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/catalan.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_CATALAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_CATALAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_CATALAN} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_CATALAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_CATALAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/croatian.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_CROATIAN} "Dodaj Windows Firewall pravilo"
 LangString inst_firewallinfo ${LANG_CROATIAN} "Dodavanje Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_CROATIAN} "qBittorrent je pokrenut. Zatvorite ga prije instalacije."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_CROATIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_CROATIAN} "Deinstaliraj prethodnu verziju."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/czech.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_CZECH} "Vytvořit pravidlo ve Windows Firewall"
 LangString inst_firewallinfo ${LANG_CZECH} "Vytváření pravidla ve Windows Firewall"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_CZECH} "qBittorrent je spuštěn. Před instalací aplikaci ukončete, prosím."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_CZECH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_CZECH} "Odebírání předchozí verze."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/danish.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_DANISH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_DANISH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_DANISH} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_DANISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_DANISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/dutch.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_DUTCH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_DUTCH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_DUTCH} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_DUTCH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_DUTCH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/english.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/esperanto.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_ESPERANTO} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_ESPERANTO} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ESPERANTO} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_ESPERANTO} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ESPERANTO} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/estonian.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_ESTONIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_ESTONIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ESTONIAN} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_ESTONIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ESTONIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/farsi.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_FARSI} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_FARSI} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_FARSI} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_FARSI} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_FARSI} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/finnish.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_FINNISH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_FINNISH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_FINNISH} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_FINNISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_FINNISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/french.nsi

@@ -11,13 +11,11 @@ LangString inst_torrent ${LANG_FRENCH} "Ouvrir fichiers .torrent avec qBittorren
 ;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_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_firewallinfo ${LANG_FRENCH} "Ajout régle Pare-Feu Windows"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_FRENCH} "qBittorrent est en cours d'exécution. Veuillez fermer l'application avant l'installation."
+LangString inst_warning ${LANG_FRENCH} "qBittorrent est en exécution. Veuillez fermer l'application avant l'installation."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_FRENCH} "Une installation précédente a été détectée. Elle sera désinstallée sans supprimer les réglages utilisateur."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_FRENCH} "Désinstallation de la version précédente."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
@@ -32,20 +30,20 @@ LangString remove_files ${LANG_FRENCH} "Supprimer fichiers"
 ;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
 LangString remove_shortcuts ${LANG_FRENCH} "Supprimer raccourcis"
 ;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_FRENCH} "Supprimer associations de fichiers"
+LangString remove_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_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_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_firewallinfo ${LANG_FRENCH} "Suppression régle Pare-Feu Windows"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
 LangString remove_cache ${LANG_FRENCH} "Supprimer torrents et données cachées"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_FRENCH} "qBittorrent est en cours d'exécution. Veuillez fermer l'application avant la désinstallation."
+LangString uninst_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_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 :"
+LangString uninst_mag_warn ${LANG_FRENCH} "Ne peut pas supprimer l'association du magnet. Elle est associée avec:"

dist/windows/installer-translations/galician.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_GALICIAN} "Engadir unha regra á devasa (firewal
 LangString inst_firewallinfo ${LANG_GALICIAN} "Engadindo unha regra á devasa de Windows"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_GALICIAN} "qBittorrent está en execución. Peche o aplicativo antes da instalación."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_GALICIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_GALICIAN} "Desinstalando a versión anterior."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/german.nsi

@@ -1,9 +1,9 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_GERMAN} "qBittorrent (erforderlich)"
 ;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_dekstop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen"
+LangString inst_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"
@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_GERMAN} "Regel in der Windows Firewall hinzufüg
 LangString inst_firewallinfo ${LANG_GERMAN} "Füge Regel in der Windows Firewall hinzu"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_GERMAN} "qBittorrent läuft gerade. Bitte das Programm vor der Installation beenden."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_GERMAN} "Eine ältere Installation wurde festgestellt. Diese wird deinstalliert ohne die Benutzereinstellungen zu löschen."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_GERMAN} "Vorherige Version wird deinstalliert."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
@@ -40,12 +38,12 @@ LangString remove_conf ${LANG_GERMAN} "Einstellungsdateien entfernen"
 ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
 LangString remove_firewall ${LANG_GERMAN} "Regel in der Windows Firewall entfernen"
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_GERMAN} "Entferne Regel aus der Windows Firewall"
+LangString remove_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_tor_warn ${LANG_GERMAN} "Dateiverknüfung 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:"
+LangString uninst_mag_warn ${LANG_GERMAN} "Dateiverknüfung mit Magnet-Links konnte nicht entfernt werden, da dieser Typ mit diesem Programm verknüpft ist:"

dist/windows/installer-translations/greek.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_GREEK} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_GREEK} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_GREEK} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_GREEK} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_GREEK} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/hebrew.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_HEBREW} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_HEBREW} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_HEBREW} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_HEBREW} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_HEBREW} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/hungarian.nsi

@@ -16,8 +16,6 @@ LangString inst_firewall ${LANG_HUNGARIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_HUNGARIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_HUNGARIAN} "qBittorrent is running. Please close the application before installing."
-;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_HUNGARIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_HUNGARIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."