Bump to v3.2.5

Fix Qt5 build

.appveyor.yml

@@ -1,52 +0,0 @@
-version: '{branch}-{build}'
-
-# Do not build on tags (GitHub only)
-skip_tags: true
-
-image: Visual Studio 2017
-
-environment:
-  REPO_DIR: &REPO_DIR c:\qbittorrent
-  CACHE_DIR: &CACHE_DIR c:\qbt_cache
-
-  QBT_VER_URL: https://builds.shiki.hu/appveyor/version
-  QBT_LIB_URL: https://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\2017\Community\VC\Auxiliary\Build\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

.github/ISSUE_TEMPLATE.md

@@ -1,14 +0,0 @@
-**Please provide the following information**
-
-### qBittorrent version and Operating System:
-
-### If on linux, libtorrent and Qt version:
-
-### What is the problem:
-
-### What is the expected behavior:
-
-### Steps to reproduce:
-
-### Extra info(if any):
-

.gitignore

@@ -17,7 +17,6 @@ Makefile*
 
 # Generated MOC, resource and UI files
 moc_*.cpp
-moc_*.h
 qrc_*.cpp
 ui_*.h
 *.moc

.travis.yml

@@ -1,28 +1,17 @@
 language: cpp
 
-os:
-  - linux
-  - osx
-osx_image: xcode7.3
-
 env:
   matrix:
     # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
-    #- lt_branch=dist gui=true
+    #- lt_branch=dist   gui=true
-    #- lt_branch=dist gui=false
+    #- lt_branch=dist   gui=false
-    - lt_branch=RC_1_0 qt=5 gui=true
+    - lt_branch=RC_0_16 gui=true
-    - lt_branch=RC_1_0 qt=5 gui=false
+    - lt_branch=RC_0_16 gui=false
-    - lt_branch=RC_1_0 qt=4 gui=true
+    - lt_branch=RC_1_0  gui=true
-    - lt_branch=RC_1_0 qt=4 gui=false
+    - lt_branch=RC_1_0  gui=false
   global:
     - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
     - coverity_branch: coverity_scan
-matrix:
-  allow_failures:
-    - os: osx
-      env: lt_branch=RC_1_0 qt=4 gui=true
-    - os: osx
-      env: lt_branch=RC_1_0 qt=4 gui=false
 
 branches:
   except:
@@ -34,15 +23,11 @@ notifications:
     on_success: change
     on_failure: change
 
-cache:
-  ccache: true
-  directories:
-    - $HOME/hombebrew_cache
-
-# opt-in Ubuntu Trusty
-dist: trusty
 # container-based builds
 sudo: false
+cache:
+  directories:
+    - $HOME/.ccache
 
 addons:
   coverity_scan:
@@ -54,132 +39,58 @@ addons:
     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
-      - sourceline: 'ppa:qbittorrent-team/qbittorrent-stable'
-      - sourceline: 'ppa:beineri/opt-qt551-trusty'
     packages:
-      # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
+    # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
-      - autoconf
+    - autoconf
-      - automake
+    - automake
-      - colormake
+    - colormake
-      - libssl-dev
+    - libssl-dev
-      - libboost-dev
+    - libboost-dev
-      - libboost-system-dev
+    - libboost-system-dev
-      - libtorrent-rasterbar-dev
+    - libgeoip-dev
-      # Qt 5.5.1
+    - libqt4-dev
-      - qt55base
+    # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
-      - qt55tools
+    #- libtorrent-rasterbar6
-      # Qt 4.8
+    #- libboost-filesystem-dev
-      - qt4-default
-      - libqt4-dev
 
 before_install:
-  # only allow specific build for coverity scan, others will stop
+  # 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
+  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [[ "$lt_branch" == "RC_1_0" && "$gui" == "true" ]]; then exit ; fi
 
   - shopt -s expand_aliases
+  - if ! [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then dpkg-query -L ccache && export PATH="/usr/lib/ccache/:$PATH" ; fi
   - alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system)
-  #- libt_path="$HOME/libt_install"
+
-  #- ltconf="$ltconf --prefix="$libt_path" --disable-geoip"
+  - libt_path="$HOME/libt_install"
   - qbt_path="$HOME/qbt_install"
-  - qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH"
+  - ltconf="$ltconf --prefix="$libt_path" --with-libgeoip=system"
+  - qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":$PKG_CONFIG_PATH"
 
-  # options for specific branches
+  # Options for specific branches
-  - if [ "$qt" = 4 ]; then qbtconf="$qbtconf --with-qt4" ; fi
+  - if [[ "$lt_branch" == "RC_0_16" ]]; then qbtconf="$qbtconf --with-libtorrent-rasterbar0.16" ; fi
-  - if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; fi
+  # Also setup a virtual display for after_success target when gui == true
-  - |
+  - if ! $gui; then qbtconf="$qbtconf --disable-gui" ; else export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi
-    if [ "$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 ;
 
-      # Qt 5
+  # Print settings
-      PATH=/opt/qt55/bin:${PATH}
-    fi
-
-  # print settings
   - echo $lt_branch
   - echo $gui
   - echo $ltconf
   - echo $qbtconf
+  - ccache -V && ccache --show-stats && ccache --zero-stats
 
 install:
-  #- |
+  - if ! [ "$lt_branch" == "dist" ]; then cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch --single-branch ; fi
-    #if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+  - if ! [ "$lt_branch" == "dist" ]; then cd libtorrent && ./autotool.sh && ./configure $ltconf && make install && cd "$TRAVIS_BUILD_DIR" ; fi
-      # 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 ;
-    #fi
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      # dependencies
-      brew update > /dev/null
-      brew install colormake ccache zlib
-      PATH="/usr/local/opt/ccache/libexec:$PATH"
-      brew link --force zlib
-      brew outdated "pkg-config" || brew upgrade "pkg-config"
-
-      wget https://builds.shiki.hu/homebrew/version ;
-      if ! cmp --quiet "version" "$HOME/hombebrew_cache/version" ; then
-        echo "Cached files are different from server. Downloading new ones." ;
-        # First delete old files
-        rm -r "$HOME/hombebrew_cache" ;
-        mkdir "$HOME/hombebrew_cache";
-        cp "version" $HOME/hombebrew_cache ;
-        cd "$HOME/hombebrew_cache" ;
-        wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar.rb ;
-        wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.0.11+git20172003.8736a59adc.el_capitan.bottle.tar.gz
-        wget https://builds.shiki.hu/homebrew/qt.rb
-        wget https://builds.shiki.hu/homebrew/qt-5.9.1.el_capitan.bottle.tar.gz
-      fi
-
-      # Copy custom libtorrent bottle to homebrew's cache so it can find and install it
-      # Also install our custom libtorrent formula by passing the local path to it
-      # These 2 files are restored from Travis' cache.
-      cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.0.11+git20172003.8736a59adc.el_capitan.bottle.tar.gz" "$(brew --cache)"
-      brew install "$HOME/hombebrew_cache/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
-        # Copy custom qt5 bottle to homebrew's cache so it can find and install it
-        # Also install our custom qt5 formula by passing the local path to it
-        # These 2 files are restored from Travis' cache.
-        cp "$HOME/hombebrew_cache/qt-5.9.1.el_capitan.bottle.tar.gz" "$(brew --cache)"
-        brew install "$HOME/hombebrew_cache/qt.rb"
-        brew link --force qt
-      fi
-    fi
-  - |
-    if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
-      export use_ccache=true
-      ccache -V && ccache --show-stats && ccache --zero-stats
-    fi
 
 script:
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # skip usual build when running coverity scan
+  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # Skip usual build when running coverity scan
-  - cd "$TRAVIS_BUILD_DIR" && ./bootstrap.sh && ./configure $qbtconf
+  - ./bootstrap.sh && ./configure $qbtconf
-  - |
+  - 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
+  - cd "$qbt_path/bin"
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd "$qbt_path/bin" ; fi
+  - export LD_PRELOAD="$libt_path/lib/libtorrent-rasterbar.so:$LD_PRELOAD"
-  - |
+  - if $gui ; then ./qbittorrent --version ; else ./qbittorrent-nox --version ; fi
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      macdeployqt "$TRAVIS_BUILD_DIR/src/$qbt_exe.app" ;
-      cd "$TRAVIS_BUILD_DIR/src/$qbt_exe.app/Contents/MacOS" ;
-    fi
-  - ./$qbt_exe --version
 
 after_script:
-  - if [ "$use_ccache" = true ]; then ccache --show-stats ; fi
+  - ccache --show-stats

.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,92 +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
-EDwWxtTS0a7Rfx3DxLRWc2xlZGdlaGFtbWVyOTk5IChVc2VkIGZvciBzaWduaW5n
-IGdpdCBjb21taXRzL3RhZ3MvZXRjLikgPGhhbW1lcmVkOTk5QHFiaXR0b3JyZW50
-Lm9yZz6JAh8EMAEIAAkFAlhie1ICHQAACgkQbkotAlt8yaILIhAAp25o1BbUG2Zk
-At3cSrTFnZSCA7nEygbSUv1Uek33JZfY0Apw5qEM8lQCMZk+mhdrSQCYUJcQlruN
-zJcJf4CH+VGE23xkI3Kf0nGp9Cjn/q6b1hLIPe5rimvw5pTAejFtebcYY/ZJIB8Z
-H1ebuzfqBZ/9k7eYTarZ/ZsgG8YptB0RXBQWOMaSEKwdeo2m7HXHgK3blQiqbuJJ
-uyPbid01Wus4AVN47/FKgDNswPs8irYZsu5yakgpi2KLycGDtSiN5XFHI4xbC0zM
-srR7Cz0/fC+klhGcuxbw0V0It7UUIitgCcTPHXkukUU8i2+AGMyKa1HjchsXDdLg
-DIs6KIurp2ve7znKOz7h1aX8cOBmB/QYeYAx9jRRkePMIRT8V1lRwfvJlJxx1+G3
-e2gJLjqTN8a08KHHjdY/S0ZFERxSlmOym2uf/y6di1ipDPxo8xvDuS5kDbdZLC0t
-XijlsH8ONK27KNuWhucG8zHzKQvnPw2qN06SZq4FjbSmAkkuYs56heLEXMzFr75k
-SE8rUoQQ+ABG9gU46GEvKlZxqSwXgGnb1X6K7h8svjMh/NlAU358p8Sra4Ru5tz4
-jUu9MoVEw5Lbjcrsnp6/4Kk1Q2ckBNt43nv8/+C7NsC3xi6BrOInuaKHZ4QsTuzJ
-m1/A4zlKRnUi6T98DXfIYnNuV9NSmAWJAjkEEwEIACMFAlhiemMCGwMHCwkIBwMC
-AQYVCAIJCgsEFgIDAQIeAQIXgAAKCRBuSi0CW3zJor6yD/9N2U0INx0nYpGkmvah
-yVG/vw2S6hhKK+03AN+RrtddNRg4aBf/gmOvRWQhAmFnXOBA7fO09wgcljaV5tVb
-MYyYZvHhK0o2/sli2p/M5N8ZxchRHypjxUSEyG9ZQ06QG5DVhh4HtM8nIN+UcwTV
-C5QjyoWZvHf+tNroyFeh7zT+w4kX1VxgynTQr5LGdYsrVA3CFyT3zsBWV3dMae23
-22CHOirsBBLwairHUsWW+BdThT3MkKYpTEV0jkH4OyAXhJYcS5IjjtKQ8UpZE9dw
-f4saJ0TnXNe7goPRZtH7UjPwfVbtYK4y8QklWUTRxgoBxNwSC5X7Flg+3xXxE/VU
-U4cehyRkH64i7MJDoFkqh5JtjkgIz+kuTTXb7xR0Wf+JXrGMybZTR8xth2TEMC20
-1FT5L5+0vH1WRzL7bhlaU3EXyCnoH8sDvMEClZbibbew+rf7fC3tFU41ohUT0HDl
-zlyfVjRvBHWMTgfpWKBV2m/qP941xTJ9VHxOlAB02XKUZYwFt07CpH+yjMOCOzA4
-cTPBD3mGRuft0V0BJ8bA5bcTly/GBciRX0Y5oIeHZGgq2czb0sywSYT6mPoQMFNM
-B+Cwr4pm90r1DMMfW518onF2itwyN/Id0FsWDhsLJHKluBJw52C3OnxCuToVutTm
-xntqpPVv62LaeVeWQqxIieTJErRQc2xlZGdlaGFtbWVyXzk5OSAoVXNlZCBmb3Ig
-c2lnbmluZyBnaXQgY29tbWl0cy90YWdzL2V0YykgPGhhbW1lcmVkOTk5QGdtYWls
-LmNvbT6JAjkEEwEIACMFAlhifeICGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIX
-gAAKCRBuSi0CW3zJolcCD/9xPBNEkFtnhTW89th0TFZnB5oykCQjyefquvQs8KWT
-C92/1VizHi4ZxDehHWP9IKVWT3ZJthj5ZXBSedyl1tHnwkyrUYBW9roQwtDWPncK
-pXl/HsE6p3q6EIus+g6YJo4UvYachJFAZATZp1WDBPIswziHGzaL0tndFWZuVM8V
-QD0tfPQsS1qCDVv6+B1JWZDnA1JzdSG/uzPhL95q/ff6JmNbfSAVedK2PyqYshnC
-KWBx6Yna/0ColBuDFho8+bDuHPQcM35xyjPosVD7moXQiY4yMAJ+VzwEBaCFleI0
-RBWw8/+qyoFqfIKwdq8G+7I9LjWpBiN2+uQBZ+OAvsMWyRShLopxt3JluPTtL6xb
-Ca6dglOdlaOS/A6FK7u05k/8kQMDS5Jq2/rpfTPRl1/weCaJZgfRIBosk1Mon/pR
-p1zd0abM4t7BcGQpwSkKAmqlKCrWf886EFQT0CJTBo8q7pzgpVraWWPVsmAOdkfU
-YcKBgz1A2uMSAxypkSzaDZkIVj6I7gwiGk7IMYx1OK7Ev46h/x4Z7kgT0y3DYYOq
-ggVEKQ+15Krn7bZ35s8vbZdfnVKPSXdCC8jkIMBmGmRX6cgZZ3OXZlrrHht5icgJ
-5Z2d1M4JUoEZVUr2xNZkkaMk01NAIpGgKvIS6yHuj6vE4GMJ+A/qEW6J60/3YHRe
-0bkCDQRXDSCMARAAqMIVJizEJp205c546IN75xeYiFszNXcs3768IY8bOoWj+rTw
-t2wIwtL/3O5K2dG79CSt2H5o6BPKmq43tOO60YW3Yk3m9BB/gnAVqk0QOPr5O8+y
-eBzdElU8CZh6y6zZMWugSkNmTDm6jZzPhgNjcjrit/dl9+0DGqJQcqoD8WzEWNcW
-rMHVz9cDewnLSVkwR758mZMaIiL7R10MZ++tNrC0j69UINqx+9z1r1J07+NNnxqS
-TxVRcbjPYtM9E+tUiVFS2HPWN9ShVDkBAEdoWh90qzRaMiFl2NGNGOD1iHx/xr06
-RMeGEEXt2vhSlhfMW2YQW+UD2jzlFbARf53v39MUKKscGuIpBhxGw3JCq4l6qLW/
-bDkgnoXlOhZDmhQm6OpsjAyk9IEdd3ponSc7yYD3mUkJKR9eTaALD5t6TQGyNHak
-b4UfoXtE2RR78cbPlLIwag7eQ8GsNA+dfjowmOZdojx3ROsHZdGQwb0YFLjuKAus
-A3TY+lCfbS6kzE2iI2DuaW+3dICcLrYuibbVb0CBNHyD+8KEtczdur/wm0lhqyVJ
-kGyZKZT8C2cPxywKgy1Rn6F8Yfmj0Lna3nvtaZu0ZUS4/8Lit5PcOso1lSmYBuD6
-yq+GEAMCnUmn1Pm8eZRMlxxQuTPvyJKQrRDhbtAAr472MSnoJKlS4SfaUF0AEQEA
-AYkCHwQYAQgACQUCVw0gjAIbDAAKCRBuSi0CW3zJomZDD/9IJmzd5hiEzntlp84p
-yIJcfyIRe4KImvldAy6T02OSIbF1HzCNnwmqIPob6MOdMZ+KNwMK0htRkrRr/zM0
-34+lBiWKZt+tVYHu49ioTYXEjAc5qDJE09Sq7HceQnhgE48f1n54XGT5G2w5gw+/
-a8Qn1SceE44VwXafL3E1gKaOrrsb1UH/AJhp+W4VMu+7bLXu7h1tN6v2PhvCYvBt
-3zyy8Q8xfJ2x7/D1lbF8ATJAiZ/km9x5bRm7OGRliVYaUe1nyR42fZOj3CBmAR0+
-lZLgjriqdMXrs+qlBbrmAhkn0XPQXAeaPifKoKIGDAUWIsqDHqM7imMGT+MR9APf
-Sw8M4enOJWL+HnKpVBEARCEDpaFpJ3u7QRucFybpEhvIymoNftyw+urId2Eg2K33
-NypeZo3M1K2LC65f2Ta7f/sZcIDUTbgW+m334fgVl1KptDA5DX3U9lTci7mi4uPu
-AFtbWrB1di4jYrxXYuzFm5g4xTb0Hw3kYIB6WXF+I7i0JaGOTHxPC5X5lIAZrYrk
-xh+1n1Y1CY+TC8JcTzwORJIbFFm9tD/BHXa4849k4DVvFYCZkhq+/56FKZfoVByh
-B+x+2GaMlsBm1uPniO4lAakFPpIi0kaap4UVayQ/7ak+BhscAIHZUy6NtgZkuvW3
-xdpwp07LYo2ilhMI8RnzmtoRmg==
-=UBeB
------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,64 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-cmake_policy(VERSION 3.5)
-
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
-include(FunctionReadVersion)
-
-read_version("${CMAKE_CURRENT_SOURCE_DIR}/version.pri" VER_MAJOR VER_MINOR VER_BUGFIX VER_BUILD VER_STATUS)
-# message(STATUS "Project version is: ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD} (${VER_STATUS})")
-
-project(qBittorrent VERSION ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD})
-
-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(-DQBT_VERSION_MAJOR=${VER_MAJOR})
-add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
-add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
-add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
-
-# os2 {
-#     DEFINES += DQBT_VERSION=\'\"v$${PROJECT_VERSION}\"\'
-#     DEFINES += DQBT_VERSION_2=\'\"$${PROJECT_VERSION}\"\'
-# } else {
-add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
-add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
-# }
-
-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++
@@ -138,30 +114,30 @@ However, there are cases where curly braces for single statement if blocks **sho
 
 Generally it will depend on the particular piece of code and would be determined on how readable that piece of code is. **If in doubt** always use braces if one of the above exceptions applies.
 
-### 3. Indentation ###
+### 3. Indentation###
 4 spaces.
 
-### 4. File encoding and line endings. ###
+### 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. ###
+### 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
 }
 ```
 
-### 6. Enums. ###
+### 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.
+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,35 +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,498 +1,162 @@
-* Thu Sep 07 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.16
+* Sat Oct 31 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.5
-    - BUGFIX: Better memory footprint when using libtorrent 1.1.x. The cache is turned off by default(`0 (disabled)` value in the settings). The value `-1 (auto)` makes it use 1/8 of your RAM. (sledgehammer999)
+    - BUGFIX: Fix difficult to reproduce crash. (glassez)
-    - BUGFIX: Skip user input events when adding torrent. Closes #7327. (glassez)
+    - OTHER: Fix Windows' Qt5 build. (Gelmir)
-    - BUGFIX: Avoid memory leak in the speed graph. (Chocobo1)
-    - WEBUI: Fix validating wrong header field. X-Forwarded-Host is a foreign proxy setting, it isn't the same as qbt's local setting and thus it makes no sense to verify it. Closes #7311. (Chocobo1)
-    - WINDOWS: Fix connection problems when a specific interface/ip is configured. (sledgehammer999)
-    - WINDOWS: Disable skipping of loopback interfaces. This fixes the absence of VPN tunnel interfaces under Windows and works around the QTBUG-32349. Fixes #7291. (Evengard)
-    - WINDOWS: The installer detects the 64bit running process too. (vlakoff)
 
-* Thu Aug 03 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.15
+* Sat Oct 10 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.4
-    - BUGFIX: Temporary subfolder wasn't being deleted. (glassez)
+    - FEATURE: Select the file of single file torrents when opening destination folder (pmzqla)
+    - BUGFIX: Fix crash with invalid favicon. Closes #3632. (glassez)
+    - BUGFIX: Try to download favicon.png when the download of favicon.ico fails (pmzqla)
+    - BUGFIX: Try to avoid loading a corrupted configuration file. Also log errors encountered while saving/loading the configuration. Closes #3503. (sledgehammer999)
+    - BUGFIX: Allow adding torrent link from Torcache (jsayol)
+    - BUGFIX: Don't limit the number of torrents that can be announced to the tracker/dht/lsd. Closes #3473. (sledgehammer999)
+    - BUGFIX: Fix potential crash when memory allocation failed. Closes #3877. (Chocobo1)
+    - COSMETIC: Change Queue buttons order in the Toolbar (GUI & Web UI) (ngosang)
+    - COSMETIC: Move option "Ignore transfer limits on local network" to Speed page (Chocobo1)
+    - COSMETIC: Move option "Confirm torrent deletion" to Behavior page (Chocobo1)
+    - COSMETIC: Fix typos. Make `μTP` untranslatable. Use American variation of words. Closes #3654. (sledgehammer999)
+    - COSMETIC: Optimize text color for dark themes. Closes #3633 and #3815. (sledgehammer999)
+    - COSMETIC: Show current label in the torrent context menu. Closes #3776. (sledgehammer999)
+    - WEBUI: Add save_path to /query/torrents (Casey Bodley)
+    - WEBUI: Bump API_VERSION to 5
+    - SEARCH: Fix python detection when the 'Anaconda' software is installed. Closes #3731. (sledgehammer999)
+    - RSS: Handle magnet links as torrents instead of news URLs. Closes #3560 (ngosang)
+    - RSS: Trim elements text in RSS articles (ngosang)
+    - RSS: Fix contextual menu in RSS torrents list (ngosang)
+    - RSS: Improve error handling when a RSS feed doesn't contain torrents (ngosang)
+    - RSS: More precise message and code simplification in RSS feeds deletion (ngosang)
+    - RSS: Don't hide the elements in Unread list when clicked (ngosang)
+    - RSS: Allow multiple selection in RSS torrents list (ngosang)
+    - RSS: Simplify string translation (ngosang)
+    - RSS: Handle more types of RSS feeds (ngosang)
+    - RSS: Fix RSS panel position not saved (ngosang)
+    - RSS: Fix forgetting label changes to first item in RSS rule list. (Gelmir)
+    - RSS: Add label to UI when a new one is creating during rule addition. (Gelmir)
+    - RSS: Removes refresh message when adding a new feed (ngosang)
+    - RSS: Fix RSS crash when deleting RSS feeds. Closes #997, #2152, #2461, #3718, #3747, #3766, #3806, #3814, #3829 and #3846. (ngosang)
+    - RSS: Sort labels in RSS Downloader dialog, closes #3140. (Chocobo1)
+    - WINDOWS: Correctly show german letters in the installer. Closes #3574, #3566. (sledgehammer999)
+    - WINDOWS: Fix file selection on Explorer when the filename contains weird characters. Closes #3185. (sledgehammer999)
+    - WINDOWS: Fix wrong default download directory in Windows. Closes #2625. (Chocobo1)
+    - WINDOWS: Fix German translation of the installer. (netswap)
+    - LINUX: Fix broken .desktop file icon for some locales. See #3905. (sledgehammer999)
+    - OTHER: Fix ppc64le detection during configure (sledgehammer999)
+    - OTHER: Don't use sed in configure. Closes #3169. (pmzqla)
+    - OTHER: Fix broken donation link. Closes #3771. (sledgehammer999)
+    - OTHER: Add forum link in README. Closes #3853. (sledgehammer999)
+    - OTHER: New translation: Esperanto
+    - OTHER: Fix Qt5 nox build on non-Windows. (sledgehammer999)
 
-* Tue Jul 18 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.14
+* Sun Aug 02 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.3
-    - BUGFIX: Set interface for outgoing traffic(libtorrent 1.1.x series). (evsh)
+    - BUGFIX: Fix crash when closing a search tab while search is running (pmzqla)
-    - WEBUI: Fix KEEP_ALIVE_DURATION value (Chocobo1)
+    - SEARCH: Other minor search fixes and improvements (pmzqla)
-    - WEBUI: Relax CSRF defense. Closes #6882. Allow HTTP request which has neither Origin nor Referer header included. (Chocobo1)
-    - WEBUI: Skip username/password check for active sessions (closes #6860) (Thomas Piccirello)
-    - WEBUI: Fix javascript errors and follow best practices (Thomas Piccirello)
-    - WEBUI: Fix value comparison. Closes #7081. (Chocobo1)
-    - WEBUI: Avoid modifying request headers (Chocobo1)
-    - WEBUI: Implement HTTP host header filtering. This filtering is required to defend against DNS rebinding attack. Fixes security issues reported by @beardog108 privately. (Chocobo1)
-    - WEBUI: Add Status column to webui (addresses #6815) (#7032) (Tom Piccirello)
-    - WEBUI: Bump API_VERSION and API_VERSION_MIN to 15.
-    - SEARCH: Pad shorter python versions. Closes #6877. (sledgehammer999)
-    - WINDOWS: Updated Arabic, Turkish, Greek, Russian, Danish languages of the installer. (KingLucius, BouRock, thalieht, Andrei Stepanov, scootergrisen)
-    - WINDOWS: Raise total stack size on Windows to 8 MB. Closes #7021. (Chocobo1)
-    - LINUX: Systemd service with user switch and other fixes/optimizations. (anton.latukha)
-
-* Thu Jun 01 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.13
-    - BUGFIX: Fixed UI glitch about torrent numbers in the sidepanel. Fixes #6454. (evsh)
-    - BUGFIX: Fix downloaded/uploaded columns were not highlighted properly when selected. (Chocobo1)
-    - BUGFIX: Always draw background in files list and search result list (Chocobo1)
-    - BUGFIX: Remove torrent temp folder if it becomes unneeded (glassez)
-    - BUGFIX: Remove torrent temp folder when torrent is deleted (glassez)
-    - BUGFIX: Setup DPI at startup (Chocobo1)
-    - BUGFIX: Do not attempt to show detailed tooltips without torrent metadata. Closes #6768. (evsh)
-    - BUGFIX: Better detection of already present files when adding a torrent. (fbriere)
-    - BUGFIX: Fix double click on system tray icon causing program to open and minimize immediately. Closes #5826. (Chocobo1)
-    - BUGIFX: Fix categories sorting in AddNewTorrentDialog. Partially fixes #6708. (fbriere)
-    - BUGFIX: Set "category" column as case-insensitive in transfer list. (fbriere)
-    - BUGFIX: Properly sort categories case-insensitively in filter widget. Closes #6708. (fbriere)
-    - BUGFIX: Fix renaming files is not case sensitive on Windows platform. Closes #5128. (Chocobo1)
-    - BUGFIX: Fix crash in download piece bar (evsh)
-    - BUGFIX: Fix focusing on the previously opened dialog didn't work (Chocobo1)
-    - WEBUI: Bugfix: `RequestParser::splitMultipartData` drop extra trailing newline. (OpenGG)
-    - WEBUI: Add `skip_checking` and `paused` to `/command/download` and `/command/upload` (OpenGG)
-    - WEBUI: Fix checkbox hidden. Closes #6642. (Chocobo1)
-    - WEBUI: Implement http persistence connection. Max simultaneous connection limit set to 500. This also release allocated memory of Connection instances at runtime instead of at program shutdown. (Chocobo1)
-    - WEBUI: Always send Content-Length header. (Chocobo1)
-    - WEBUI: Send Date http header (Chocobo1)
-    - WEBUI: Fix "Content-Encoding" header is always created. (Chocobo1)
-    - WEBUI: Implement robust checking for gzip encoding and revise gzip compressing/decompressing code. (Chocobo1)
-    - WEBUI: Make the context obligatory for translatable strings. Also delete duplicate strings from extra translations. (sledgehammer999)
-    - WEBUI: Use translatable strings in Statistics dialog. (sledgehammer999)
-    - WEBUI: Add missing unit sizes in misc.js (sledgehammer999)
-    - WEBUI: Use the same layout in the Speed tab in preferences as the GUI. (sledgehammer999)
-    - WEBUI: Return status indicating if at least one torrent was successfully added (Thomas Piccirello)
-    - WEBUI: Increase the number of digits after the decimal point (thalieht)
-    - WEBUI: Use less permissive Content Security Policy (Thomas Piccirello)
-    - WEBUI: Fix connection status icon too large. Closes #6804. (Chocobo1)
-    - WEBUI: Cosmetic fixes for WebUI upload and download windows (naikel)
-    - WEBUI: Fix slow filtering in WebUI. (naikel)
-    - WEBUI: Make cookie parsing robust (Chocobo1)
-    - WEBUI: New API for getting torrent piece info (Chocobo1)
-    - WEBUI: Implement Cross-Site Request Forgery defense. Due to this the HTTP referer header is now expected in (almost) all HTTP requests. qBittorrent will drop the request sent without the referer header. That's why we bump the API_VERSION_MIN too. (reported by OpenGG, fixed by Chocobo1)
-    - SEARCH: Update demonoid, legittorrents plugins (ngosang)
-    - SEARCH: Remove mininova, ExtraTorrent plugins (ngosang, KingLucius)
-    - SEARCH: Add btdb plugin (ngosang)
-    - WINDOWS: Updated Spanish, Ukrainian, German, Chinese languages of the installer. (ngosang, evsh, schnurlos, wevsty)
-    - LINUX: Rename .desktop and appdata files to match executable name. Fixes #6625. (evsh)
-    - MACOS: Fix UI responsiveness after AddNewTorrentDialog received metadata. (Brian Kendall)
-
-* Thu Apr 06 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.12
-    - FEATURE: Indicate bitness in stackstrace and about dialog. Closes #6172. (sledgehammer999)
-    - BUGFIX: Fix incomplete type compile error with Qt4 (Chocobo1)
-    - BUGFIX: Fix compile error: ‘escape’ is not a member of ‘Qt’ (Chocobo1)
-    - BUGFIX: Use system locale to format dates/time/etc (sledgehammer999)
-    - BUGFIX: Follow http user-agent format (Chocobo1)
-    - BUGFIX: Fix cancel "Set location" causes files move to installation dir. (Chocobo1)
-    - WEBUI: Improve performance of updating 'progress' column (buinsky)
-    - WEBUI: Implement statistics window in web UI (FranciscoPombal)
-    - WEBUI: fixed "remaining" column in WebUI (FranciscoPombal)
-    - WEBUI: Set HttpOnly attribute to SID cookie (Chocobo1)
-    - WEBUI: Fire up the timer to clean inactive sessions (Chocobo1)
-    - WEBUI: Set cookie SID value to empty on logout (Chocobo1)
-    - WINDOWS: Make the installer DPI aware (regs01)
-    - WINDOWS: Set exit code to 0 on install/uninstall success. Fixes problem with silent installations. (Chocobo1)
-    - WINDOWS: The 64-bit installer refuses to install on 32-bit systems. (sledgehammer999)
-    - WINDOWS: The 64-bit installer uses the correct "Program Files" now. Detection will not work if you install on top of previous installer. (sledgehammer999)
-    - WINDOWS: Fix running the uninstaller if the user chose a different path in the installer. Closes #6080. (sledgehammer999)
-    - LINUX: Add keywords to the .desktop file. (sledgehammer999)
-    - LINUX: Update stuff in appdata.xml and run 'appstream-utl upgrade' on it. (sledgehammer999)
-    - OTHER: Replace rand() by a true uniform distribution generator (Chocobo1)
-    - OTHER: Change our user-agent format as indicated earlier in the news section (Chocobo1)
-    - OTHER: cmake: fix OSX bundle creation (evsh)
-
-* Fri Mar 03 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.11
-    - FEATURE: Always show progress and remaining bytes for unselected files. (sledgehammer999)
-    - FEATURE: Allow to change priority for unselected files through the combobox like it is done via the context menu. (sledgehammer999)
-    - FEATURE: Remove settings to exchange trackers. It wasn't used by non-libtorrent clients. Also it has a privacy risk and you might be DDoSing someone. (sledgehammer999)
-    - FEATURE: Put temp files in .qBittorrent directory. Closes #4462. (Chocobo1)
-    - FEATURE: Use the numbers from tracker scrape response. Closes #5048, #6117. (Chocobo1)
-    - FEATURE: Implement category filter widget. Show categories in tree mode when subcategories are enabled. (glassez)
-    - FEATURE: Allow to toggle columns in searchtab (thalieht)
-    - FEATURE: PeerList: allow to hide zero values for the "uploaded" and "downloaded" columns (thalieht)
-    - FEATURE: Display more information in tracker tab (ngosang)
-    - FEATURE: Use Ctrl+F to search torrents. Closes #5797. (Tim Delaney)
-    - FEATURE: Transferlist: add hotkeys for double click and recheck selected torrents (thalieht)
-    - FEATURE: Add hotkey for execution log tab, Trackerlist, Peerlist etc (thalieht)
-    - FEATURE: Seperate seeds from peers for DHT, PeX and LSD (thalieht)
-    - BUGFIX: Do not remove added files unconditionally. Closes #6248 (Eugene Shalygin)
-    - BUGFIX: Ignore mouse wheel events in Advanced Settings. Closes #866. (Chocobo1)
-    - BUGFIX: Add queue repair code. It should fix missing torrents after restarting. (Eugene Shalygin, nxd4)
-    - BUGFIX: Fetch torrent status when generating final fastresume data. It should fix missing torrents after restarting. (Eugene Shalygin)
-    - BUGFIX: Fix queue overload for add torrent at session start. It should fix missing torrents after restarting. (falco)
-    - BUGFIX: After files relocate, don't remove the old folder even if it is empty. (Chocobo1)
-    - BUGFIX: Fix finding 'English' item in language dropdown menu when an unrecognized locale is requested. Closes #6109. (sledgehammer999)
-    - BUGIFX: Speedlimitdlg: raise slider default value to 10000. Closes #6150. (Chocobo1)
-    - BUGFIX: TransferListWidget: keep columns width even if they are hidden on qBittorrent startup (unless something goes wrong) (thalieht)
-    - BUGFIX: fix index overflow for torrents with invalid meta data or empty progress (Falco)
-    - BUGFIX: Immediately update torrent_status after manipulating super seeding mode. Partially fixes #6072. (sledgehammer999)
-    - BUGFIX: Use case-insensitive comparsion for torrent content window. Closes #6327. (Chocobo1)
-    - BUGFIX: Fixed sort order for datetime columns with empty values (closes #2988) (Vladimir Sinenko)
-    - BUGFIX: Disable proxy in WebUI HTTP server. Closes #6349. (Eugene Shalygin)
-    - COSMETIC: Use a disabled progressbar's palette for unselected files. (sledgehammer999)
-    - COSMETIC: Support fallback when selecting theme icons (Eugene Shalygin)
-    - COSMETIC: Do not resize SVG icons (Eugene Shalygin)
-    - COSMETIC: Align text to the right in columns that handle numbers for PeerList and SearchTab (thalieht)
-    - COSMETIC: Increased number of digits after the decimal point for Gibibytes and above (thalieht)
-    - COSMETIC: Use non-breaking spaces between numbers and units (thalieht)
-    - WEBUI: Fix proxy type bug (Oke Atime)
-    - WEBUI: Use the correct value for KEY_TORRENT_NUM_COMPLETE/KEY_TORRENT_NUM_INCOMPLETE (Chocobo1)
-    - WEBUI: Make torrents table scrollable horizontally (buinsky)
-    - WEBUI: Make torrent peers table scrollable horizontally (buinsky)
-    - WEBUI: Add tooltips to dynamic table header (buinsky)
-    - WEBUI: Implement dynamic table columns resizing, reordering and hiding (buinsky)
-    - WEBUI: Add some missing columns to dynamic tables (buinsky)
-    - WEBUI: Make too tall menus scrollable (buinksy)
-    - WEBUI: Prevent text wrapping in menus (buinsky)
-    - WEBUI: Add a vertical separator between columns (buinsky)
-    - WEBUI: Implement resizable progress bar in "Done" column (buinsky)
-    - WEBUI: Fix scrollbar covers menu item with long text (buinsky)
-    - WEBUI: Remove 300px limit of column width (buinsky)
-    - WEBUI: Avoid lags in firefox on resizing progress column (buinsky)
-    - WEBUI: Fix category in torrent upload. Closes #6260 (ngosang)
-    - WEBUI: Turn off port forwarding of WebUI by default for GUI users (Chocobo1)
-    - WEBUI: Exclude insecure ciphers. Fixes security issues reported by @beardog108 privately. (Chocobo1)
-    - WEBUI: Avoid clickjacking attacks. Fixes security issues reported by @beardog108 privately. (ngosang)
-    - WEBUI: Add X-XSS-Protection, X-Content-Type-Options, CSP header. Fixes security issues reported by @beardog108 privately. (Chocobo1)
-    - WEBUI: Escape various values that might contain injected html. Fixes security issues reported by @beardog108 privately. (Chocobo1)
-    - WEBUI: Bump API_VERSION to 12.
-    - SEARCH: Update extratorrent plugin. Closes #6261 (ngosang)
-    - SEARCH: SearchTab: can now save sorting column changes (thalieht)
-    - SEARCH: Use case-insensitive sort for Name column in Search tab. Closes #407. (Chocobo1)
-    - RSS: Fix tab order in RSS downloader. Closes #6164. (Tim Delaney)
-    - RSS: Move old RSS items to separate config file. Closes #6167. (Tim Delaney)
-    - RSS: Episode filter code refactoring (Tim Delaney)
-    - RSS: Allow resetting rule to no category. Closes #5539. (Tim Delaney)
-    - RSS: Save rule on enable/disable even if not selected. Closes #6163. (Tim Delaney)
-    - RSS: Allow | in RSS must contain. Closes #6171. (Tim Delaney)
-    - RSS: RSS use red text to indicate invalid filter. Closes #6165. (Tim Delaney)
-    - RSS: Allow episode zero (special) and leading zeroes in RSS episode filter. (Tim Delaney)
-    - RSS: RSS parse torrent episodes like 1x01 as well as S01E01. Closes #2749. (Tim Delaney)
-    - RSS: RSS allow infinite range to extend beyond current season. Closes #800, #3876, #6170. (Tim Delaney)
-    - RSS: Improve UI responsiveness during RSS downloading. Closes #873, #1089, #1235, #5423. (Tim Delaney)
-    - RSS: Show name of feed list and sort rules in editor. Closes #3782, #6281. (Tim Delaney)
-    - RSS: Fix regex matching. Closes #6337. (Tim Delaney)
-    - MACOS: Fix qbittorrent-nox build (Oke Atime)
-    - LINUX: fixes default indicator name (Bilal Elmoussaoui)
-    - OTHER: Workaround problem with moc from Qt4 and #if (Eugene Shalygin)
-    - OTHER: Print warning to the user if stacktrace contains no function names (Eugene Shalygin)
-    - OTHER: Various cmake fixes (Eugene Shalygin)
-    - OTHER: Fix finding qmake in configure when cross-compiling (Zach Bacon)
-
-* Sat Dec 17 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.10
-    - BUGFIX: Fix share ratio limiting. Broken by commit 259b5e51c49b744. Closes #6039 #6048. (sledgehammer999)
-    - BUGFIX: Case insensitive sort for client column. Closes #6054. (Oke Atime)
-    - BUGFIX: Make resume/pause menu items clickable. Closes #6040. (Oke Atime)
-    - WINDOWS: Make the updater to look for the x64 installer if running x64 version. (sledgehammer999)
-
-* Wed Dec 14 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.9
-    - BUGFIX: Fix slider for per torrent speed limits when no global speed limit has been set. Closes #6046. (sledgehammer999)
-    - BUGFIX: Fix GUI for proxy settings. Closes #6045. (sledgehammer999)
-    - OSX: Correctly migrate settings/rss/usage stats in macOS. Closes #6041. (sledgehammer999)
-
-* Wed Dec 14 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.8
-    - FEATURE: Start using new libtorrent 1.1.x APIs (needs at least 1.1.2). Still unofficial support. (glassez, sledgehammer999)
-    - FEATURE: Add a new DHT bootstrap node run by libtorrent author arvidn. (sledgehammer999)
-    - FEATURE: Option to disable tracker's favicon download. (sledgehammer999)
-    - FEATURE: Shift + scroll = horizontal scroll. Closes #5980. Only for TransferListWidget, PeerListWidget. (Chocobo1)
-    - BUGFIX: Actually set new path as default when checkBox is enabled in Add New Torrent dialog. (erikssm)
-    - BUGFIX: Properly fix the handling of default save path store/load. (sledgehammer999)
-    - BUGFIX: Fix crash when restoring from tray. Closes #5854. (Chocobo1)
-    - BUGFIX: Export torrents added only after the setting was enabled. (sledgehammer999)
-    - BUGFIX: Delete old rss favicon before assigning new one. (sledgehammer999)
-    - BUGFIX: Don't revert save path value in the Dialog when metadata are received. Closes #5482. (sledgehammer999)
-    - BUGFIX: Don't ever stop seeding forced torrents. Closes #5784. (sledgehammer999)
-    - BUGFIX: Fix potential crash in TransferList widget. Closes #5873. (Chocobo1)
-    - BUGFIX: Sort torrent names case insensitively. (Yez Ezey)
-    - BUGFIX: Fix mistake in getting values for sorting in TransferList widget. (Anton Lashkov)
-    - BUGFIX: Fix memory leaks. (dzmat, Chocobo1)
-    - WEBUI: Fix webui port overflow. (thalieht)
-    - WEBUI: Changed meaning of the value of the 'dl_limit', 'up_limit', 'alt_dl_limit' and 'alt_up_limit' tokens. The value is expressed in bytes and not in KiB. (sledgehammer999)
-    - WEBUI: Don't request client SSL certificate. Closes #3883. (borouhin)
-    - WEBUI: Bump API_VERSION and API_VERSION_MIN to 11.
-    - SEARCH: Fixed extratorrent search not working Closes #5736 #5753. (Yez Ezey)
-    - SEARCH: Update Demonoid plugin. (ngosang)
-    - SEARCH: Remove TorrentReactor plugin. (ngosang)
-    - SEARCH: Fix python auto install, deletion of installer and use 3.5.x series for Vista+. Closes #5871. (sledgehammer999)
-    - SEARCH: Set /usr/local/bin before default PATH on macOS. closes #5639 #5571. This enables finding newer python installs. (Yez Ezey)
-    - COSMETIC: Log: set embedded Tracker [OFF] msg type as info. (thalieht)
-    - COSMETIC: Remove (mostly) useless log warnings about tracker's favicon. (sledgehammer999)
-    - COSMETIC: Change RSS view layout to horizontal. Closes #5920. (Chocobo1)
-    - OSX: Fix crash on exit using Qt4. (Yez Ezey)
-    - OSX: Change QSettings to IniFormat on macOS. Closes #5770 #5808. (Yez Ezey)
-    - LINUX: Workaround a Qt5 bug which results in a flood of network interface change singals. (Eugene Shalygin)
-    - OTHER: Turkish translation for installer. (Burak Yavuz)
-    - OTHER: Update portugueseBR for installer. (DaRKSoM)
-    - OTHER: Update portuguese for installer. (EdwardLinux)
-    - OTHER: Add --disable-qt-dbus to configure if $host_os is macOS. (Yez Ezey)
-    - OTHER: New translations: Icelandic, Latvian, Malay, Occitan, Uzbek.
-    - OTHER: A whole lot of code refactoring by various people.
-
-* 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
+* Sat Aug 01 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.2
-    - BUGFIX: Do not create save folder in advance (glassez)
+    - FEATURE: Allow to force reannounce DHT too (Chocobo1)
-    - BUGFIX: Fix upper-bound limit of command line for "Run External Program" in Windows. Closes #5399. (Chocobo1)
+    - FEATURE: Implement an option to disable confirmation of torrent recheck (blaxspirit)
-    - BUGFIX: Invoke system's cmd.exe directly. (Chocobo1)
+    - FEATURE: Allow to copy all the trackers with a keyboard shortcut (pmzqla)
-    - BUGFIX: Workaround space issues in file path for running external program on Windows. (Chocobo1)
+    - BUGFIX: Fix torrent renaming. Closes #3398 (ngosang)
-    - BUGFIX: Fix icons are missing when using RTL languages in Options dialog. Closes #5398. (Chocobo1)
+    - BUGFIX: Fix localhost address (::ffff:127.0.0.1) is not recognized when connecting to WebUI (Chocobo1)
+    - BUGFIX: Fix '&' character in label name becomes accelerator key, closes #3454. (Chocobo1)
+    - BUGFIX: Fix HTTP header parsing when torrent filename contains a semicolon. Closes #3511.
+    - BUGFIX: Fix installing search plugin from local file. (sledgehammer999)
+    - BUGFIX: Fix installing search plugin by drag-n-dropping file. (sledgehammer999)
+    - COSMETIC: Update color scheme of completed.png icon. (sledgehammer999)
+    - COSMETIC: Fix printing of the copyright symbol in the About dialog. (sledgehammer999)
+    - COSMETIC: Minor changes in Preview File dialog (ngosang)
+    - COSMETIC: Add Force Resume icon (ngosang)
+    - COSMETIC: Add count of unread items to RSS tab label (pmzqla)
+    - WEBUI: Ports between 1 and 65535 as in the GUI. Closes #1602 (ngosang)
+    - WEBUI: Fix an error in Content tab when the torrent doesn't have metadata (ngosang)
+    - WEBUI: New option Web UI port UPNP. Closes #3358 (ngosang)
+    - WEBUI: Fix API Content Types. Closes #3393 (ngosang)
+    - WEBUI: Fix empty trackers addition (ngosang)
+    - WEBUI: Torrent download from hash. Closes #1173 (ngosang)
+    - WEBUI: Fix sort by queue number (ngosang)
+    - WEBUI: Open external links in a new window/tab (ngosang)
+    - WEBUI: Massive increase in performance. (ngosang)
+    - SEARCH: Search status per tab (DoumanAsh)
+    - SEARCH: Remove the word 'torrent' in ExtraTorrent results (ngosang)
+    - SEARCH: Prefer python3 over python2 on Linux and OS X (pmzqla)
+    - SEARCH: Show notification if Python is not found and a search is started (pmzqla)
+    - SEARCH: Update link to the Windows Python installer (pmzqla)
+    - SEARCH: Improve checks for python. Print python version and path to log. (sledgehammer999)
+    - SEARCH: Improve Python detection (ngosang)
+    - OTHER: Improvements on the build system (Chocobo1)
+    - OTHER: Bump minimum libtorrent version required to 1.0.6/0.16.19. (sledgehammer999)
+    - OTHER: New translation: Slovenian
 
-* Mon Jun 20 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.5
+* Sat Jul 11 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.1
-    - FEATURE: Implement Torrent Management Mode(TMM) (glassez)
+    - FEATURE: Change default preferences (ngosang)
-    - FEATURE: New cookies management dialog and various related fixes (glassez)
+    - FEATURE: Add "Add link to torrent" menu in TrayIconMenu. Closes #2918. (Chocobo1)
-    - FEATURE: Use unique temp directories (temp_path/<truncated_torrent_hash>). Closes #5154. (glassez)
+    - FEATURE: Allow to Open files from the properties pane by pressing "Enter" (pmzqla)
-    - FEATURE: Display notifications when a torrent is added. Closes #334 and #915. (sledgehammer999)
+    - FEATURE: Add checkbox option for IpFilterTrackers. (Chocobo1)
-    - FEATURE: Sort labels with natural sort algorithm in the right-click menu. Closes #3919. (Chocobo1)
+    - FEATURE: Download-from-URL textbox change focus on tab key (Mayank Asthana)
-    - FEATURE: Add option to automatically remove .torrent files upon adding (Eugene Shalygin)
+    - FEATURE: Increase priority value of "High" (pmzqla)
-    - FEATURE: Add option to bind directly to an IP instead of using a network Interface (Sjoerd van der Berg, sledgehammer999)
+    - FEATURE: Add 16 KiB, 8 MiB and 16 MiB piece sizes in Torrent Creator (ngosang)
-    - FEATURE: Detailed tooltips on the progress and availability bars in the General button of each torrent. (Eugene Shalygin)
+    - BUGFIX: Disable Auto piece size when creating a new torrent (ngosang)
-    - FEATURE: Let user able to specifiy a filter when choosing an IP filter file (Chocobo1)
+    - BUGFIX: Set default focus to cancel button in delete confirm dlg, closes #3085 (Chocobo1)
-    - FEATURE: Improve usability of "Run External Program". Users can write (platform dependent) shell scripts now. (Chocobo1)
+    - BUGFIX: Set default focus to ok button in add new torrent dlg (Chocobo1)
-    - PERFORMANCE: Optimize drawing in speed graph (Anton Lashkov, Chocobo1)
+    - BUGFIX: Set default focus to no button in exit confirm box (Chocobo1)
-    - BUGFIX: Fix memory leak. (sledgehammer999)
+    - BUGFIX: Fix Start Minimized checkbox in Options (ngosang)
-    - BUGFIX: Fix resizing bug in "add torrent dialog". Closes #5036. (Chocobo1)
+    - BUGFIX: Remove limits on alternative speeds setting (LazyBui)
-    - BUGFIX: Fix qBittorrent doesn't exit immediately when "all donwloads are done -> exit" option enabled. (glassez, Chocobo1)
+    - BUGFIX: Fix sorting torrents by ETA (pmzqla)
-    - BUGFIX: Display the filepath when a torrent fails to load. Closes #100 and #805. (sledgehammer999)
+    - BUGFIX: Improve ratio calculation formula. Closes #3096. (Chocobo1)
-    - BUGFIX: Fix Add tracker dialog empty trackers (ngosang)
+    - BUGFIX: Clear missing files flag when resuming or force rechecking. Fixes issues in #2750. (sledgehammer999)
-    - BUGFIX: Fix Add tracker dialog URL download (ngosang)
+    - BUGFIX: Delete tempfile when downloading favicon.ico. Closes #3257. (sledgehammer999)
-    - BUGFIX: Fix torrent adding with existing data (glassez)
+    - BUGFIX: Don't close downloadFromURL dialog when showing empty url warning (Chocobo1)
-    - BUGFIX: Try to find incomplete files for new torrent (glassez)
+    - BUGFIX: Minimize to tray only if the relevant option is enabled. (sledgehammer999)
-    - BUGFIX: Fix rechecking after torrent is finished (glassez)
+    - BUGFIX: Update disk space label after changing partition, closes #3309. (Chocobo1)
-    - BUGFIX: Fix duplicate network interfaces. Closes #5131 (ngosang)
+    - BUGFIX: Don't use a default upload limit. Closes #3275. (sledgehammer999)
-    - BUGFIX: Fix .!qB extension is added when disabled (glassez)
+    - BUGFIX: Fix Properties bar size when started minimized to tray. Closes #3206. (sledgehammer999)
-    - BUGFIX: Fix "IP Filtering - Apply to trackers" wasn't being applied. Closes #5217. (Chocobo1)
+    - COSMETIC: Change option text "Confirmation on exit when torrents are active" (Chocobo1)
-    - BUGFIX: Don't resize the Country column needlessly (thalieht)
+    - COSMETIC: Enable to choose dark/light tray icons on all platforms. (Chocobo1)
-    - BUGFIX: Fix crashing when exiting the program while the Options window was showing. Closes #4871, #5049. (Chocobo1)
+    - COSMETIC: Use AllUppercase for label text (Chocobo1)
-    - BUGFIX: Fix parsing of eMule .DAT filters. Closes #5281. (thalieht, sledgehammer999)
+    - COSMETIC: changes in typography (ngosang)
-    - WEBUI: Implement in setting/removing/showing categories. (buinsky)
+    - COSMETIC: Menu revamp (Chocobo1)
-    - WEBUI: Add 'Added on' column in Webui. Closes #5145,#1092,#738 (Ibrahim Tachijian)
+    - COSMETIC: Revamp general tab info (Chocobo1)
-    - WEBUI: Add command to get the logs (pmzqla)
+    - COSMETIC: Better update message for users (Chocobo1)
-    - WEBUI: Expose Add trackers feature (pmzqla)
+    - COSMETIC: Fix ugly 'C++' wrapping in About dialog. (glassez)
-    - WEBUI: Bump API_VERSION and API_VERSION_MIN to 10. (sledgehammer999)
+    - WEBUI: Fix login and logout relative URLs (ngosang)
-    - SEARCH: Implement search filters in the proxy model. (Eugene Shalygin)
+    - WEBUI: Fix resumeAll and pauseAll. Closes #3016 (ngosang)
-    - SEARCH: Optimize widgets inside of the search tab (Eugene Shalygin)
+    - WEBUI: Changes in title bar (ngosang)
-    - SEARCH: Remove duplicated code from search tab and widget (Eugene Shalygin)
+    - WEBUI: Complete translatable strings (ngosang)
-    - SEARCH: Use nova2dl.py script instead of DownloadManager. Closes #5026. (glassez)
+    - WEBUI: Minor changes in style (ngosang)
-    - SEARCH: Various UI cleanups and optimizations. (Chocobo1, ngosang)
+    - WEBUI: Fix Max connections and Time active in transfer information (ngosang)
-    - SEARCH: Fix Torrentz, Mininova, LegitTorrents, PirateBay plugins (ngosang)
+    - WEBUI: New config - Global maximum number of upload slots (ngosang)
-    - SEARCH: Fix toolbar resizing when m_searchFilter appears/disappears. Closes #5120. (Chocobo1)
+    - WEBUI: Display wasted data with friendly units. Closes #2994 (ngosang)
-    - SEARCH: Use QPalette::LinkVisited color for downloaded items in search results (Eugene Shalygin)
+    - WEBUI: add delay in shutdown command in order to send out response msg (Chocobo1)
-    - SEARCH: Update Python version requirements (min 2.7.9 / 3.3.0) (ngosang)
+    - WEBUI: Option to hide Top Toolbar (ngosang)
-    - SEARCH: Remove filters from Torrentreactor, BTDigg and Demonoid. It is done in the GUI now. (ngosang)
+    - WEBUI: Reorder the tabs/groups in Options window (ngosang)
-    - RSS: default refresh interval to 30 mins (botmtl)
+    - WEBUI: Add new options (ngosang)
-    - COSMETIC: Improve TransferListDelegate::sizeHint (Chocobo1)
+    - WEBUI: Increase API_VERSION due to changes in #3279, #3197, #3226 and #3040 (ngosang)
-    - COSMETIC: Fix long text clipping. Closes #5091. (Chocobo1)
+    - WEBUI: Add Web Seeds (HTTP Sources) tab (ngosang)
-    - COSMETIC: Minor change in Stats dialog (ngosang)
+    - WEBUI: Don't update the tabs if tab's panel is collapsed (ngosang)
-    - COSMETIC: Fix Update all button height in RSS tab (ngosang)
+    - WEBUI: Fix alternative global rate limits. (ngosang)
-    - COSMETIC: Disable `comboHideZero` when `checkHideZero` is unchecked. (Chocobo1)
+    - SEARCH: Fix thepiratebay. Closes #3012 (ngosang)
-    - COSMETIC: Disable `checkLimituTPConnections` when `checkuTP` is unchecked. (Chocobo1)
+    - SEARCH: Improve torrentz engine to return more results (ngosang)
-    - COSMETIC: Enable word wrap for "Run external program" help text (Chocobo1)
+    - SEARCH: Change width of columns in search tab. Closes #764 (ngosang)
-    - COSMETIC: Fix mutually exclusive radio buttons can be unselected. (Chocobo1)
+    - SEARCH: Make strings translatable in seach engine (ngosang)
-    - COSMETIC: Set About tab font-size to default (zywo)
+    - SEARCH: Aborting search engine process during closure. Close #2671 (DoumanAsh)
-    - COSMETIC: Improve wordings in "Auto download torrent" section (Chocobo1)
+    - SEARCH: Perform searches in parallel (DoumanAsh)
-    - COSMETIC: Change "Auto download torrent" default save path to "default location". (Chocobo1)
+    - SEARCH: Add Demonoid search engine (ngosang)
-    - COSMETIC: Change ambiguous text "Copy selected" to "Copy IP:port" (Chocobo1)
+    - SEARCH: Minor fixes in search engines (ngosang)
-    - COSMETIC: Improve error messages for "Auto download torrents" (Chocobo1)
+    - SEARCH: Show the version of search engines (ngosang)
-    - COSMETIC: Slim down 'Downloads' page of options window. (sledgehammer999)
+    - SEARCH: Update Legit Torrent to remove sgmllib (DoumanAsh)
-    - COSMETIC: Cleanup Connection page in Option dialog. Closes #845. (Chocobo1)
+    - SEARCH: Update KickassTorrents (ngosang)
-    - COSMETIC: Fix reload button size is not the same size as "..." button in options dialog. (Chocobo1)
+    - SEARCH: Update BTDigg (ngosang)
-    - WINDOWS: Let Windows handle all widgets scaling. (Chocobo1)
+    - SEARCH: Update Torrentz (ngosang)
-    - WINDOWS: Improve stack trace for windows by including source filenames and line numbers (SeigneurSerpent)
+    - SEARCH: Update ExtraTorrent (ngosang)
-    - OSX: Fix qt5 bundle on OSX. Closes #4014. (sledgehammer999)
+    - SEARCH: Update TorrentReactor (ngosang)
-    - OTHER: Make AddNewTorrentDialog behavior uniform (glassez)
+    - SEARCH: Fix Python 2 implementation of Torrentz (ngosang)
-    - OTHER: Optimize the shutdown dialog (Chocobo1)
+    - SEARCH: Cosmetic changes in search engine (ngosang)
-    - OTHER: Enable access to shutdown functions when configured with `--disable-gui` option (Chocobo1)
+    - SEARCH: Fix column sort in search engine. Closes #2621 (ngosang)
-    - OTHER: Delete Import Torrent Dialog. Just use the "add new torrent" dialog. (glassez)
+    - RSS: Update matching RSS articles while editing rules (pmzqla)
-    - OTHER: Optimize code for natural sorting (Chocobo1)
+    - WINDOWS: Fix python detection from registry when multiple versions are installed (sledgehammer999)
-    - OTHER: Use new alert dispathing API for libtorrent 1.1.x (glassez)
+    - LINUX: Fixes Linux issue for when the theme doesn't have a corresponding icon. (sledgehammer999)
-    - OTHER: Fix gcc 6 compilation with qmake. See #5237. (sledgehammer999)
+    - OTHER: Correctly detect FreeBSD when configuring. (sledgehammer999, yurivict)
-
+    - OTHER: Add translator to credits.
-
+    - OTHER: New translation: Indonesian.
-* Tue Mar 29 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.4
+    - OTHER: Split Chinese locales into Chinese Simplified, Chinese Traditional(Taiwan), Chinese Traditional(Hong Kong). (sledgehammer999)
-    - 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)

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.16.19 OR >= 1.0.6)
         -> 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 (>= 0.16.19 OR >= v1.0.6)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 

README.md

@@ -1,8 +1,7 @@
 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.svg?branch=v3_2_x)](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:
@@ -14,7 +13,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,13 +26,6 @@ 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
 

README.os2

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

bootstrap.sh

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

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -1,127 +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)
-
-macro(_detect_boost_components _outComponets librariesList)
-    string(REGEX MATCHALL "boost_[a-z_]+[-a-z]*" _boost_libraries "${librariesList}")
-    string(REGEX REPLACE "boost_([a-z_]+)[-a-z]*" "\\1" ${_outComponets} "${_boost_libraries}")
-endmacro()
-
-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})
-
-# Without pkg-config, we can't possibly figure out the correct boost dependencies
-if (LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-    set(_boost_components "${LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES}")
-else(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-    if(PC_LIBTORRENT_RASTERBAR_FOUND)
-        _detect_boost_components(_boost_components "${PC_LIBTORRENT_RASTERBAR_LIBRARIES}")
-    else()
-        # all possible boost dependencies
-        set(_boost_components
-            date_time
-            system
-            chrono
-            random
-            thread
-        )
-    endif()
-endif(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-
-list(SORT _boost_components)
-message(STATUS "Libtorrent Boost dependencies: ${_boost_components}")
-find_package(Boost REQUIRED COMPONENTS ${_boost_components})
-set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-foreach(_boost_cmpnt IN LISTS _boost_components)
-    list(APPEND LibtorrentRasterbar_LIBRARIES "Boost::${_boost_cmpnt}")
-endforeach(_boost_cmpnt)
-
-set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIRS})
-
-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::SSL OpenSSL::Crypto)
-    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)
-
-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,26 +0,0 @@
-#######
-# Find systemd service dir
-# sets variables
-# SYSTEMD_FOUND
-# SYSTEMD_SERVICES_INSTALL_DIR
-
-find_package(PkgConfig QUIET REQUIRED)
-
-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/FunctionReadVersion.cmake

@@ -1,28 +0,0 @@
-# function for parsing version variables that are set in version.pri file
-# the version identifiers there are defined as follows:
-# VER_MAJOR = 3
-# VER_MINOR = 4
-# VER_BUGFIX = 0
-# VER_BUILD = 0
-# VER_STATUS = alpha
-
-function(read_version priFile outMajor outMinor outBugfix outBuild outStatus)
-    file(STRINGS ${priFile} _priFileContents REGEX "^VER_.+")
-    # message(STATUS "version.pri version contents: ${_priFileContents}")
-    # the _priFileContents variable contains something like the following:
-    # VER_MAJOR = 3;VER_MINOR = 4;VER_BUGFIX = 0;VER_BUILD = 0;VER_STATUS = alpha # Should be empty for stable releases!
-    set(_regex "VER_MAJOR += +([0-9]+);VER_MINOR += +([0-9]+);VER_BUGFIX += +([0-9]+);VER_BUILD += +([0-9]+);VER_STATUS += +([0-9A-Za-z]+)?")
-     # note quotes around _regex, they are needed because the variable contains semicolons
-    string(REGEX MATCH "${_regex}" _tmp "${_priFileContents}")
-    if (NOT _tmp)
-        message(FATAL_ERROR "Could not detect project version number from ${priFile}")
-    endif()
-
-    # message(STATUS "Matched version string: ${_tmp}")
-
-    set(${outMajor} ${CMAKE_MATCH_1} PARENT_SCOPE)
-    set(${outMinor} ${CMAKE_MATCH_2} PARENT_SCOPE)
-    set(${outBugfix} ${CMAKE_MATCH_3} PARENT_SCOPE)
-    set(${outBuild} ${CMAKE_MATCH_4} PARENT_SCOPE)
-    set(${outStatus} ${CMAKE_MATCH_5} PARENT_SCOPE)
-endfunction()

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/MacroGlibcDetect.cmake

@@ -1,49 +0,0 @@
- ###############################################################
- #
- # Copyright 2011 Red Hat, Inc.
- #
- # Licensed under the Apache License, Version 2.0 (the "License"); you
- # may not use this file except in compliance with the License.  You may
- # obtain a copy of the License at
- #
- #    http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
- #
- ###############################################################
-
-MACRO (GLIBC_DETECT _VERSION)
-
-# there are multiple ways to detect glibc, but given nmi's
-# cons'd up paths I will trust only gcc.  I guess I could also use
-# ldd --version to detect.
-
-    set(_GLIB_SOURCE_DETECT "
-#include <limits.h>
-#include <stdio.h>
-int main()
-{
-  printf(\"%d%d\",__GLIBC__, __GLIBC_MINOR__);
-  return 0;
-}
-")
-
-file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/build/cmake/glibc.cpp "${_GLIB_SOURCE_DETECT}\n")
-
-try_run(POST26_GLIBC_DETECTED
-        POST26_GLIBC_COMPILE
-        ${CMAKE_CURRENT_BINARY_DIR}/build/cmake
-        ${CMAKE_CURRENT_BINARY_DIR}/build/cmake/glibc.cpp
-        RUN_OUTPUT_VARIABLE GLIBC_VERSION )
-
-if (GLIBC_VERSION AND POST26_GLIBC_COMPILE )
-    set(${_VERSION} ${GLIBC_VERSION})
-else()
-    message(STATUS "NOTE: Could not detect GLIBC_VERSION from compiler")
-endif()
-
-ENDMACRO (GLIBC_DETECT)

cmake/Modules/MacroLinkQtComponents.cmake

@@ -1,28 +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})
-        if ("${_cmp}" STREQUAL "PRIVATE" OR
-            "${_cmp}" STREQUAL "PUBLIC" OR
-            "${_cmp}" STREQUAL "INTERFACE")
-             list(APPEND _QT_CMPNTS "${_cmp}")
-        else()
-            list(APPEND _QT_CMPNTS "Qt4::Qt${_cmp}")
-        endif()
-    endforeach()
-else (QT4_FOUND)
-    foreach(_cmp ${ARGN})
-        if ("${_cmp}" STREQUAL "PRIVATE" OR
-            "${_cmp}" STREQUAL "PUBLIC" OR
-            "${_cmp}" STREQUAL "INTERFACE")
-             list(APPEND _QT_CMPNTS "${_cmp}")
-        else()
-            list(APPEND _QT_CMPNTS "Qt5::${_cmp}")
-        endif()
-    endforeach()
-endif (QT4_FOUND)
-    target_link_libraries(${target} ${_QT_CMPNTS})
-endmacro()

cmake/Modules/MacroQbtCompilerSettings.cmake

@@ -1,89 +0,0 @@
-# Sets cache variable QBT_ADDITONAL_FLAGS and QBT_ADDITONAL_CXX_FLAGS to list of additional
-# compiler flags for C and C++ (QBT_ADDITONAL_FLAGS) and for C++ only (QBT_ADDITONAL_CXX_FLAGS)
-# and appends them to CMAKE_XXX_FLAGS variables.
-
-# It could use add_compile_options(), but then it is needed to use generator expressions,
-# and most interesting of them are not compatible with Visual Studio :(
-
-macro(qbt_set_compiler_options)
-# if (NOT QBT_ADDITONAL_FLAGS)
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        #-Wshadow -Wconversion ?
-        set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra"
-            "-Wfloat-equal -Wcast-qual -Wcast-align"
-            "-Wsign-conversion -Winvalid-pch -Werror=return-type -Wno-long-long"
-#			-fstack-protector-all
-            "-Werror -Wno-error=deprecated-declarations"
-        )
-        set (_GCC_COMMON_CXX_FLAGS  "-fexceptions -frtti"
-            "-Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel"
-            "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align"
-            "-Werror=overloaded-virtual"
-    # 		"-Weffc++"
-            "-Werror -Wno-error=cpp"
-            # we should modify code to make these ones obsolete
-            "-Wno-error=old-style-cast -Wno-error=sign-conversion -Wno-error=float-equal"
-        )
-
-        if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
-            # GCC 4.8 has problems with std::array and its initialization
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=missing-field-initializers")
-        endif()
-
-        include(CheckCXXCompilerFlag)
-        # check for -pedantic
-        check_cxx_compiler_flag(-pedantic _PEDANTIC_IS_SUPPORTED)
-        if (_PEDANTIC_IS_SUPPORTED)
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-pedantic -pedantic-errors")
-        else (_PEDANTIC_IS_SUPPORTED)
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wpedantic")
-        endif (_PEDANTIC_IS_SUPPORTED)
-
-        if (CMAKE_SYSTEM_NAME MATCHES Linux)
-            # if Glibc version is 2.20 or higher, set -D_DEFAULT_SOURCE
-            include(MacroGlibcDetect)
-            message(STATUS "Detecting Glibc version...")
-            glibc_detect(GLIBC_VERSION)
-            if(${GLIBC_VERSION})
-                if(GLIBC_VERSION LESS "220")
-                    message(STATUS "Glibc version is ${GLIBC_VERSION}")
-                else(GLIBC_VERSION LESS "220")
-                    message(STATUS "Glibc version is ${GLIBC_VERSION}, adding -D_DEFAULT_SOURCE")
-                    add_definitions(-D_DEFAULT_SOURCE)
-                endif(GLIBC_VERSION LESS "220")
-            endif(${GLIBC_VERSION})
-        endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-
-        string(REPLACE ";" " " _GCC_COMMON_C_AND_CXX_FLAGS_STRING "${_GCC_COMMON_C_AND_CXX_FLAGS}")
-        string(REPLACE ";" " " _GCC_COMMON_CXX_FLAGS_STRING "${_GCC_COMMON_CXX_FLAGS}")
-
-        string(APPEND CMAKE_C_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING}")
-        string(APPEND CMAKE_CXX_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING} ${_GCC_COMMON_CXX_FLAGS_STRING}")
-
-        set(QBT_ADDITONAL_FLAGS "${_GCC_COMMON_C_AND_CXX_FLAGS_STRING}" CACHE STRING
-            "Additional qBittorent compile flags" FORCE)
-        set(QBT_ADDITONAL_CXX_FLAGS "${_GCC_COMMON_CXX_FLAGS_STRING}" CACHE STRING
-            "Additional qBittorent C++ compile flags" FORCE)
-
-        # check whether we can enable -Og optimization for debug build
-        # also let's enable -march=native for debug builds
-        check_cxx_compiler_flag(-Og _DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-
-        if (_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-            string(APPEND CMAKE_C_FLAGS_DEBUG " -Og -g3 -march=native -pipe" )
-            string(APPEND CMAKE_CXX_FLAGS_DEBUG " -Og -g3 -march=native -pipe" )
-        else(_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-            string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g3 -march=native -pipe" )
-            string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g3 -march=native -pipe" )
-        endif (_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-    endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-
-    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-        set(QBT_ADDITONAL_FLAGS "-wd4290 -wd4275 -wd4251 /W4" CACHE STRING "Additional qBittorent compile flags")
-        string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITONAL_FLAGS}")
-        string(APPEND CMAKE_CXX_FLAGS " ${QBT_ADDITONAL_FLAGS}")
-    endif ()
-
-# endif (NOT QBT_ADDITONAL_FLAGS)
-endmacro(qbt_set_compiler_options)
-

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,91 +0,0 @@
-# Settings for compiling qBittorrent on Windows
-
-list(APPEND CMAKE_LIBRARY_PATH "$ENV{LIB}")
-
-# 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
-    -D__USE_W32_SOCKETS
-    -D_FILE_OFFSET_BITS=64)
-
-add_definitions(-DUNICODE
-    -D_UNICODE
-    -DWIN32
-    -D_WIN32
-    -DWIN32_LEAN_AND_MEAN
-    -DNTDDI_VERSION=0x05010000
-    -D_WIN32_WINNT=0x0501
-    -D_WIN32_IE=0x0501
-    -D_CRT_SECURE_NO_DEPRECATE
-    -D_SCL_SECURE_NO_DEPRECATE
-)
-# 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" CACHE PATH "Prefix used to install all the required libraries")
-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" CACHE PATH "Prefix where Qt4 is installed")
-set(QT5_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt5" CACHE PATH "Prefix where Qt5 is installed")
-
-# it is safe to set Qt dirs even if their files are directly in the prefix
-# Qt4
-if(NOT QT5)
-    # for qt 4 we need qmake, Qt5 provides cmake config files
-    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,16 +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
-# added /usr/local/include due to Qt 5.7.0 bug on macOS
-macx: EXTERNAL_INCLUDES += "/usr/local/include"
-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,7 +1383,14 @@ 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/gui/geoip/README) (default=no)
   --with-qtsingleapplication=[system|shipped]
                           Use the shipped qtsingleapplication library or the
                           system one (default=shipped)
@@ -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
 
@@ -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
 
 
@@ -4257,17 +4272,6 @@ else
 $as_echo "no" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is macOS" >&5
-$as_echo_n "checking whether OS is macOS... " >&6; }
-if expr "$host_os" : ".*darwin.*" > /dev/null; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      enable_qt_dbus=no
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
 # Require 0.23 pkg-config
 
 
@@ -4425,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
@@ -4466,70 +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
-
-if test -f "$QT_QMAKE/qmake"; then :
-  QT_QMAKE="$QT_QMAKE/qmake"
-else
-  if test -f "$QT_QMAKE/qmake-qt5"; 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=$?
@@ -4585,17 +4533,53 @@ fi
 
 fi
 
-if test -f "$QT_QMAKE/qmake"; then :
+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
-  if test -f "$QT_QMAKE/qmake-qt4"; then :
+  as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake-qt4" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake-qt4" >&5
+$as_echo_n "checking for $QT_QMAKE/qmake-qt4... " >&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-qt4"; 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-qt4"
 else
   QT_QMAKE=""
 fi
 
+
 fi
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 qmake >= 4.8.0" >&5
 $as_echo_n "checking for Qt4 qmake >= 4.8.0... " >&6; }
 if test "x$QT_QMAKE" != "x"; then :
@@ -4605,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
@@ -4623,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" && \
@@ -4734,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
 
@@ -4829,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
@@ -4845,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
@@ -4972,8 +5037,8 @@ fi
 if test "x$BOOST_CPPFLAGS" = "x"; then :
   as_fn_error $? "Could not find Boost" "$LINENO" 5
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost CPPFLAGS: $BOOST_CPPFLAGS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost CPPFLGAS: $BOOST_CPPFLAGS" >&5
-$as_echo "$as_me: Boost CPPFLAGS: $BOOST_CPPFLAGS" >&6;}
+$as_echo "$as_me: Boost CPPFLGAS: $BOOST_CPPFLAGS" >&6;}
       CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
       LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
 fi
@@ -5022,7 +5087,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 			 CXXFLAGS_SAVE=$CXXFLAGS
-			 CXXFLAGS=
 
 			 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5030,7 +5094,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 int
 main ()
 {
-boost::system::error_category *a = 0;
+boost::system::system_category
   ;
   return 0;
 }
@@ -5230,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-rasterbar 0.16.x" >&5
+$as_echo_n "checking whether to compile using libtorrent-rasterbar 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.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 ;; #(
+  "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.19\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 0.16.19") 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.19" 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.19\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 0.16.19") 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.19" 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.19" 2>&1`
+        else
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 0.16.19" 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.19) 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 #(
@@ -5247,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 #(
@@ -5360,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; }
@@ -5461,12 +5648,12 @@ if test -n "$zlib_CFLAGS"; then
     pkg_cv_zlib_CFLAGS="$zlib_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.5.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5
+  ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.5.2" 2>/dev/null`
+  pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5478,12 +5665,12 @@ if test -n "$zlib_LIBS"; then
     pkg_cv_zlib_LIBS="$zlib_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.5.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5
+  ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.5.2" 2>/dev/null`
+  pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5504,14 +5691,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib >= 1.2.5.2" 2>&1`
+	        zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib" 2>&1`
         else
-	        zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib >= 1.2.5.2" 2>&1`
+	        zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$zlib_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (zlib >= 1.2.5.2) were not met:
+	as_fn_error $? "Package requirements (zlib) were not met:
 
 $zlib_PKG_ERRORS
 
@@ -6962,7 +7149,7 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 if test "x$enable_systemd" = "xyes"; then :
-  ac_config_files="$ac_config_files dist/unix/systemd/qbittorrent-nox@.service"
+  ac_config_files="$ac_config_files dist/unix/systemd/qbittorrent-nox.service"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7716,7 +7903,7 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "conf.pri") CONFIG_FILES="$CONFIG_FILES conf.pri" ;;
-    "dist/unix/systemd/qbittorrent-nox@.service") CONFIG_FILES="$CONFIG_FILES dist/unix/systemd/qbittorrent-nox@.service" ;;
+    "dist/unix/systemd/qbittorrent-nox.service") CONFIG_FILES="$CONFIG_FILES dist/unix/systemd/qbittorrent-nox.service" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -8285,7 +8472,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/gui/geoip/README) (default=no)])],
+            [],
+            [with_geoip_database_embedded=no])
 
 AC_ARG_WITH(qtsingleapplication,
             [AS_HELP_STRING([--with-qtsingleapplication=@<:@system|shipped@:>@],
@@ -67,12 +79,6 @@ AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null],
       LIBS="-lexecinfo $LIBS"],
       [AC_MSG_RESULT([no])])
 
-AC_MSG_CHECKING([whether OS is macOS])
-AS_IF([expr "$host_os" : ".*darwin.*" > /dev/null],
-      [AC_MSG_RESULT([yes])
-      enable_qt_dbus=no],
-      [AC_MSG_RESULT([no])])
-
 # Require 0.23 pkg-config
 PKG_PROG_PKG_CONFIG([0.23])
 AS_IF([test "x$PKG_CONFIG" = "x"],
@@ -101,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".])])
@@ -127,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])
       ])
@@ -162,7 +169,7 @@ AX_BOOST_BASE([1.35])
 # how to test for a set vs unset variable.
 AS_IF([test "x$BOOST_CPPFLAGS" = "x"],
       [AC_MSG_ERROR([Could not find Boost])],
-      [AC_MSG_NOTICE([Boost CPPFLAGS: $BOOST_CPPFLAGS])
+      [AC_MSG_NOTICE([Boost CPPFLGAS: $BOOST_CPPFLAGS])
       CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
       LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])
 
@@ -174,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-rasterbar 0.16.x])
+AS_CASE(["x$with_libtorrent_rasterbar0_16"],
+        ["xno"],
+              [AC_MSG_RESULT([no])
+              PKG_CHECK_MODULES(libtorrent,
+                               [libtorrent-rasterbar >= 1.0.6],
+                               [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
+                               LIBS="$libtorrent_LIBS $LIBS"])],
+        ["xyes"],
+               [AC_MSG_RESULT([yes])
+               PKG_CHECK_MODULES(libtorrent,
+                                [libtorrent-rasterbar >= 0.16.19],
+                                [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
+                                LIBS="$libtorrent_LIBS $LIBS"])],
+        [AC_MSG_RESULT([$with_libtorrent_rasterbar0_16])
+        AC_MSG_ERROR([Unknown option "$with_libtorrent_rasterbar0_16". Use either "yes" or "no".])])
+
+AC_MSG_CHECKING([whether to embed the GeoIP database])
+AS_CASE(["x$with_geoip_database_embedded"],
+        ["xno"],
+              [AC_MSG_RESULT([no])
+              QBT_REMOVE_DEFINES="$QBT_REMOVE_DEFINES WITH_GEOIP_EMBEDDED"],
+        ["xyes"],
+               [AC_MSG_RESULT([yes])
+               QBT_ADD_DEFINES="$QBT_ADD_DEFINES WITH_GEOIP_EMBEDDED"],
+        [AC_MSG_RESULT([$with_geoip_database_embedded])
+        AC_MSG_ERROR([Unknown option "$with_geoip_database_embedded". Use either "yes" or "no".])])
+
 AC_MSG_CHECKING([which qtsingleapplication to use])
 AS_CASE(["x$with_qtsingleapplication"],
         ["xshipped"],
@@ -185,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"],
@@ -202,13 +237,8 @@ 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 >= 1.2.5.2],
+                 [zlib],
                  [CPPFLAGS="$zlib_CFLAGS $CPPFLAGS"
                  LIBS="$zlib_LIBS $LIBS"])
 
@@ -260,14 +290,14 @@ AC_SUBST(QBT_REMOVE_DEFINES)
 
 AC_OUTPUT(conf.pri)
 AS_IF([test "x$enable_systemd" = "xyes"],
-      [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)])
+      [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox.service)])
 
 
 
 AC_MSG_NOTICE([Running qmake to generate the makefile...])
 CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
 
-$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro "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

@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleName</key>
-	<string>@EXECUTABLE@</string>
+	<string>qBittorrent</string>
 	<key>CFBundleIconFile</key>
 	<string>qbittorrent_mac.icns</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -45,11 +45,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.16</string>
+	<string>3.2.5</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>
-	<string>@EXECUTABLE@</string>
+	<string>qbittorrent</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.qbittorrent</string>
 	<key>NSPrincipalClass</key>
@@ -59,7 +59,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2017 The qBittorrent project</string>
+	<string>Copyright © 2006-2015 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/mac/bundle.cmake

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

dist/unix/CMakeLists.txt

@@ -1,39 +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)
-
-if (GUI)
-    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)
-endif()

dist/unix/qBittorrent.appdata.xml

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

dist/unix/qbittorrent.appdata.xml

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

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

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

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

@@ -1,14 +0,0 @@
-[Unit]
-Description=qBittorrenti-nox service for user %I
-
-Documentation=man:qbittorrent-nox(1)
-After=network.target
-
-[Service]
-Type=simple
-PrivateTmp=false
-User=%i
-ExecStart=@EXPAND_BINDIR@/qbittorrent-nox
-
-[Install]
-WantedBy=multi-user.target

dist/windows/CMakeLists.txt

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

dist/windows/README.txt

@@ -1,28 +1,32 @@
 TRANSLATORS:
 
-1. Use an editor that has NSIS syntax highlighting(eg Notepad++/Geany). This will
+1. Use an editor that has NSIS syntax highlighting(eg Notepad++/Geany). This will 
    make your life easier.
-2. Open the relevant .nsi file that exists in the folder named
+2. Open the relevant .nsi file that exists in the folder named 
    "installer-translations"
-3. Lines starting with ";" are considered comments. These include the
+3. Lines starting with ";" are considered comments. These include the 
    english message to help you with the translation.
-4. Edit only the part inside the quotation marks(""). Unless you know
+4. Edit only the part inside the quotation marks(""). Unless you know 
    what you are doing.
 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:
 
 You will need NSIS and upx to make the installer. You need a unicode version of NSIS.
-I tested with NSIS 3.0 (final).
+I tested with NSIS 3.0a0. 
 
 1. Open the options.nsi file in an editor and change line that contains
-   "!define PROG_VERSION "3.0.3"" to the version of qbittorrent you just built.
+   "!define PROG_VERSION "3.0.3"" to the version of qbittorrent you just built. 
-2. Extract the plugins found in the folder "nsis plugins" into your
+2. Extract the plugins found in the folder "nsis plugins" into your 
    NSIS's unicode Plugin directory(usually C:\Program Files\NSIS\Plugins\x86-unicode).
-   Only the *.dll files are needed. Use the unicode version of the dlls.
+   Only the *.dll files are needed. Don't use the .dll from UAC.zip, use the one from "UAC Unicode.zip".
+   NOTE: To build the unicode version of UAC with MSVC2008 you need:
+    a) the sources from UAC.zip
+    b) apply the util.cpp.diff from "UAC Unicode.zip" to util.cpp
+    c) in a msvc command prompt issue: cl.exe /O1s /GS- /GR- /EHs-c- /Zl /LD /DUNICODE RunAs.cpp uac.cpp util.cpp /link kernel32.lib user32.lib shell32.lib advapi32.lib ole32.lib /DLL /MANIFEST:NO /OUT:uac.dll 
 3. The script you need to compile is "qbittorrent.nsi". It includes all other necessary scripts.
 4. The script expects the following file tree:
 
@@ -37,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
@@ -49,11 +50,10 @@ qbittorrent.exe
 qbittorrent.nsi
 qt.conf
 translations.nsi
-UAC.nsh
 uninstaller.nsi
 
 
-5. "license.txt" is a text file that contains the text rendered
+5. "license.txt" is a text file that contains the text rendered 
    from src\gui\gpl.html or the text contained in COPYING
 6. "qbittorrent.exe" is the compiled binary file.
 
@@ -61,7 +61,7 @@ SCRIPT HACKERS:
 
 If you add any new LangString variable to the scripts you NEED to provide
 "translations" of it to all the .nsi files inside "installer-translations.
-You can always leave the english string but you have to use all the LANG_<lang name>
+You can always leave the english string but you have to use all the LANG_<lang name> 
-for the given variable. Otherwise, if the user chooses a language that you
+for the given variable. Otherwise, if the user chooses a language that you 
-haven't provided a LANG_<lang name> for your variable then your string will be empty.
+haven't provided a LANG_<lang name> for your variable then your string will be empty. 
 Don't worry though, NSIS throws warnings for this when compiling the scripts.

dist/windows/UAC.nsh

@@ -228,8 +228,6 @@ pop $_LOGICLIB_TEMP
 !undef _UAC_ParseDefineFlags_orin_this
 !ifdef _UAC_ParseDefineFlags_orin_f1
 	!undef _UAC_ParseDefineFlags_orin_f1
-!endif
-!ifdef _UAC_ParseDefineFlags_orin_f2
 	!undef _UAC_ParseDefineFlags_orin_f2
 !endif
 !macroend

dist/windows/installer-translations/afrikaans.nsi

@@ -16,14 +16,10 @@ 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."
 LangString launch_qbt ${LANG_AFRIKAANS} "Launch qBittorrent."
-;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_AFRIKAANS} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/albanian.nsi

@@ -16,14 +16,10 @@ 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."
 LangString launch_qbt ${LANG_ALBANIAN} "Launch qBittorrent."
-;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_ALBANIAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/arabic.nsi

@@ -16,14 +16,10 @@ 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} "يوجد نسخة سابقة من البرنامج. سيتم إزالتها دون حذف إعدادات المستخدم"
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ARABIC} "جاري ازالة النسخة السابقة من البرنامج"
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ARABIC} "تشغيل البرنامج"
-;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_ARABIC} "هذا المثبت يعمل فقط في نسخ ويندوز 64 بت"
 
 
 ;------------------------------------

dist/windows/installer-translations/basque.nsi

@@ -16,14 +16,10 @@ 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."
 LangString launch_qbt ${LANG_BASQUE} "Abiarazi qBittorrent."
-;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_BASQUE} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/belarusian.nsi

@@ -16,14 +16,10 @@ 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."
 LangString launch_qbt ${LANG_BELARUSIAN} "Launch qBittorrent."
-;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_BELARUSIAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------