Bump to 4.1.0

.appveyor.yml

@@ -45,14 +45,13 @@ before_build:
   - 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%\conf.pri" "%REPO_DIR%"
+  - 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%"
-  # scan only as lupdate is prone to hang
-  - lupdate -extensions c,cpp,h,hpp,ui .
   - qmake qbittorrent.pro && cd src && qmake src.pro
   - jom -j2 -f Makefile.Release
 

.github/ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@
 ### qBittorrent version and Operating System
 (type here)
 
-### If on linux, libtorrent-rasterbar and Qt version
+### If on linux, libtorrent and Qt version
 (type here)
 
 ### What is the problem

.gitignore

@@ -4,7 +4,6 @@ src/qbittorrent
 src/qbittorrent-nox
 src/release
 src/debug
-CMakeLists.txt.user*
 qbittorrent.pro.user*
 conf.pri
 Makefile*
@@ -23,7 +22,6 @@ qrc_*.cpp
 ui_*.h
 *.moc
 src/lang/qbittorrent_*.qm
-src/webui/www/translations/webui_*.qm
 .DS_Store
 .qmake.stash
 src/qbittorrent.app
@@ -36,7 +34,3 @@ config.status
 src/icons/qbt-theme/build-icons/node_modules/
 src/icons/skin/build-icons/node_modules/
 src/icons/skin/build-icons/icons/*.png
-
-# Web UI tools
-node_modules
-package-lock.json

.travis.yml

@@ -3,29 +3,25 @@ language: cpp
 os:
   - linux
   - osx
-
-dist: xenial
+osx_image: xcode7.3
 
 env:
   matrix:
-    - libt_branch=RC_1_2 gui=true build_system=qmake
-    - libt_branch=RC_1_2 gui=false build_system=qmake
-    - libt_branch=RC_1_2 gui=true build_system=cmake
-    - libt_branch=RC_1_2 gui=false build_system=cmake
-    - libt_branch=RC_1_1 gui=true build_system=qmake
-    - libt_branch=RC_1_1 gui=false build_system=qmake
-    - libt_branch=RC_1_1 gui=true build_system=cmake
-    - libt_branch=RC_1_1 gui=false build_system=cmake
+    # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
+    #- lt_branch=dist gui=true
+    #- lt_branch=dist gui=false
+    - lt_branch=RC_1_0 gui=true build_system=cmake
+    - lt_branch=RC_1_0 gui=false build_system=cmake
+    - lt_branch=RC_1_0 gui=true build_system=qmake
+    - lt_branch=RC_1_0 gui=false build_system=qmake
   global:
     - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
     - coverity_branch: coverity_scan
 
 matrix:
   allow_failures:
-    - env: libt_branch=RC_1_2 gui=true build_system=cmake
-    - env: libt_branch=RC_1_2 gui=false build_system=cmake
-    - env: libt_branch=RC_1_1 gui=true build_system=cmake
-    - env: libt_branch=RC_1_1 gui=false build_system=cmake
+    - env: lt_branch=RC_1_0 gui=true build_system=cmake
+    - env: lt_branch=RC_1_0 gui=false build_system=cmake
 
 branches:
   except:
@@ -40,183 +36,157 @@ notifications:
 cache:
   ccache: true
   directories:
-    - $HOME/travis/deb
-    - $HOME/travis/brew
+    - $HOME/hombebrew_cache
+
+# opt-in Ubuntu Trusty
+dist: trusty
+# container-based builds
+sudo: false
 
 addons:
   coverity_scan:
     project:
       name: "qbittorrent/qBittorrent"
       description: "Build submitted via Travis CI"
-    build_command_prepend: "./bootstrap.sh && ./configure $qmake_conf"
-    build_command: "make -j2"
+    build_command_prepend: "./bootstrap.sh && ./configure $qbtconf"
+    build_command: make
     branch_pattern: $coverity_branch
     notification_email: sledgehammer999@qbittorrent.org
   apt:
     sources:
-      # sources list: https://github.com/travis-ci/apt-source-safelist/blob/master/ubuntu.json
+      # 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-qt59-xenial'
+      - sourceline: 'ppa:beineri/opt-qt551-trusty'
+      - sourceline: 'ppa:adrozdoff/cmake'
     packages:
-      # packages list: https://github.com/travis-ci/apt-package-safelist/blob/master/ubuntu-trusty
+      # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
       - [autoconf, automake, colormake]
-      - [libboost-dev, libboost-system-dev]
+      - [cmake, ninja-build]
       - libssl-dev
+      - [libboost-dev, libboost-system-dev]
       - libtorrent-rasterbar-dev
-      - [qt59base, qt59svg, qt59tools]
-      - zlib1g-dev
-      # required for Qt 5.9 from 'beineri' PPA
-      - libgl1-mesa-dev
+      - [qt55base, qt55svg, qt55tools]
+      - [gcc-6, g++-6]
 
 before_install:
   # only allow specific build for coverity scan, others will stop
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$libt_branch" = "RC_1_2" -a "$gui" = "true" -a "$build_system" = "qmake" ]; then exit ; fi
+  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true -a "$build_system" = "qmake" ]; then exit ; fi
 
   - shopt -s expand_aliases
-  - alias make="colormake -j2" # Using nprocs/2 sometimes may fail (gcc is killed by system)
+  - alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system)
   - qbt_path="$HOME/qbt_install"
-  - qmake_conf="$qmake_conf --prefix=$qbt_path"
-  - cmake_conf="$cmake_conf -DCMAKE_INSTALL_PREFIX=$qbt_path"
+  - |
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH=/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH"
+    else
+      qbtconf="$qbtconf --prefix="$qbt_path""
+    fi
 
   # options for specific branches
+  - if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; 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 ;
+      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.9
-      PATH=/opt/qt59/bin:${PATH}
-      qmake_conf="$qmake_conf PKG_CONFIG_PATH=/opt/qt59/lib/pkgconfig:$PKG_CONFIG_PATH"
-      cmake_conf="$cmake_conf PKG_CONFIG_PATH=/opt/qt59/lib/pkgconfig:$PKG_CONFIG_PATH"
-    fi
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedefs"
+      # Qt 5
+      PATH=/opt/qt55/bin:${PATH}
 
-      openssl_root_path="/usr/local/opt/openssl"
-      qmake_conf="$qmake_conf PKG_CONFIG_PATH=$openssl_root_path/lib/pkgconfig:$PKG_CONFIG_PATH"
-      cmake_conf="$cmake_conf -DOPENSSL_ROOT_DIR=$openssl_root_path"
-    fi
-  - |
-    if [ "$gui" = "false" ]; then
-      qmake_conf="$qmake_conf --disable-gui"
-      cmake_conf="$cmake_conf -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=ON"
+      if [ "$build_system" = "cmake" ]; then
+          COMPILER_VERSION=6
+          export CXX="${CXX}-${COMPILER_VERSION}" CC="${CC}-${COMPILER_VERSION}"
+      fi
     fi
 
   # print settings
-  - echo $libt_branch
+  - echo $lt_branch
   - echo $gui
   - echo $build_system
-  - echo $qmake_conf
-  - echo $cmake_conf
+  - echo $ltconf
+  - echo $qbtconf
 
 install:
+  #- |
+    #if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      # 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
-      PATH="/usr/local/opt/ccache/libexec:$PATH"
-
       brew update > /dev/null
-      brew install ccache colormake boost openssl qt zlib
-      brew link --force qt zlib
+      brew outdated "pkg-config" || brew upgrade "pkg-config"
+      brew install colormake ccache zlib qt
+      PATH="/usr/local/opt/ccache/libexec:$PATH"
+      brew link --force zlib qt
+
+      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.1.7+git20180422.3ede0b9c20+patched-configure.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.1.7+git20180422.3ede0b9c20+patched-configure.el_capitan.bottle.tar.gz" "$(brew --cache)"
+      brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb"
 
       if [ "$build_system" = "cmake" ]; then
-        sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
-        sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins
+        brew outdated cmake || brew upgrade cmake
+        brew install ninja
+
+        ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
+        ln -s /usr/local/opt/qt/plugins /usr/local/plugins
       fi
+
+      MY_CMAKE_OPENSSL_HINT="-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/"
     fi
   - |
     if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
       export use_ccache=true
-      ccache -M 512M
       ccache -V && ccache --show-stats && ccache --zero-stats
     fi
-  - |
-    if [ "$libt_branch" = "RC_1_2" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      wget https://builds.shiki.hu/travis/deb/version
-      if ! cmp --quiet "version" "$HOME/travis/deb/version" ; then
-        echo "Cached files are different from server. Downloading new ones."
-        # First delete old files
-        rm -r "$HOME/travis/deb"
-        mkdir "$HOME/travis/deb"
-        cp "version" $HOME/travis/deb
-        cd "$HOME/travis/deb"
-        wget https://builds.shiki.hu/travis/deb/libtorrent-rasterbar-dev_1.2.x_amd64.deb
-        wget https://builds.shiki.hu/travis/deb/libtorrent-rasterbar10_1.2.x_amd64.deb
-      fi
-
-      sudo dpkg -i "$HOME/travis/deb/libtorrent-rasterbar-dev_1.2.x_amd64.deb" "$HOME/travis/deb/libtorrent-rasterbar10_1.2.x_amd64.deb"
-    fi
-  - |
-    if [ "$libt_branch" = "RC_1_1" ] && [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      wget https://builds.shiki.hu/travis/brew/1_1/version
-      if ! cmp --quiet "version" "$HOME/travis/brew/1_1/version" ; then
-        echo "Cached files are different from server. Downloading new ones."
-        # First delete old files
-        rm -r "$HOME/travis/brew/1_1"
-        mkdir "$HOME/travis/brew/1_1"
-        cp "version" $HOME/travis/brew/1_1
-        cd "$HOME/travis/brew/1_1"
-        wget https://builds.shiki.hu/travis/brew/1_1/libtorrent-rasterbar.rb
-        wget https://builds.shiki.hu/travis/brew/1_1/bd36a4b440aa138a88e375c1a3b672f1a1bc6606e7866fc3415b6b98fa49e771--libtorrent-rasterbar-1.1.13.high_sierra.bottle.tar.gz
-      fi
-      # Copy custom libtorrent bottle to homebrew's download 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/travis/brew/1_1/bd36a4b440aa138a88e375c1a3b672f1a1bc6606e7866fc3415b6b98fa49e771--libtorrent-rasterbar-1.1.13.high_sierra.bottle.tar.gz" "$(brew --cache)/downloads"
-      brew uninstall libtorrent-rasterbar
-      brew install "$HOME/travis/brew/1_1/libtorrent-rasterbar.rb"
-
-      # NOTE about the bottle name
-      # The part before the "--" characters is a sha256 hash of the string
-      # of the URL homebrew itself would use to download the bottle.
-      # In this case the URL is the following:
-      # http://127.0.0.1/libtorrent-rasterbar-1.1.13.high_sierra.bottle.tar.gz
-    fi
-  - |
-    if [ "$libt_branch" = "RC_1_2" ] && [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      wget https://builds.shiki.hu/travis/brew/version
-      if ! cmp --quiet "version" "$HOME/travis/brew/version" ; then
-        echo "Cached files are different from server. Downloading new ones."
-        # First delete old files
-        rm -r "$HOME/travis/brew"
-        mkdir "$HOME/travis/brew"
-        cp "version" $HOME/travis/brew
-        cd "$HOME/travis/brew"
-        wget https://builds.shiki.hu/travis/brew/libtorrent-rasterbar.rb
-        wget https://builds.shiki.hu/travis/brew/6e4eb13f70df35e8fc7ff41883fef3e5c7b535dd55c78cd2ce1eae3fb4288e21--libtorrent-rasterbar-1.2.0.high_sierra.bottle.tar.gz
-      fi
-      # Copy custom libtorrent bottle to homebrew's download 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/travis/brew/6e4eb13f70df35e8fc7ff41883fef3e5c7b535dd55c78cd2ce1eae3fb4288e21--libtorrent-rasterbar-1.2.0.high_sierra.bottle.tar.gz" "$(brew --cache)/downloads"
-      brew uninstall libtorrent-rasterbar
-      brew install "$HOME/travis/brew/libtorrent-rasterbar.rb"
-
-      # NOTE about the bottle name
-      # The part before the "--" characters is a sha256 hash of the string
-      # of the URL homebrew itself would use to download the bottle.
-      # In this case the URL is the following:
-      # http://127.0.0.1/libtorrent-rasterbar-1.2.0.high_sierra.bottle.tar.gz
-    fi
 
 script:
   - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # skip usual build when running coverity scan
   - |
     cd "$TRAVIS_BUILD_DIR"
-    if [ "$build_system" = "qmake" ]; then
-      # scan only as lupdate is prone to hang
-      lupdate -extensions c,cpp,h,hpp,ui ./
-      ./bootstrap.sh
-      ./configure $qmake_conf CXXFLAGS="$CXXFLAGS"
-    else
-      mkdir build && cd build
-      cmake $cmake_conf ../
+    if [ "$build_system" = "cmake" ]; then
+      mkdir build
+      cd build
+      cmake -DGUI=${gui} -DCMAKE_INSTALL_PREFIX="$qbt_path" "$MY_CMAKE_OPENSSL_HINT" \
+        -G "Ninja" -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE ..
+      BUILD_TOOL="ninja"
     fi
-  - make && make install
+    if [ "$build_system" = "qmake" ]; then
+      if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+        # For some reason for RC_1_1 we need to also specify the OpenSSL compiler/linker flags
+        # Homebrew doesn't symlink OpenSSL for security reasons
+        ./bootstrap.sh && ./configure $qbtconf CXXFLAGS="$(PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --cflags openssl)" LDFLAGS="$(PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --libs openssl)"
+        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
+      else
+        ./bootstrap.sh && ./configure $qbtconf
+      fi
+      BUILD_TOOL="make"
+    fi
+  - $BUILD_TOOL && $BUILD_TOOL install
 
 after_success:
-  - if [ "$gui" = "true" ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi
+  - if [ "$gui" = true ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd "$qbt_path/bin" ; fi
   - |
     if [ "$TRAVIS_OS_NAME" = "osx" ]; then

.tx/config

@@ -10,18 +10,10 @@ type = QT
 minimum_perc = 23
 mode = developer
 
+
 [qbittorrent.qbittorrentdesktop_master]
-source_file = dist/unix/org.qbittorrent.qBittorrent.desktop
+source_file = src/icons/qBittorrent.desktop
 source_lang = en
 type = DESKTOP
 minimum_perc = 23
 mode = developer
-
-[qbittorrent.qbittorrent_webui]
-file_filter = src/webui/www/translations/webui_<lang>.ts
-lang_map = pt: pt_PT
-source_file = src/webui/www/translations/webui_en.ts
-source_lang = en
-type = QT
-minimum_perc = 23
-mode = developer

CMakeLists.txt

@@ -1,10 +1,5 @@
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
-
-message(AUTHOR_WARNING "If the build fails, please try the autotools/qmake method.")
-
-if(POLICY CMP0074)
-    cmake_policy(SET CMP0074 NEW)
-endif()
+cmake_minimum_required(VERSION 3.5)
+cmake_policy(VERSION 3.5)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 include(FunctionReadVersion)
@@ -30,31 +25,32 @@ add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
 add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
 add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
 
-include(GNUInstallDirs)
-include(FeatureSummary)
-
-# version requirements
-set(requiredBoostVersion 1.40)
-set(requiredQtVersion 5.9.0)
-set(requiredOpensslVersion 1.0)
-set(requiredLibtorrentVersion 1.1.10)
+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)
 
-# we need options here, at the top level, because they are used not only in "src" subdir, but in the "dist" dir too
-include(CompileFeature)
+option(SYSTEM_QTSINGLEAPPLICATION
+    "Use the system qtsingleapplication library or shipped one otherwise")
+
+option(GUI "Allows to disable GUI for headless running. Disables QtDBus and the GeoIP Database" ON)
+
+option(WEBUI "Allows to disable the WebUI." ON)
+
+option(STACKTRACE "Enable stacktrace feature" ON)
+
+if (UNIX)
+    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(UNIX)
 
-optional_compile_definitions(COUNTRIES_RESOLUTION FEATURE DESCRIPTION "Enable resolving peers IP addresses to countries"
-    DEFAULT ON DISABLED DISABLE_COUNTRIES_RESOLUTION)
-optional_compile_definitions(STACKTRACE FEATURE DESCRIPTION "Enable stacktraces"
-    DEFAULT ON ENABLED STACKTRACE)
-optional_compile_definitions(WEBUI FEATURE DESCRIPTION "Enables built-in HTTP server for headless use"
-    DEFAULT ON DISABLED DISABLE_WEBUI)
 
 add_subdirectory(src)
 add_subdirectory(dist)
-
-feature_summary(DESCRIPTION "\nConfiguration results:" WHAT ALL)

CODING_GUIDELINES.md

@@ -6,31 +6,6 @@ For programming languages other than C++ (e.g. JavaScript) used in this reposito
 **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.  
 
-### Table Of Contents
-
-* [1. New lines & curly braces](#1-new-lines--curly-braces)
-  * [a. Function blocks, class/struct definitions, namespaces](#a-function-blocks-classstruct-definitions-namespaces)
-  * [b. Other code blocks](#b-other-code-blocks)
-  * [c. Blocks in switch's case labels](#c-blocks-in-switchs-case-labels)
-  * [d. If-else statements](#d-if-else-statements)
-  * [e. Single statement if blocks](#e-single-statement-if-blocks)
-  * [f. Acceptable conditions to omit braces](#f-acceptable-conditions-to-omit-braces)
-  * [g. Brace enclosed initializers](#g-brace-enclosed-initializers)
-* [2. Indentation](#2-indentation)
-* [3. File encoding and line endings](#3-file-encoding-and-line-endings)
-* [4. Initialization lists](#4-initialization-lists)
-* [5. Enums](#5-enums)
-* [6. Names](#6-names)
-  * [a. Type names and namespaces](#a-type-names-and-namespaces)
-  * [b. Variable names](#b-variable-names)
-  * [c. Private member variable names](#c-private-member-variable-names)
-* [7. Header inclusion order](#7-header-inclusion-order)
-* [8. Include guard](#8-include-guard)
-* [9. Misc](#9-misc)
-* [10. Git commit message](#10-git-commit-message)
-* [11. Not covered above](#11-not-covered-above)
----
-
 ### 1. New lines & curly braces ###
 
 #### a. Function blocks, class/struct definitions, namespaces ####
@@ -190,11 +165,11 @@ QVariantMap map {{"key1", 5}, {"key2", 10}};
 ### 2. Indentation ###
 4 spaces.
 
-### 3. File encoding and line endings ###
+### 3. File encoding and line endings. ###
 
 UTF-8 and Unix-like line ending (LF). Unless some platform specific files need other encodings/line endings.
 
-### 4. Initialization lists ###
+### 4. Initialization lists. ###
 Initialization lists should be vertical. This will allow for more easily readable diffs. The initialization colon should be indented and in its own line along with first argument. The rest of the arguments should be indented too and have the comma prepended.
 ```c++
 myClass::myClass(int a, int b, int c, int d)
@@ -207,7 +182,7 @@ myClass::myClass(int a, int b, int c, int d)
 }
 ```
 
-### 5. Enums ###
+### 5. Enums. ###
 Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
 ```c++
 enum Days
@@ -222,7 +197,7 @@ enum Days
 };
 ```
 
-### 6. Names ###
+### 6. Names. ###
 All names should be camelCased.
 
 #### a. Type names and namespaces ####
@@ -256,7 +231,7 @@ class MyClass
 }
 ```
 
-### 7. Header inclusion order ###
+### 7. Header inclusion order. ###
 The headers should be placed in the following group order:
   1. Module header (in .cpp)
   2. C++ Standard Library headers
@@ -264,11 +239,11 @@ The headers should be placed in the following group order:
   4. Boost library headers
   5. Libtorrent headers
   6. Qt headers
-  7. qBittorrent's own headers, starting from the *base* headers.
+  7. qBittorrent own headers, starting from *base* headers.
 
 The headers should be ordered alphabetically within each group.  
 If there are conditionals for the same header group, then put them at the bottom of the respective group.  
-If there are conditionals that contain headers from several different header groups, then put them above the "qBittorrent's own headers" group.
+If there are conditionals for the different header groups, then put them above of the "qBittorrent own headers" group.
 
 One exception is the header containing the library version (for example, QtGlobal), this particular header isn't constrained by the aforementioned order.
 
@@ -306,23 +281,23 @@ Example:
 #include <QString>
 #include <QUrl>
 
-#ifdef Q_OS_MACOS  // conditional
+#ifdef Q_OS_MAC  // conditional
 #include <QFont>
 #endif
 
-// conditional that contains headers from several different header groups
+// conditional for the different header groups
 #if LIBTORRENT_VERSION_NUM >= 10100
 #include <memory>
 #include <QElapsedTimer>
 #endif
 
-// qBittorrent's own headers
+// qBittorrent own headers
 #include "base/bittorrent/infohash.h"
 #include "anothermodule.h"
 #include "ui_examplewidget.h"
 ```
 
-### 8. Include guard ###
+### 8. Include guard. ###
 `#pragma once` should be used instead of "include guard" in new code:
 ```c++
 // examplewidget.h
@@ -338,7 +313,7 @@ class ExampleWidget : public QWidget
 
 ```
 
-### 9. Misc ###
+### 9. Misc. ###
 
 * Line breaks for long lines with operation:
 

Changelog

@@ -1,421 +1,3 @@
-Wed Dec 18 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.1
-    - FEATURE: Enable portable mode if "profile" directory exists (Tester798)
-    - FEATURE: Enable "Apply rate limit to peers on LAN" option by default (Chocobo1)
-    - BUGFIX: Sync translations from Transifex and run lupdate (sledgehammer999)
-    - BUGFIX: Don't unnecessarily delete OS files in folders (sledgehammer999)
-    - BUGFIX: Use the incomplete folder where appropriate (sledgehammer999)
-    - BUGFIX: Align Properties tab bar correctly on window resize (Prince Gupta)
-    - BUGFIX: Rework the listening IP/interface selection code (sledgehammer999)
-    - BUGFIX: Fix inconsistent icon for deleting torrent (Chocobo1)
-    - BUGFIX: Show torrent error message in transfer list (Chocobo1)
-    - BUGFIX: Fix stuck in wrong torrent state (Chocobo1)
-    - BUGFIX: Expand single-item folders in torrent content (warren)
-    - WEBUI: Bump Web API version (sledgehammer999)
-    - WEBUI: Add ability to rename torrent files from the WebUI (Thomas Piccirello)
-    - WEBUI: Mention lack of HTTPS in WebUI magnet link warning (nl6720)
-    - WEBUI: Fix HTML elements size in search tab (Chocobo1)
-    - SEARCH: Fix incorrect translation displayed after language change (Chocobo1)
-    - SEARCH: Fix missing translations in search plugins dialog (Chocobo1)
-    - WINDOWS: Update russian translation of the installer (Andrei Stepanov)
-
-Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
-    - FEATURE: Libtorrent 1.2.x series are supported now (glassez)
-    - FEATURE: Add OpenSSL version to GUI and stackdump (Chocobo1)
-    - FEATURE: Add zlib version to GUI & stackdump (silverqx)
-    - FEATURE: Use PBKDF2 for the GUI lock. You will need to set your password again. (Chocobo1)
-    - FEATURE: Rename "#" column to "Tier" in the tracker list (thalieht)
-    - FEATURE: Allow setting larger checking memory usage in GUI (airium)
-    - FEATURE: Converted remaining icons to svg (Bert Verhelst)
-    - FEATURE: Replace CheckBox with Arrow in the side panel (Prince Gupta)
-    - FEATURE: Log performance alerts from libtorrent (Chocobo1)
-    - FEATURE: Use native folder icon in content tree (Chocobo1)
-    - FEATURE: Move copy actions under a submenu (Chocobo1)
-    - FEATURE: Add "Socket backlog size" option (Chocobo1)
-    - FEATURE: Add "File pool size" option (Chocobo1)
-    - FEATURE: Allow styling with QSS stylesheets (Prince Gupta)
-    - FEATURE: Add "Tracker entries" dialog (Chocobo1)
-    - FEATURE: Add availability column (Chocobo1)
-    - FEATURE: Use a randomized port number for the first run (Chocobo1)
-    - FEATURE: Enable Super Seeding mode once ratio/time limit is reached (thalieht)
-    - FEATURE: Improve embedded tracker. Now it conforms to BEPs more closely. (Chocobo1)
-    - FEATURE: Add option to align file to piece boundary when creating new torrent (Chocobo1)
-    - FEATURE: Ability to open file or trigger torrect action via keypad Enter (Chocobo1)
-    - FEATURE: Add "Remove torrent and its files" option to share ratio limiting (thalieht)
-    - FEATURE: Allow to select multiple entries in "banned IP" dialog (Chocobo1)
-    - FEATURE: Reallow to pause checking torrents (thalieht)
-    - FEATURE: Reallow to force recheck torrents that aren't fully started (thalieht)
-    - FEATURE: Add "Preview file" double-click action (warren)
-    - BUGFIX: Avoid performance penalty when logger is full (Chocobo1)
-    - BUGFIX: Remove the max half-open connections option (thalieht)
-    - BUGFIX: Center align the section labels in advanced settings (thalieht)
-    - BUGFIX: Add documentation links to some advanced settings (thalieht)
-    - BUGFIX: Impove DownloadManager code (glassez)
-    - BUGFIX: Limit DownloadHandler max redirection to 20 (Chocobo1)
-    - BUGFIX: Log DownloadManager SSL errors (Chocobo1)
-    - BUGFIX: Force recheck multiple torrents one by one (glassez)
-    - BUGFIX: Close context menu when content model is reset (glassez)
-    - BUGFIX: Improve Properties widget (glassez)
-    - BUGFIX: Prevent flickering preview dialog (silver)
-    - BUGFIX: Rename "Prefer encryption" to "Allow encryption" (thalieht)
-    - BUGFIX: Fix search icon placement when using RTL languages (Chocobo1)
-    - BUGFIX: Avoid combo boxes extending to the right in Options dialog (Chocobo1)
-    - BUGFIX: Fix speed limit not applying to IPv6 peers (Chocobo1)
-    - BUGFIX: Log failed file rename errors (Chocobo1)
-    - BUGFIX: Fix wrong "Time Active" value displayed (Chocobo1)
-    - BUGFIX: Rename priority to queue in the context of torrents (thalieht)
-    - BUGFIX: Update remaining size of ignored files to 0 (Thomas Piccirello)
-    - BUGFIX: Move "Check for program updates" checkbox to the Behavior settings (Chocobo1)
-    - BUGFIX: Improve error messages for URL seed (Chocobo1)
-    - BUGFIX: Rename share ratio limiting options (thalieht)
-    - BUGFIX: Fix country name misspelling (horgan)
-    - PERFORMANCE: Faster/efficient way of handling updates in the Transfer list (Chocobo1)
-    - WEBUI: Bump Web API version
-    - WEBUI: Use PBKDF2 for the WebUI password. You will need to set your password again. (Chocobo1)
-    - WEBUI: Use Javascript strict mode (Chocobo1)
-    - WEBUI: Remove autocorrect/autocapitalise from filepaths on WebUI (AceLewis)
-    - WEBUI: Display warning when Javascript is disabled (Chocobo1)
-    - WEBUI: Remove mootools lib from login page (Chocobo1)
-    - WEBUI: Prevent login credential appearing in URL (Chocobo1)
-    - WEBUI: Load WebUI certificate & key from file path (Chocobo1)
-    - WEBUI: Add migration code for WebUI https related change (Chocobo1)
-    - WEBUI: Fix wrong element id being used (Thomas Piccirello)
-    - WEBUI: Fix direction of Web UI sorted column icon (Thomas Piccirello)
-    - WEBUI: Match WebUI About page to GUI (Thomas Piccirello)
-    - WEBUI: Simplify tab logic (Thomas Piccirello)
-    - WEBUI: Separate URL components before percent-decoding (glassez)
-    - WEBUI: Capitalize event name (Thomas Piccirello)
-    - WEBUI: Fix bug where input wouldn't always be focused (Thomas Piccirello)
-    - WEBUI: Add Web UI support for escape key (Thomas Piccirello)
-    - WEBUI: Fix broken image link (Tom Piccirello)
-    - WEBUI: Include application version in css/js url for cache busting (Thomas Piccirello)
-    - WEBUI: Update WebUI img to use svg images (Chocobo1)
-    - WEBUI: Fix speed limit icon too large on WebUI (Chocobo1)
-    - WEBUI: Fix misaligned icons in STATUS list in GUI (Chocobo1)
-    - WEBUI: Drop legacy WebAPI support (glassez)
-    - WEBUI: Allow WebUI Content tab to be sorted (Thomas Piccirello)
-    - WEBUI: Encode torrent name before passing in URL (Thomas Piccirello)
-    - WEBUI: Move WebUI Peers code to separate file (Thomas Piccirello)
-    - WEBUI: Prevent WebUI tables from being highlighted (Thomas Piccirello)
-    - WEBUI: Allow WebUI Trackers table to be manipulated (Thomas Piccirello)
-    - WEBUI: Fix only the first newline char is replaced (Chocobo1)
-    - WEBUI: Fix missing semicolon in WebUI (Chocobo1)
-    - WEBUI: Add autocomplete attribute to WebUI (Chocobo1)
-    - WEBUI: Always use index.html as default page (CzBiX)
-    - WEBUI: Set title attribute for all WebUI table cells (Thomas Piccirello)
-    - WEBUI: Align WebUI login button to the right (Chocobo1)
-    - WEBUI: Use force refresh on WebUI logout (Chocobo1)
-    - WEBUI: Use a random number for WebUI cache busting (Chocobo1)
-    - WEBUI: Register protocol handler in WebUI for magnet links (Cory)
-    - WEBUI: Add WebAPI session timeout settings (Chocobo1)
-    - WEBUI: Fix encoding of special characters (Tom Piccirello)
-    - WEBUI: Avoid word wrap in webui footer (airium)
-    - WEBUI: Add advanced options in WebUI (Zhaoyu Gan)
-    - WEBUI: Move WebUI copy actions under a submenu (Thomas Piccirello)
-    - WEBUI: Add WebUI support for triggering context menus on mobile (Thomas Piccirello)
-    - WEBUI: Implement tag management for WebUI (Vasiliy Halimonchuk)
-    - WEBUI: Fix WebUI removing parameters from magnet links (Thomas Piccirello)
-    - WEBUI: Enable by default the search tab (Thomas Piccirello)
-    - WEBUI: Add context menu to Web UI search table (Thomas Piccirello)
-    - WEBUI: Display files hierarchically in Web UI content tab (Thomas Piccirello)
-    - WEBUI: Add ability to add and ban a peer from the Web UI (Thomas Piccirello)
-    - WEBUI: Increase WebUI window heights (Thomas Piccirello)
-    - WEBUI: Sort torrent names case-insensitively in webui (airium)
-    - WEBUI: Support exclusions in WebUI table filters (Thomas Piccirello)
-    - WEBUI: Don't save preferences until all options are processed (Tom Piccirello)
-    - WEBUI: Disable port selection when "Use different port on each startup" is selected (Chocobo1)
-    - WEBUI: Remove max character limit of location path (Clément Pera)
-    - RSS: Better widget for choosing file path in automated downloader (thalieht)
-    - RSS: Allow to cancel/retry the fetching of feeds (glassez)
-    - RSS: Add create subfolder option to RSS auto-download rules (Xegor)
-    - RSS: Log "RSS Feed successfully downloaded" event (glassez)
-    - SEARCH: Add default tooltip "Searching..." on tab creation. (paolo-sz)
-    - SEARCH: Avoid crashes on torrent search (paolo-sz)
-    - SEARCH: Add right click menu to SearchJobWidget (Chocobo1)
-    - SEARCH: Rename label in search widget (Chocobo1)
-    - SEARCH: Add more copy field actions to search widget (Chocobo1)
-    - SEARCH: Remove buttons from search widget (Chocobo1)
-    - SEARCH: Update python installer URL (Chocobo1)
-    - WINDOWS: Drop support for < Windows 7
-    - WINDOWS: Allow headless builds on Windows (knackebrot)
-    - WINDOWS: Add option to control qBittorrent process memory priority (Chocobo1)
-    - LINUX: Add content_rating, release tags to appdata (Peter Eszlari)
-    - LINUX: Update .appdata descriptions (Chocobo1)
-    - LINUX: Use reverse DNS convention for metadata files naming (Chocobo1)
-    - LINUX: Adjust open file descriptor limit on startup to max (Chocobo1)
-    - MACOS: Drop support for < macOS 10.10 (Yosemite)
-    - MACOS: Replace deprecated `qt_mac_set_dock_menu()` (Chocobo1)
-    - MACOS: Add some padding to macOS app icon (Nick Korotysh)
-    - OTHER: Raise minimum C++ version to C++14 (Chocobo1)
-    - OTHER: Raise minimum Qt version to 5.9.0 (sledgehammer999)
-    - OTHER: Drop support of libtorrent < 1.1.10 (glassez)
-    - OTHER: Drop upgrade code from older saving systems (sledgehammer999)
-    - OTHER: Update INSTALL dependencies (Chocobo1)
-    - OTHER: Optimize PNG images losslessly with zopflipng (Peter Dave Hello)
-    - OTHER: Optimize svg files using SVGO (sledgehammer999)
-    - OTHER: QMake: Compile translations at build time (glassez)
-    - OTHER: Drop support for "BC Link" format (Chocobo1)
-    - OTHER: Lots of code refactorings, cleanups, improvements and optimizations (Chocobo1, glassez, thalieht)
-
-* Sun Aug 04 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.7
-    - FEATURE: Add 12 hour and 24 hour speed graphs (dzmat)
-    - FEATURE: Change "Add new torrent" dialog to horizontal layout (Evgeny Lensky)
-    - BUGFIX: Fix messed up symbols in log (Chocobo1)
-    - BUGFIX: Fix incomplete file extension not applied for new torrents (Chocobo1)
-    - BUGFIX: Save updated resume data for completed torrents (Vladimir Golovnev (Glassez))
-    - BUGFIX: Fix requested torrent resume data handling (Vladimir Golovnev (Glassez))
-    - BUGFIX: Prevent command injection via "Run external program" function (Chocobo1)
-    - BUGFIX: Avoid race conditions when adding torrent (Vladimir Golovnev (Glassez))
-    - BUGFIX: Fix torrent checking issues (Vladimir Golovnev (Glassez))
-    - BUGFIX: Use proper log message when there are no error (Chocobo1)
-    - BUGFIX: Fix torrent properties not saved for paused torrents (Chocobo1)
-    - BUGFIX: Some improvements on qtsingleapplication code (Chocobo1)
-    - BUGFIX: Remove limits of "Disk cache expiry interval" setting (Chocobo1)
-    - BUGFIX: Remove upper limit of "Disk cache" setting (Chocobo1)
-    - BUGFIX: Fix crash when removing phantom tags (Chocobo1)
-    - BUGFIX: Improve handleFileErrorAlert error message (Chocobo1)
-    - BUGFIX: Fix updated save path not saved for paused torrents (Chocobo1)
-    - BUGFIX: Log save_resume_data_failed_alert (Chocobo1)
-    - BUGFIX: Don't remove parent directories (Chocobo1)
-    - BUGFIX: Properly remove empty leftover folders after rename (Chocobo1)
-    - BUGFIX: Focus behavior row in Options dialog (silverqx)
-    - BUGFIX: Fix unable to rename folder on Windows when same is used in different case(Chocobo1)
-    - BUGFIX: Fix unable to control add torrent dialogs when opened simultaneously (Chocobo1)
-    - BUGFIX: Disable "Upload mode" when start preloaded torrent (Vladimir Golovnev (Glassez))
-    - BUGFIX: Fix wrong comparison result when sorting items(Chocobo1)
-    - BUGFIX: Fix sequential downloading when redirected (Vladimir Golovnev (Glassez))
-    - BUGFIX: Fix typos (Chocobo1)
-    - BUGFIX: Fix assertion fail (Chocobo1)
-    - BUGFIX: Change number of time axis divisions from 5 to 6 for convenience (dzmat)
-    - BUGFIX: Don't turn window blank when closed to system tray (Ekin Dursun)
-    - WEBUI: Fix WebUI encoding of special characters (Thomas Piccirello)
-    - WEBUI: Change the speed unit from Bytes/s to KiB/s for the rate limiter(jerrymakesjelly)
-    - WEBUI: Fix '+' char not decoded to space correctly (Chocobo1)
-    - RSS: Ignore RSS articles with non-unique identifiers (Vladimir Golovnev (Glassez))
-    - RSS: Perform more RSS parsing in working thread (Vladimir Golovnev (Glassez))
-    - RSS: Download RSS enclosure element if no proper MIME type is found (Matan Bareket)
-
-* Sun May 05 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.6
-    - BUGFIX: Force recheck multiple torrents one by one in all possible cases. Closes #9120 (glassez)
-    - BUGFIX: Don't query Google for tracker favicons, for privacy reasons (sledgehammer999)
-    - BUGFIX: Work around the crash occurred in QTimer. Closes #9985 (Chocobo1)
-    - BUGFIX: Increase the .torrent file download size limit to 100 MiB (thalieht)
-    - BUGFIX: Disable downloading tracker favicons by default. Works around reported crashes in Linux. Closes #9667 (Chocobo1)
-    - WEBUI: Separate URL components before percent-decoding. Allow special characters in query string parameters. Closes #9116 (glassez)
-    - WEBUI: Prevent login credential appearing in URL. Closes #10221 (Chocobo1)
-    - WEBUI: Display warning when Javascript is disabled (Chocobo1)
-    - WEBUI: Fix translatable strings (Chocobo1)
-    - WEBUI: Correctly handle '+' sign in x-www-form-urlencoded data. Closes #10451 (Chocobo1)
-    - WEBUI: Remove closed connections immediately. Closes #10487 (Chocobo1)
-    - WEBUI: Fix "Create subfolder" option is not working. Closes ##10392 (Chocobo1)
-    - SEARCH: Make num enter key work the same as return in searchjobwidget (thalieht)
-    - LINUX: Make window title bar icon work in Wayland (Peter Eszlari)
-    - LINUX: Update appdata.xml file (Chocobo1)
-    - MACOS: Fix progress bar drawing by using different style than native (Nick Korotysh)
-    - MACOS: Updated and cleaned up fields in Info.plist (Nick Korotysh)
-    - OTHER: Mention more translators in the about tab. Closes #10043 (sledgehammer999)
-
-* Mon Dec 24 2018 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.5
-    - FEATURE: Add checking_mem_usage option to AdvancedSettings (FranciscoPombal)
-    - FEATURE: Save torrents queue in separate file. Now a new file named 'queue' is created, saving on each line the infohash of each queued torrent in sorted order. (glassez)
-    - BUGFIX: Fix regression on resuming torrents without metadata (thalieht)
-    - BUGFIX: Reorder and rename Tracker list context menu option (Thomas Piccirello)
-    - BUGFIX: Rename Tracker List columns (Thomas Piccirello)
-    - BUGFIX: Show error message when Session failed to start (glassez)
-    - BUGFIX: Embedded tracker: Use ip parameter from tracker request if provided (Chocobo1)
-    - BUGFIX: Fix weekday names translations (Chocobo1)
-    - BUGFIX: Fix strings not translated (Chocobo1)
-    - WEBUI: Change qBittorrent exit message to HTML5 (Chocobo1)
-    - WEBUI: Revise CSP header (Chocobo1)
-    - WEBUI: Enforce referrer-policy in WebUI (Chocobo1)
-    - WEBUI: Add torrent name filtering to WebUI (Thomas Piccirello)
-    - WEBUI: Send numeric status without translation (Thomas Piccirello)
-    - WEBUI: Add WebUI Trackers context menu (Thomas Piccirello)
-    - WEBUI: Add DHT, PeX, and LSD to WebUI Tracker list (Thomas Piccirello)
-    - WEBUI: Add additional Tracker columns to WebUI (Thomas Piccirello)
-    - WEBUI: Bump Web API version
-    - WEBUI: Fix display bugs in WebUI Files tab. Remove <IE9 support (Thomas Piccirello)
-    - WEBUI: Fix incorrect priority value sent from WebUI (Thomas Piccirello)
-    - WEBUI: Set priority for multiple files in one WebAPI request (Thomas Piccirello)
-    - WEBUI: Match WebUI Peers table column order to GUI (Thomas Piccirello)
-    - WEBUI: Fetch data less frequently when torrents tab isn't visible (Thomas Piccirello)
-    - WEBUI: Add Search tab to WebUI (Thomas Piccirello)
-    - WEBUI: Add ability to pass urls to the webui download page (Thomas Piccirello)
-    - WEBUI: Fix JavaScript error (Tom Piccirello)
-    - WEBUI: Disallow setting a blank alternative WebUI location (Thomas Piccirello)
-    - WEBUI: Add slow torrent options (Thomas Piccirello)
-    - WEBUI: Add "Use alternative Web UI" option (Thomas Piccirello)
-    - WEBUI: Add "Apply rate limit to peers on LAN" option (Thomas Piccirello)
-    - WEBUI: Add email "From" option (Thomas Piccirello)
-    - WEBUI: Set WebUI download options using set preferences (Thomas Piccirello)
-    - WEBUI: Show list of categories on WebUI download page (Thomas Piccirello)
-    - WEBUI: Hide WebUI text input for custom monitor save locations (Thomas Piccirello)
-    - WEBUI: Add "When adding a torrent" options (Thomas Piccirello)
-    - WEBUI: Add WebUI Auto TMM options (Thomas Piccirello)
-    - WEBUI: Add speed limit icons to WebUI Speed options (Thomas Piccirello)
-    - WEBUI: Add WebUI Random port button and proxy unencrypted password notice (Thomas Piccirello)
-    - WEBUI: Replace WebUI Options fixed-width labels (Thomas Piccirello)
-    - WEBUI: Reorder WebUI options to match GUI (Thomas Piccirello)
-    - WEBUI: Allow WebUI sidebar to be collapsed (Thomas Piccirello)
-    - WEBUI: Show ellipsis when WebUI sidebar is too narrow (Thomas Piccirello)
-    - WEBUI: Fix WebUI bug on override of Start Download option.Closes #9855. (Tom Piccirello)
-    - WEBUI: Fix missing words in WebUI (Chocobo1)
-    - WEBUI: Add SameSite attribute to WebUI session cookie (Thomas Piccirello)
-    - WEBUI: Put WebUI security related options into a groupbox (Chocobo1)
-    - WEBUI: Add option for WebUI Host header validation (Chocobo1)
-    - WEBUI: Show icon in WebUI sorted column (Thomas Piccirello)
-    - RSS: Keep track of REPACK/PROPER downloads. Closes #9898. (Stephen Dawkins)
-    - SEARCH: Only instantiate SearchPluginManager as needed (Thomas Piccirello)
-    - MACOS: Make file icon look like other macOS icons (Nick Korotysh)
-    - MACOS: Save option to start minimized in Mac (thalieht)
-
-* Mon Nov 19 2018 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.4
-    - FEATURE: Recognize *.ts files as previewable (silver)
-    - FEATURE: Allow to disable speed graphs (dzmat)
-    - FEATURE: Clear LineEdit on ESC (silverqx)
-    - BUGFIX: Fix divide-by-zero crash (Chocobo1)
-    - BUGFIX: Remove speed limit checkbox in Options dialog (Chocobo1)
-    - BUGFIX: Fix speed graph "high speeds" bug (dzmat)
-    - BUGFIX: Don't update torrent status unnecessarily (glassez)
-    - BUGFIX: Improve force recheck of paused torrent (glassez)
-    - BUGFIX: Restore torrent in two steps (glassez)
-    - BUGFIX: Improve scaling of speed graphs (dzmat)
-    - BUGFIX: Add isNetworkFileSystem() detection on Windows. This allows network mounts to be monitored correctly by polling timer. (Chocobo1)
-    - BUGFIX: Reduce horizontal graphs resolution. Improves perfomance. (dzmat)
-    - BUGFIX: Don't recheck just checked torrent (mj-p, glassez)
-    - BUGFIX: Add SMB2 magic number (Chocobo1)
-    - BUGFIX: Restore startup perfomance to v4.1.2 times. Needs at least libtorrent 1.1.10 (sledgehammer999)
-    - BUGFIX: Make strings actually translatable (sledgehammer999)
-    - WEBUI: Handle downloading .torrent file as success (Tom Piccirello)
-    - WEBUI: Fix Alternative Web UI to be available (glassez)
-    - WEBUI: Consider empty locale setting as not set (glassez)
-    - WEBUI: Add free disk space to WebUI status bar (Thomas Piccirello)
-    - WEBUI: Add WebUI search API controller (Thomas Piccirello)
-    - WEBUI: Fix WebUI Auto TMM context menu bug (Thomas Piccirello)
-    - WEBUI: Use independent translation for WebUI (glassez)
-    - WEBUI: Add categories WebAPI (Thomas Piccirello)
-    - WEBUI: Fix minor JavaScript defects (Thomas Piccirello)
-    - WEBUI: Add locale to js file path (Thomas Piccirello)
-    - WEBUI: Translate WebUI torrents Status column (Thomas Piccirello)
-    - WEBUI: Bump Web API version
-    - RSS: Allow to disable downloading REPACK/PROPER matches (Stephen Dawkins)
-    - RSS: Improve RSS Feed updating (glassez)
-    - SEARCH: Allow resizing search filter in search job (thalieht)
-    - SEARCH: Improve parser for search engine versions.txt (Chocobo1)
-    - SEARCH: Update Python URLs (Chocobo1)
-    - SEARCH: Fix asking to install Python (Chocobo1)
-    - SEARCH: Reformat python code to be compliant with PEP8 (Chocobo1)
-    - OTHER: cmake: restore out-of-source build (Eugene Shalygin)
-    - OTHER: cmake: cmake: use C++14 when available (Eugene Shalygin)
-
-* Tue Sep 18 2018 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.3
-    - FEATURE: Preselect name without extension when renaming files (thalieht)
-    - FEATURE: Allow setting seq & first/last from context menu without metadata (thalieht)
-    - BUGFIX: Show "N/A" if there is no scrape (thalieht)
-    - BUGFIX: Save option about tracker favicons under correct key (sledgehammer999)
-    - BUGFIX: When file data are unreachable pause torrent and show "Missing Files" status (temporary fix) (sledgehammer999)
-    - BUGFIX: Don't disable DHT when using force proxy (Thomas Piccirello)
-    - BUGFIX: Correctly save torrent queue position/state/priority changes in fastresume (glassez, thalieht, sledgehammer999)
-    - BUGFIX: Fix icon height/width ratio (Chocobo1)
-    - BUGFIX: Fix values sorted wrong in "Last Activity" column (Chocobo1)
-    - BUGFIX: Replace png icons with svg (Chocobo1)
-    - WEBUI: Allow WebUI sidebar filters to be hidden (Thomas Piccirello)
-    - WEBUI: Increase WebUI Options initial height (Thomas Piccirello)
-    - WEBUI: Adjust WebUI Options form alignment (Thomas Piccirello)
-    - WEBUI: Fix WebUI unreachable issue (Chocobo1)
-    - WEBUI: Require torrent category creation to be explicit (Thomas Piccirello)
-    - WEBUI: Include category save path in web api sync data (Thomas Piccirello)
-    - WEBUI: Add save path and editing to WebUI new category dialog (Thomas Piccirello)
-    - WEBUI: Bump Web API version
-    - SEARCH: Refactor in searchjob to always color visited entries (thalieht)
-    - SEARCH: Set "enter" as shortcut to download the selected torrents in search job (thalieht)
-    - SEARCH: Add regex option in the search filter's context menu (thalieht)
-    - LINUX: Fix GUI scaling issue on Linux (Chocobo1)
-    - LINUX: Fix regression that broke installing desktop file (Eli Schwartz)
-    - OPENBSD: Better filesystem support for filewatcher (Elias M. Mariani)
-
-* Sun Aug 12 2018 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.2
-    - FEATURE: New options for "inhibit sleep" (Lukas Greib)
-    - FEATURE: Add option for regexps in the transferlist search filter's context menu (thalieht)
-    - FEATURE: Add async io threads option to AdvancedSettings (tjjh89017)
-    - FEATURE: Allow save resume interval to be disabled (Chocobo1)
-    - FEATURE: Add checkbox for recursive download dialog (Chocobo1)
-    - FEATURE: Add changelog link in program updater (Chocobo1)
-    - BUGFIX: Avoid allocating large memory when loading a .torrent file (Couchy)
-    - BUGFIX: Notify users on 1st time close/minimize to tray (sledgehammer999)
-    - BUGFIX: Fix I/O error after fetching magnet metadata (Chocobo1)
-    - BUGFIX: Never save resume data for already paused torrents (glassez)
-    - BUGFIX: Make ProgramUpdater upgrade to 64-bit qbt when running on 64-bit Windows (Chocobo1)
-    - BUGFIX: Put temporary files in qbt own temp folder (Chocobo1)
-    - BUGFIX: Avoid potentially setting the wrong piece priorities (Chocobo1)
-    - BUGFIX: Various code refactorings/improvements (Chocobo1, thalieht, glassez)
-    - BUGFIX: Add options "Download in sequential order" and "Download first and last pieces first" in AddNewTorrentDialog (Chocobo1)
-    - BUGFIX: Download favicon using appropriate protocol (glassez)
-    - BUGFIX: Apply proxy settings on DownloadManager creation (glassez)
-    - BUGFIX: Improve torrent initialization (glassez)
-    - BUGFIX: Save resume data on torrent change events (glassez)
-    - BUGFIX: Increase default resume data save interval (Chocobo1)
-    - BUGFIX: Work around crash when procesing recursive download. Closes #9086 (Chocobo1)
-    - BUGFIX: Reduce queries to python version (Chocobo1)
-    - BUGFIX: Disable certain mouse wheel events in Options dialog (Chocobo1)
-    - WEBUI: Send all rechecks in one request (Thomas Piccirello)
-    - WEBUI: Add WebUI Force Reannounce option (Thomas Piccirello)
-    - WEBUI: Create non-existing path in setLocationAction() (Goshik)
-    - WEBUI: Add WebUI support for Mac ⌘ (Command) key (Thomas Piccirello)
-    - WEBUI: Show current save path in 'Set location' window (Goshik)
-    - WEBUI: Fix WebUI cache behavior for css files (Chocobo1)
-    - WEBUI: Send Cache-Control header in WebUI responses (Chocobo1)
-    - WEBUI: Add form-action to CSP (Thomas Piccirello)
-    - WEBUI: Add upgrade-insecure-requests to CSP when HTTPS is enabled (Thomas Piccirello)
-    - WEBUI: Reset WebUI ban counter on login success (Chocobo1)
-    - WEBUI: Add logging messages in WebUI login action (Chocobo1)
-    - WEBUI: Add option to control CSRF protection (Chocobo1)
-    - WEBUI: Add option to control WebUI clickjacking protection (Chocobo1)
-    - RSS: Implement "Sequential downloading" feature. Closes #6835 (glassez)
-    - RSS: Don't use RSS feed URLs as base for file names. Closes #8399 (glassez)
-    - SEARCH: Add a name filter for search results (thalieht)
-    - SEARCH: Fix python version detection (Chocobo1)
-    - SEARCH: Clear python cache conditionally (Chocobo1)
-    - SEARCH: Properly normalize version string before parsing it (hannsen)
-    - WINDOWS: Turn on Control Flow Guard for MSVC builds (Chocobo1)
-    - MACOS: Replace deprecated function IOPMAssertionCreate() on macOS (Chocobo1)
-    - OTHER: Fix CMake build with QtSingleApplication. Fixes #9196 (Eugene Shalygin)
-
-* Sun May 27 2018 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.1
-    - FEATURE: Add 'Moving' state for torrents being relocated/moved (sledgehammer999)
-    - FEATURE: Show rechecking progress (sledgehammer999)
-    - FEATURE: Add option to remember last used save path (glassez)
-    - FEATURE: Torrent name is also renamed if the content was renamed in the "Add New Torrent" dialog (glassez)
-    - FEATURE: Relax behavior of "Download first and last piece first". It applies to all files and not only to the previewable. (Chocobo1)
-    - BUGFIX: Fix issues with translatable strings (Chocobo1)
-    - BUGFIX: Fix displayed tracker messages (Chocobo1)
-    - BUGFIX: Make settings file recovery more robust (Chocobo1)
-    - BUGFIX: Retry saving settings when operation failed (Chocobo1)
-    - BUGFIX: Log successful torrent move (sledgehammer999)
-    - BUGFIX: Fix deletion of old logs (sledgehammer999)
-    - BUGFIX: Delete non-commited fastresume files (sledgehammer999)
-    - BUGFIX: Don't migrate torrents that have newer fastresumes (sledgehammer999)
-    - BUGFIX: Fix adding multiple torrents at once from WebUI (glassez)
-    - BUGFIX: Improve "Run External Program" behavior. On Windows, a backslash isn't appended to paths from path variables (Chocobo1)
-    - BUGFIX: Suppress multiple I/O errors for the same torrent (sledgehammer999)
-    - BUGFIX: Replace raster qbt logo with vector version (Chocobo1)
-    - WEBUI: Fix wrong API method names (glassez)
-    - WEBUI: Filter torrent info endpoint by hashes (Marcel Petersen)
-    - WEBUI: Fix invalid API calls in WebUI (glassez)
-    - WEBUI: Improve legacy API params handling (glassez)
-    - WEBUI: Fix params handling for some legacy API methods (glassez)
-    - WEBUI: Apply locale changes immediately in WebUI (Chocobo1)
-    - WEBUI: Use 32px icons for favicon (Chocobo1)
-    - WEBUI/RSS: Properly set RSS settings via API (glassez)
-    - RSS: Fix auto-downloading rule when Smart filter with regular Episode filter are used (glassez)
-    - RSS: Make "Ignoring days" to behave like other filters (glassez)
-    - RSS: Place "Use Smart Episode Filter" more correctly (glassez)
-    - RSS: Use RSS feed update time as a fallback (glassez)
-    - COSMETIC: Fix Stats dialog size (sledgehammer999)
-    - MACOS: Fix GUI scaling factor on macOS (Chocobo1)
-    - WINDOWS: Update icons (adem4ik)
-    - LINUX: Fix open destination folder with Nautilus > 3.28 (Evgeny Lensky)
-    - OTHER: Code improvements and refactoring (thalieht, Nick Korotysh, Chocobo1)
-
 * Sat May 05 2018 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.0
     - FEATURE: Add "Coalesce reads & writes" checkbox in advanced options (Chocobo1)
     - FEATURE: Smart Filter for RSS (Stephen Dawkins)

INSTALL

@@ -1,43 +1,54 @@
-qBittorrent - A BitTorrent client in C++ / Qt
+qBittorrent - A BitTorrent client in C++ / Qt4
 ------------------------------------------
 
-1) Install these dependencies:
-
-  - Boost >= 1.40
-
-  - libtorrent-rasterbar >= 1.1.10 (by Arvid Norberg)
-      * https://www.libtorrent.org/
-      * Be careful: another library (the one used by rTorrent) uses a similar name
-
-  - OpenSSL >= 1.0
-
-  - Qt >= 5.9.0
-
-  - zlib >= 1.2.5.2
-
-  - pkg-config (compile-time only)
-
-  - Python >= 2.7.9 / 3.3.0 (optional, runtime only)
-      * Required by the internal search engine
-
-2a) Compile and install qBittorrent with Qt graphical interface
+1) Compile and install qBittorrent with Qt4 Graphical Interface
 
   $ ./configure
   $ make && make install
   $ qbittorrent
 
-  will install and execute qBittorrent.
+  will install and execute qBittorrent hopefully without any problems.
 
-2b) Compile and install qBittorrent without Qt graphical interface
+  Dependencies:
+    - Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)
+
+    - pkg-config executable
+
+    - libtorrent-rasterbar by Arvid Norberg (>= 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)
+
+    - python >= 2.3 (needed by search engine)
+        * Run time only dependency
+
+    - geoip-database (optional)
+        * If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
+        * Run time only dependency
+
+2) Compile and install qBittorrent without Qt4 Graphical interface
 
   $ ./configure --disable-gui
   $ make && make install
-  $ qbittorrent-nox
+  $ qbittorrent
+
+  will install and execute qBittorrent hopefully without any problems.
+
+  Dependencies:
+    - Qt >= 4.4.0 (libqt-devel, libqtcore, libqtnetwork)
+
+    - pkg-config executable
+
+    - libtorrent-rasterbar by Arvid Norberg (>= v1.0.6)
+        -> http://www.libtorrent.net
+        Be careful: another library (the one used by rTorrent) uses a similar name.
+
+    - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
 
-  will install and execute qBittorrent.
 
 DOCUMENTATION:
-Please note that there is a "Compilation" section at http://wiki.qbittorrent.org.
+Please note that there is a documentation with a "compiling howto" at http://wiki.qbittorrent.org.
 
 ------------------------------------------
-sledgehammer999 <sledgehammer999@qbittorrent.org>
+Christophe Dumez <chris@qbittorrent.org>

build-aux/compile

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2018-03-07.03; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -255,8 +255,7 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
-  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -340,9 +339,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:

build-aux/install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2018-03-11.20; # UTC
+scriptversion=2013-12-25.23; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,18 +271,15 @@ do
     fi
     dst=$dst_arg
 
-    # If destination is a directory, append the input filename.
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test "$is_target_a_directory" = never; then
         echo "$0: $dst_arg: Is a directory" >&2
         exit 1
       fi
       dstdir=$dst
-      dstbase=`basename "$src"`
-      case $dst in
-	*/) dst=$dst$dstbase;;
-	*)  dst=$dst/$dstbase;;
-      esac
+      dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
       dstdir=`dirname "$dst"`
@@ -291,11 +288,6 @@ do
     fi
   fi
 
-  case $dstdir in
-    */) dstdirslash=$dstdir;;
-    *)  dstdirslash=$dstdir/;;
-  esac
-
   obsolete_mkdir_used=false
 
   if test $dstdir_status != 0; then
@@ -332,43 +324,34 @@ do
             # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
             ;;
           *)
-            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
-            # here however when possible just to lower collision chance.
             tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 
-            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-            # Because "mkdir -p" follows existing symlinks and we likely work
-            # directly in world-writeable /tmp, make sure that the '$tmpdir'
-            # directory is successfully created first before we actually test
-            # 'mkdir -p' feature.
             if (umask $mkdir_umask &&
-                $mkdirprog $mkdir_mode "$tmpdir" &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
             then
               if test -z "$dir_arg" || {
                    # Check for POSIX incompatibilities with -m.
                    # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
                    # other-writable bit of parent directory when it shouldn't.
                    # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   test_tmpdir="$tmpdir/a"
-                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
                    case $ls_ld_tmpdir in
                      d????-?r-*) different_mode=700;;
                      d????-?--*) different_mode=755;;
                      *) false;;
                    esac &&
-                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
                      test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
                    }
                  }
               then posix_mkdir=:
               fi
-              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+              rmdir "$tmpdir/d" "$tmpdir"
             else
               # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
             fi
             trap '' 0;;
         esac;;
@@ -444,8 +427,8 @@ do
   else
 
     # Make a couple of temp file names in the proper directory.
-    dsttmp=${dstdirslash}_inst.$$_
-    rmtmp=${dstdirslash}_rm.$$_
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@@ -510,9 +493,9 @@ do
 done
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:

build-aux/missing

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2018-03-07.03; # UTC
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@ else
   exit $st
 fi
 
-perl_URL=https://www.perl.org/
-flex_URL=https://github.com/westes/flex
-gnu_software_URL=https://www.gnu.org/software
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
 
 program_details ()
 {
@@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
 exit $st
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:

cmake/Modules/CompileFeature.cmake

@@ -1,22 +0,0 @@
-# Helper function for coupling add_feature_info(), option(), and add_definitions()
-
-function(optional_compile_definitions _name)
-    set(options FEATURE)
-    set(oneValueArgs DESCRIPTION DEFAULT)
-    set(multiValueArgs ENABLED DISABLED)
-    cmake_parse_arguments(OCD "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    option(${_name} "${OCD_DESCRIPTION}" ${OCD_DEFAULT})
-    if (${${_name}})
-        set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" APPEND PROPERTY COMPILE_DEFINITIONS ${OCD_ENABLED})
-    else()
-        set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" APPEND PROPERTY COMPILE_DEFINITIONS ${OCD_DISABLED})
-    endif()
-    if(${OCD_FEATURE})
-        add_feature_info(${_name} ${_name} "${OCD_DESCRIPTION}")
-    endif()
-endfunction()
-
-macro(feature_option _name _description _default)
-    option(${_name} "${_description}" ${_default})
-    add_feature_info(${_name} ${_name} "${_description}")
-endmacro()

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -38,9 +38,8 @@ else()
         # 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_LIBCRYPTO
-            # TODO: remove the following define as it is not used since OpenSSL >= 1.1
             -DTORRENT_USE_OPENSSL
+            -DTORRENT_DISABLE_GEO_IP
             -DBOOST_ASIO_ENABLE_CANCELIO
             -DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64)
     endif()
@@ -48,7 +47,7 @@ else()
     if(NOT LibtorrentRasterbar_USE_STATIC_LIBS)
         list(APPEND LibtorrentRasterbar_DEFINITIONS
             -DTORRENT_LINKING_SHARED
-            -DBOOST_SYSTEM_DYN_LINK)
+            -DBOOST_SYSTEM_DYN_LINK -DBOOST_CHRONO_DYN_LINK)
     endif()
 endif()
 
@@ -100,7 +99,6 @@ list(FIND LibtorrentRasterbar_DEFINITIONS -DTORRENT_USE_OPENSSL LibtorrentRaster
 if(LibtorrentRasterbar_ENCRYPTION_INDEX GREATER -1)
     find_package(OpenSSL REQUIRED)
     set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto)
-    list(APPEND LibtorrentRasterbar_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
     set(LibtorrentRasterbar_OPENSSL_ENABLED ON)
 endif()
 
@@ -115,10 +113,10 @@ mark_as_advanced(LibtorrentRasterbar_INCLUDE_DIR LibtorrentRasterbar_LIBRARY
     LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES
     LibtorrentRasterbar_ENCRYPTION_INDEX)
 
-if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::torrent-rasterbar)
-    add_library(LibtorrentRasterbar::torrent-rasterbar UNKNOWN IMPORTED)
+if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::LibTorrent)
+    add_library(LibtorrentRasterbar::LibTorrent UNKNOWN IMPORTED)
 
-    set_target_properties(LibtorrentRasterbar::torrent-rasterbar PROPERTIES
+    set_target_properties(LibtorrentRasterbar::LibTorrent PROPERTIES
         IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
         IMPORTED_LOCATION "${LibtorrentRasterbar_LIBRARY}"
         INTERFACE_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"

cmake/Modules/FindQtSingleApplication.cmake

@@ -0,0 +1,94 @@
+# - 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(Qt5Core_FOUND)
+    message(STATUS "Looking for Qt5 single application library")
+    FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_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_CORELIBRARY Qt5::Core LOCATION)
+    GET_FILENAME_COMPONENT(_QT5_CORELIBRARYPATH ${_QT5_CORELIBRARY} PATH)
+
+    FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
+        NAMES ${QTSINGLEAPPLICATION_NAMES}
+        PATHS ${_QT5_CORELIBRARYPATH}
+    )
+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/MacroQbtCompilerSettings.cmake

@@ -10,18 +10,19 @@ macro(qbt_set_compiler_options)
     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"
-            "-Wcast-qual -Wcast-align"
-            "-Winvalid-pch -Wno-long-long"
-            #"-fstack-protector-all"
-            #"-Werror -Wno-error=deprecated-declarations"
+            "-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"
+        set (_GCC_COMMON_CXX_FLAGS  "-fexceptions -frtti"
             "-Woverloaded-virtual -Wold-style-cast"
-            "-Wnon-virtual-dtor"
-            #"-Weffc++"
-            #"-Werror -Wno-error=cpp"
+            "-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=sign-conversion -Wno-error=float-equal"
+            "-Wno-error=sign-conversion -Wno-error=float-equal"
         )
 
         if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
@@ -61,7 +62,7 @@ macro(qbt_set_compiler_options)
             endif (_STRICT_NULL_SENTINEL_IS_SUPPORTED)
 
             # Code should be improved to render this not needed
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=unused-function")
+            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=unused-function -Wno-error=inconsistent-missing-override")
         else ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
             # GCC supports it
             list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
@@ -73,29 +74,30 @@ macro(qbt_set_compiler_options)
         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)
-            set(QBT_ADDITONAL_FLAGS "-Og -g3 -pipe" CACHE STRING
-                "Additional qBittorent compile flags")
-            set(QBT_ADDITONAL_CXX_FLAGS "-Og -g3 -pipe" CACHE STRING
-                "Additional qBittorent C++ compile flags")
+            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)
-            set(QBT_ADDITONAL_FLAGS "-O0 -g3 -pipe" CACHE STRING
-                "Additional qBittorent compile flags")
-            set(QBT_ADDITONAL_CXX_FLAGS "-O0 -g3 -pipe" CACHE STRING
-                "Additional qBittorent C++ compile flags")
+            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 ()
 
-    string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITONAL_FLAGS}")
-    string(APPEND CMAKE_CXX_FLAGS " ${QBT_ADDITONAL_FLAGS}")
-
 # endif (NOT QBT_ADDITONAL_FLAGS)
 endmacro(qbt_set_compiler_options)
 

cmake/Modules/QbtTargetSources.cmake

@@ -1,17 +1,16 @@
-# a helper function which appends source to the target
-# sources file names are relative to the the target source dir
+# a helper function which appends source to the main qBt target
+# sources file names are relative to the the ${qBittorrent_SOURCE_DIR}
 
-function (qbt_target_sources _target _scope)
-    get_target_property(targetSourceDir ${_target} SOURCE_DIR)
-    set(sourcesRelative "")
-    foreach(source IN ITEMS ${ARGN})
-        if(IS_ABSOLUTE "${source}")
-            set(sourceAbsolutePath "${source}")
+function (qbt_target_sources)
+    set (_sources_rel "")
+    foreach (_source IN ITEMS ${ARGN})
+        if (IS_ABSOLUTE "${_source}")
+            set(source_abs "${_source}")
         else()
-            get_filename_component(sourceAbsolutePath "${source}" ABSOLUTE)
+            get_filename_component(_source_abs "${_source}" ABSOLUTE)
         endif()
-        file(RELATIVE_PATH sourceRelativePath "${targetSourceDir}" "${sourceAbsolutePath}")
-        list(APPEND sourcesRelative "${sourceRelativePath}")
+        file (RELATIVE_PATH _source_rel "${qbt_executable_SOURCE_DIR}" "${_source_abs}")
+        list (APPEND _sources_rel "${_source_rel}")
     endforeach()
-    target_sources(${_target} ${_scope} "${sourcesRelative}")
-endfunction(qbt_target_sources)
+    target_sources (qBittorrent PRIVATE "${_sources_rel}")
+endfunction (qbt_target_sources)

cmake/Modules/QbtTranslations.cmake

@@ -1,48 +0,0 @@
-# macros to handle translation files
-
-# qbt_add_translations(<target> QRC_FILE <filename> TS_FILES <filenames>)
-# handles out of source builds for Qt resource files that include translations
-# The function generates translations out of the supplied list of .ts files in the build directory,
-# copies the .qrc file there, calls qt5_add_resources() adds its output to the target sources list.
-function(qbt_add_translations _target)
-    set(oneValueArgs QRC_FILE)
-    set(multiValueArgs TS_FILES)
-    cmake_parse_arguments(QBT_TR "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    get_target_property(_binaryDir ${_target} BINARY_DIR)
-
-    if (NOT QBT_TR_QRC_FILE)
-        message(FATAL_ERROR "QRC file is empty")
-    endif()
-    if (NOT QBT_TR_TS_FILES)
-        message(FATAL_ERROR "TS_FILES files are empty")
-    endif()
-
-    if(IS_ABSOLUTE "${QBT_TR_QRC_FILE}")
-        file(RELATIVE_PATH _qrcToTs "${CMAKE_CURRENT_SOURCE_DIR}" "${QBT_TR_QRC_FILE}")
-    else()
-        set(_qrcToTs "${QBT_TR_QRC_FILE}")
-    endif()
-
-    get_filename_component(_qrcToTsDir "${_qrcToTs}" DIRECTORY)
-
-    get_filename_component(_qmFilesBinaryDir "${CMAKE_CURRENT_BINARY_DIR}/${_qrcToTsDir}" ABSOLUTE)
-    # to make qt5_add_translation() work as we need
-    set_source_files_properties(${QBT_TR_TS_FILES} PROPERTIES OUTPUT_LOCATION "${_qmFilesBinaryDir}")
-    qt5_add_translation(_qmFiles ${QBT_TR_TS_FILES})
-
-    set(_qrc_dest_dir "${_binaryDir}/${_qrcToTsDir}")
-    set(_qrc_dest_file "${_binaryDir}/${QBT_TR_QRC_FILE}")
-
-    message(STATUS "copying ${QBT_TR_QRC_FILE} to ${_qrc_dest_dir}")
-    file(COPY ${QBT_TR_QRC_FILE} DESTINATION ${_qrc_dest_dir})
-
-    set_source_files_properties("${_qrc_dest_file}" PROPERTIES
-        GENERATED True
-        OBJECT_DEPENDS "${_qmFiles}")
-
-    # With AUTORCC enabled rcc is ran by cmake before language files are generated,
-    # and thus we call rcc explicitly
-    qt5_add_resources(_resources "${_qrc_dest_file}")
-    target_sources(${_target} PRIVATE "${_resources}")
-endfunction()

cmake/Modules/winconf-mingw.cmake

@@ -1,11 +1,14 @@
+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 ()
-
-list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
-    -D_FILE_OFFSET_BITS=64
-    -D__USE_W32_SOCKETS)
-
-# libraries from winconf.pri
-link_libraries(advapi32 iphlpapi ole32 shell32 user32 wsock32 ws2_32)
+endif()
 
+# LIBS += libadvapi32 libshell32 libuser32
+# LIBS += libcrypto.dll libssl.dll libwsock32 libws2_32 libz libiconv.dll
+# LIBS += libpowrprof

cmake/Modules/winconf-msvc.cmake

@@ -1,7 +1,21 @@
+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()
-
-# libraries from winconf.pri
-link_libraries(advapi32 crypt32 Iphlpapi ole32 shell32 User32)
-

cmake/Modules/winconf.cmake

@@ -2,51 +2,33 @@
 
 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_ASIO_DISABLE_CONNECTEX
+    -DBOOST_ALL_NO_LIB -DBOOST_ASIO_HASH_MAP_BUCKETS=1021
+    -DBOOST_ASIO_SEPARATE_COMPILATION
     -DBOOST_EXCEPTION_DISABLE
-    -DTORRENT_USE_LIBCRYPTO
-    # TODO: remove the following define as it is not used since OpenSSL >= 1.1
+    -DBOOST_SYSTEM_STATIC_LINK=1
     -DTORRENT_USE_OPENSSL
-    # TODO: remove the following define as it is not used since libtorrent >= 1.2
-    -DTORRENT_DISABLE_RESOLVE_COUNTRIES
-)
+    -D__USE_W32_SOCKETS
+    -D_FILE_OFFSET_BITS=64)
 
-set(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES system)
-
-# If you want to link with static version of libtorrent
-#set(LibtorrentRasterbar_USE_STATIC_LIBS True)
-#list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
-#    -DBOOST_SYSTEM_STATIC_LINK=1)
-
-# and boost
-#set(Boost_USE_STATIC_LIBS True)
-#set(Boost_USE_STATIC_RUNTIME True)
-
-add_definitions(
-    -DNTDDI_VERSION=0x06010000
-    -D_WIN32_WINNT=0x0601
-    -D_WIN32_IE=0x0601
-    -DUNICODE
+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
     -DNOMINMAX
-    -DBOOST_ALL_NO_LIB
 )
-
-# Enable if libtorrent was built with this flag defined
-#list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS -DTORRENT_NO_DEPRECATE)
-
-if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
-    list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
-    -DTORRENT_DEBUG)
-else ()
-    add_definitions(-DNDEBUG)
-endif ()
+# 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)
@@ -56,9 +38,17 @@ set(COMMON_INSTALL_PREFIX "c:/usr" CACHE PATH "Prefix used to install all the re
 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.

conf.pri.in

@@ -5,8 +5,6 @@ BINDIR = @EXPAND_BINDIR@
 DATADIR = @EXPAND_DATADIR@
 MANPREFIX = @EXPAND_MANDIR@
 
-QMAKE_CC = @QBT_CC@
-QMAKE_CXX = @QBT_CXX@
 QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
 
 EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@

conf.pri.windows

@@ -35,24 +35,27 @@ LIBS += zlib.lib
 #LIBS += libcrypto libssl
 #LIBS += libz
 
+DEFINES += NTDDI_VERSION=0x05010000
+DEFINES += _WIN32_WINNT=0x0501
+DEFINES += _WIN32_IE=0x0501
+
 # Disable to use Boost auto-linking
 DEFINES += BOOST_ALL_NO_LIB
 # Use one of the following options
 DEFINES += BOOST_SYSTEM_STATIC_LINK
 #DEFINES += BOOST_SYSTEM_DYN_LINK
-# Enable if encountered build error with boost version <= 1.59
-#DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES
+# Boost 1.60+ defaults to Vista+ support. The define below enables XP support again.
+DEFINES += BOOST_USE_WINAPI_VERSION=0x0501
+# Enable if building against libtorrent 1.0.x (RC_1_0) (static linking)
+#DEFINES += BOOST_ASIO_SEPARATE_COMPILATION
+# Enable if building against libtorrent 1.0.x (RC_1_0) (dynamic linking)
+#DEFINES += BOOST_ASIO_DYN_LINK
 
-# Enable if libtorrent was built with this flag defined
+# Enable if building against libtorrent 1.1.x (RC_1_1)
+# built with this flag defined
 #DEFINES += TORRENT_NO_DEPRECATE
 # Enable if linking dynamically against libtorrent
 #DEFINES += TORRENT_LINKING_SHARED
 
 # Enable stack trace support
-CONFIG += stacktrace
-
-win32-msvc* {
-    QMAKE_CXXFLAGS += "/guard:cf"
-    QMAKE_LFLAGS += "/guard:cf"
-    QMAKE_LFLAGS_RELEASE += "/OPT:REF /OPT:ICF"
-}
+CONFIG += strace_win

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v4.2.1], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.1.0], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
@@ -8,12 +8,16 @@ AC_LANG(C++)
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
 
-# use compiler from env variables if available
-QBT_CC="$CC"
-QBT_CXX="$CXX"
+
 
 # Define --wth-* and --enable-* arguments
 
+AC_ARG_WITH(qtsingleapplication,
+            [AS_HELP_STRING([--with-qtsingleapplication=@<:@system|shipped@:>@],
+                            [Use the shipped qtsingleapplication library or the system one (default=shipped)])],
+            [],
+            [with_qtsingleapplication=shipped])
+
 AC_ARG_ENABLE(debug,
               [AS_HELP_STRING([--enable-debug],
                               [Enable debug build])],
@@ -157,72 +161,38 @@ AS_CASE(["x$enable_qt_dbus"],
         AC_MSG_ERROR([Unknown option "$enable_qt_dbus". Use either "yes" or "no".])])
 
 
-AX_BOOST_BASE([1.40],
-              [AC_MSG_NOTICE([Boost CXXFLAGS: "$BOOST_CPPFLAGS"])
-               AC_MSG_NOTICE([Boost LDFLAGS: "$BOOST_LDFLAGS"])],
+AX_BOOST_BASE([1.35],
+              [AC_MSG_NOTICE([Boost CPPFLAGS: "$BOOST_CPPFLAGS"
+                Boost LDFLAGS: "$BOOST_LDFLAGS"])],
               [AC_MSG_ERROR([Could not find Boost])])
-CXXFLAGS="$BOOST_CPPFLAGS $CXXFLAGS"
+CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
 LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
 
-# add workaround for problematic boost version
-# taken from ax_boost_base.m4
-m4_define([DETECT_BOOST_VERSION_PROGRAM],
-    [AC_LANG_PROGRAM([[#include <boost/version.hpp>]],
-                     [[(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($1))]));]])])
-
-AC_COMPILE_IFELSE([DETECT_BOOST_VERSION_PROGRAM(106000)], [],
-    [QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"])
-
 AX_BOOST_SYSTEM()
 AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
 LIBS="$BOOST_SYSTEM_LIB $LIBS"
 
-PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 1.1.10],
-                  [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS"
-                  LIBS="$libtorrent_LIBS $LIBS"])
+AC_MSG_CHECKING([which qtsingleapplication to use])
+AS_CASE(["x$with_qtsingleapplication"],
+        ["xshipped"],
+                   [AC_MSG_RESULT([shipped])
+                   QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG usesystemqtsingleapplication"],
+        ["xsystem"],
+                  [AC_MSG_RESULT([system])
+                  QBT_ADD_CONFIG="$QBT_ADD_CONFIG usesystemqtsingleapplication"],
+        [AC_MSG_RESULT([$with_qtsingleapplication])
+        AC_MSG_ERROR([Unknown option "$with_qtsingleapplication". Use either "system" or "shipped".])])
 
-PKG_CHECK_MODULES(openssl,
-                  [openssl >= 1.0],
-                  [CXXFLAGS="$openssl_CFLAGS $CXXFLAGS"
-                  LIBS="$openssl_LIBS $LIBS"])
+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],
-                 [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS"
+                 [CPPFLAGS="$zlib_CFLAGS $CPPFLAGS"
                  LIBS="$zlib_LIBS $LIBS"])
 
-# Check if already in >= C++14 mode because of the flags returned by one of the above packages
-TMP_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS=""
-AC_MSG_CHECKING([if compiler defaults to C++14 or later mode])
-AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
-                  [AC_MSG_RESULT([yes])
-                   QBT_CXX14_FOUND="yes"],
-                  [AC_MSG_RESULT([no])
-                   QBT_CXX14_FOUND="no"])
-
-# In case of no, check if the compiler can support at least C++14
-# and if yes, enable it leaving a warning to the user
-AS_IF([test "x$QBT_CXX14_FOUND" = "xno"],
-      [AC_MSG_CHECKING([if compiler supports C++14])
-       CXXFLAGS="-std=c++14"
-       AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
-                        [AC_MSG_RESULT([yes])
-                         AC_MSG_CHECKING([if C++14 is disabled by the set compiler flags])
-                         # prepend the flag so it won't override conflicting user defined flags
-                         CXXFLAGS="-std=c++14 $TMP_CXXFLAGS"
-                         AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
-                                           [AC_MSG_RESULT([no])
-                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++14"
-                                            AC_MSG_WARN([C++14 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])],
-                                           [AC_MSG_RESULT([yes])
-                                            AC_MSG_ERROR([The compiler supports C++14 but the user or a dependency has explicitly enabled a lower mode.])])],
-                        [AC_MSG_RESULT([no])
-                         AC_MSG_ERROR([A compiler supporting C++14 is required.])])
-      ])
-CXXFLAGS="$TMP_CXXFLAGS"
-
 # These are required because autoconf doesn't expand these **particular**
 # vars automatically. And qmake cannot autoexpand them.
 AX_DEFINE_DIR([EXPAND_PREFIX], [prefix])
@@ -249,20 +219,18 @@ extract() {
   for i in $string; do
     case "$(echo "$i" | cut -c1)" in
       '') ;;
-      D) QBT_CONF_DEFINES="$QBT_CONF_DEFINES $(echo $i | cut -c2-)";;
-      I) QBT_CONF_INCLUDES="$QBT_CONF_INCLUDES $(echo $i | cut -c2-)";;
-      *) QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS -$i";;
+      D) QBT_CONF_DEFINES="$(echo $i | cut -c2-) $QBT_CONF_DEFINES";;
+      I) QBT_CONF_INCLUDES="$(echo $i | cut -c2-) $QBT_CONF_INCLUDES";;
+      *) QBT_CONF_EXTRA_CFLAGS="-$i $QBT_CONF_EXTRA_CFLAGS";;
     esac
   done
   IFS=$SAVEIFS
 }
 
-extract "$CFLAGS $CXXFLAGS"
+extract "$CFLAGS $CPPFLAGS $CXXFLAGS"
 QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
 
 # Substitute the values of these vars in conf.pri.in
-AC_SUBST(QBT_CC)
-AC_SUBST(QBT_CXX)
 AC_SUBST(QBT_CONF_INCLUDES)
 AC_SUBST(QBT_CONF_EXTRA_CFLAGS)
 AC_SUBST(QBT_ADD_CONFIG)
@@ -274,14 +242,17 @@ AC_OUTPUT(conf.pri)
 AS_IF([test "x$enable_systemd" = "xyes"],
       [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)])
 
+
+
 AC_MSG_NOTICE([Running qmake to generate the makefile...])
-TOPDIR="$(cd "$(dirname "$0")" && pwd)"
-$QT_QMAKE -r "$TOPDIR/qbittorrent.pro" "QMAKE_LRELEASE=$QMAKE_LRELEASE"
-qmake_ret="$?"
+CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
+
+$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE"
+
+ret="$?"
 
 AS_ECHO()
-AS_IF([test "x$qmake_ret" != "x0"],
-      [AC_MSG_ERROR([$QT_QMAKE failed to generate the makefile])])
-
-AC_MSG_NOTICE([Good, the configure finished.])
+AS_IF([test "x$ret" = "x0"],
+      [AC_MSG_NOTICE([Good, your configure finished.])],
+      [AC_MSG_ERROR([Failed running $QT_QMAKE to generate the makefile])])
 AS_ECHO()

dist/CMakeLists.txt

@@ -1,5 +1,3 @@
-find_package(Qt5Widgets ${requiredQtVersion}) # to conditionally install desktop-related files
-
 if (APPLE)
     add_subdirectory(mac)
 else (APPLE)

dist/mac/Info.plist

@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>qBittorrent</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -25,10 +21,6 @@
 			<array>
 				<string>org.bittorrent.torrent</string>
 			</array>
-			<key>NSExportableTypes</key>
-			<array>
-				<string>org.bittorrent.torrent</string>
-			</array>
 			<key>LSIsAppleDefaultForType</key>
 			<true/>
 		</dict>
@@ -36,8 +28,6 @@
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>magnet</string>
@@ -55,19 +45,21 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.2.1</string>
+	<string>4.1.0</string>
+	<key>CFBundleSignature</key>
+	<string>qBit</string>
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.qbittorrent.qBittorrent</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>${MACOSX_DEPLOYMENT_TARGET}.0</string>
+	<string>org.qbittorrent</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSHighResolutionCapable</key>
+	<string>True</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2019 The qBittorrent project</string>
+	<string>Copyright © 2006-2018 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/unix/CMakeLists.txt

@@ -1,42 +1,36 @@
-if (NOT Qt5Widgets_FOUND)
-    feature_option(SYSTEMD "Install systemd service file (headless only)" OFF)
-    if (SYSTEMD)
-        if (NOT Systemd_SERVICES_INSTALL_DIR)
-            find_package(Systemd)
-            if (NOT Systemd_FOUND)
-                message(FATAL_ERROR "Could not locate systemd services install dir."
-                " Either pass -DSystemd_SERVICES_INSTALL_DIR=/path/to/systemd/services option or install systemd pkg-config")
-            endif(NOT Systemd_FOUND)
-        endif(NOT Systemd_SERVICES_INSTALL_DIR)
+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}
+            DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
             COMPONENT data)
-    endif(SYSTEMD)
-endif()
+    endif(SYSTEMD_FOUND)
+endif(SYSTEMD)
 
-if (Qt5Widgets_FOUND)
+
+if (GUI)
     list(APPEND MAN_FILES ${qBittorrent_SOURCE_DIR}/doc/qbittorrent.1)
-else (Qt5Widgets_FOUND)
+else (GUI)
     list(APPEND MAN_FILES ${qBittorrent_SOURCE_DIR}/doc/qbittorrent-nox.1)
-endif (Qt5Widgets_FOUND)
+endif (GUI)
 
 install(FILES ${MAN_FILES}
         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
         COMPONENT doc)
 
-if (Qt5Widgets_FOUND)
+if (GUI)
     install(DIRECTORY menuicons/
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
             FILES_MATCHING PATTERN "*.png")
 
-    install(FILES org.qbittorrent.qBittorrent.desktop
+    install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.desktop
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/
             COMPONENT data)
 
-    install(FILES org.qbittorrent.qBittorrent.appdata.xml
-            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo/
+    install(FILES qbittorrent.appdata.xml
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/
             COMPONENT data)
 
     install(FILES

dist/unix/org.qbittorrent.qBittorrent.appdata.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 sledgehammer999 <sledgehammer999@qbittorrent.org> -->
-<component type="desktop">
-  <id>org.qbittorrent.qBittorrent</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0 and OpenSSL</project_license>
-  <name>qBittorrent</name>
-  <summary>An open-source Bittorrent client</summary>
-  <description>
-    <p>
-      The qBittorrent project aims to provide an open-source software alternative to µTorrent.
-      Additionally, qBittorrent runs and provides the same features on all major platforms (FreeBSD, Linux, macOS, OS/2, Windows).
-      qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.
-    </p>
-    <ul>
-      <li>Polished µTorrent-like User Interface</li>
-      <li>
-        Well-integrated and extensible Search Engine
-        <ul>
-          <li>Simultaneous search in many Torrent search sites</li>
-          <li>Category-specific search requests (e.g. Books, Music, Software)</li>
-        </ul>
-      </li>
-      <li>RSS feed support with advanced download filters (incl. regex)</li>
-      <li>
-        Many Bittorrent extensions supported:
-        <ul>
-          <li>Magnet links</li>
-          <li>Distributed hash table (DHT), peer exchange protocol (PEX), local peer discovery (LSD)</li>
-          <li>Private torrents</li>
-          <li>Encrypted connections</li>
-          <li>and many more...</li>
-        </ul>
-      </li>
-      <li>Remote control through Web user interface, written with AJAX</li>
-      <li>Sequential downloading (Download in order)</li>
-      <li>
-        Advanced control over torrents, trackers and peers
-        <ul>
-          <li>Torrents queueing and prioritizing</li>
-          <li>Torrent content selection and prioritizing</li>
-        </ul>
-      </li>
-      <li>Bandwidth scheduler</li>
-      <li>Torrent creation tool</li>
-      <li>IP Filtering (eMule &amp; PeerGuardian format compatible)</li>
-      <li>IPv6 compliant</li>
-      <li>UPnP / NAT-PMP port forwarding support</li>
-      <li>Available on all platforms: Windows, Linux, macOS, FreeBSD, OS/2</li>
-      <li>Available in ~70 languages</li>
-    </ul>
-  </description>
-  <launchable type="desktop-id">org.qbittorrent.qBittorrent.desktop</launchable>
-  <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>
-  <update_contact>sledgehammer999@qbittorrent.org</update_contact>
-  <developer_name>The qBittorrent Project</developer_name>
-  <url type="homepage">https://www.qbittorrent.org/</url>
-  <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>
-  <content_rating type="oars-1.1"/>
-  <releases>
-    <release version="4.1.5" date="2018-12-24"/>
-  </releases>
-</component>

dist/unix/qbittorrent.appdata.xml

@@ -0,0 +1,66 @@
+<?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, 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">https://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

@@ -1,8 +1,8 @@
 [Unit]
 Description=qBittorrenti-nox service for user %I
+
 Documentation=man:qbittorrent-nox(1)
-Wants=network-online.target
-After=network-online.target nss-lookup.target
+After=network.target
 
 [Service]
 Type=simple

dist/windows/installer-translations/afrikaans.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_AFRIKAANS} "Uninstalling previous version."
 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."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_AFRIKAANS} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/albanian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_ALBANIAN} "Uninstalling previous version."
 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."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_ALBANIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/arabic.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_ARABIC} "جاري ازالة النسخة السا
 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 بت"
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_ARABIC} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/basque.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_BASQUE} "Aurreko bertsioa kentzen."
 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."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_BASQUE} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/belarusian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_BELARUSIAN} "Uninstalling previous version."
 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."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_BELARUSIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/bosnian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_BOSNIAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_BOSNIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_BOSNIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_BOSNIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/breton.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_BRETON} "Uninstalling previous version."
 LangString launch_qbt ${LANG_BRETON} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_BRETON} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_BRETON} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/bulgarian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_BULGARIAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_BULGARIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_BULGARIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_BULGARIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/catalan.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_CATALAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_CATALAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_CATALAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_CATALAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/croatian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_CROATIAN} "Deinstaliraj prethodnu verziju."
 LangString launch_qbt ${LANG_CROATIAN} "Pokreni qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_CROATIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_CROATIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/czech.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_CZECH} "Odebírání předchozí verze."
 LangString launch_qbt ${LANG_CZECH} "Spustit qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_CZECH} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_CZECH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/danish.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_DANISH} "Afinstallerer tidligere version."
 LangString launch_qbt ${LANG_DANISH} "Start qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_DANISH} "Dette installationsprogram virker kun i 64-bit Windows versioner."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_DANISH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/dutch.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_DUTCH} "Uninstalling previous version."
 LangString launch_qbt ${LANG_DUTCH} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_DUTCH} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_DUTCH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/english.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/esperanto.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_ESPERANTO} "Uninstalling previous version."
 LangString launch_qbt ${LANG_ESPERANTO} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_ESPERANTO} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_ESPERANTO} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/estonian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_ESTONIAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_ESTONIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_ESTONIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_ESTONIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/farsi.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_FARSI} "Uninstalling previous version."
 LangString launch_qbt ${LANG_FARSI} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_FARSI} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_FARSI} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/finnish.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_FINNISH} "Uninstalling previous version."
 LangString launch_qbt ${LANG_FINNISH} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_FINNISH} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_FINNISH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/french.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_FRENCH} "Désinstallation de la version précédent
 LangString launch_qbt ${LANG_FRENCH} "Lancer qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_FRENCH} "Cet installateur ne fonctionne que dans les versions 64 bits de Windows."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_FRENCH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/galician.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_GALICIAN} "Desinstalando a versión anterior."
 LangString launch_qbt ${LANG_GALICIAN} "Iniciar qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_GALICIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_GALICIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/german.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_GERMAN} "Vorherige Version wird deinstalliert."
 LangString launch_qbt ${LANG_GERMAN} "Starte qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_GERMAN} "Diese Installation funktioniert nur mit einer 64-bit Version von Windows."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_GERMAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/greek.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_GREEK} "Γίνεται απεγκατάσταση
 LangString launch_qbt ${LANG_GREEK} "Εκκίνηση του qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_GREEK} "Αυτό το αρχείο εγκατάστασης λειτουργεί μόνο σε 64-bit εκδόσεις των Windows."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_GREEK} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/hebrew.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_HEBREW} "Uninstalling previous version."
 LangString launch_qbt ${LANG_HEBREW} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_HEBREW} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_HEBREW} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/hungarian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_HUNGARIAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_HUNGARIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_HUNGARIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_HUNGARIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/icelandic.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_ICELANDIC} "Uninstalling previous version."
 LangString launch_qbt ${LANG_ICELANDIC} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_ICELANDIC} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_ICELANDIC} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/indonesian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_INDONESIAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_INDONESIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_INDONESIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_INDONESIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/irish.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_IRISH} "Uninstalling previous version."
 LangString launch_qbt ${LANG_IRISH} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_IRISH} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_IRISH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/italian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_ITALIAN} "Disinstallazione versione precedente."
 LangString launch_qbt ${LANG_ITALIAN} "Esegui qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_ITALIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_ITALIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/japanese.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_JAPANESE} "以前のバージョンをアンイン
 LangString launch_qbt ${LANG_JAPANESE} "qBittorrent を起動する"
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_JAPANESE} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_JAPANESE} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/korean.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_KOREAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_KOREAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_KOREAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_KOREAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/kurdish.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_KURDISH} "Uninstalling previous version."
 LangString launch_qbt ${LANG_KURDISH} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_KURDISH} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_KURDISH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/latvian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_LATVIAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_LATVIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_LATVIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_LATVIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/lithuanian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_LITHUANIAN} "Šalinu ankstesnę versiją."
 LangString launch_qbt ${LANG_LITHUANIAN} "Paleisti qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_LITHUANIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_LITHUANIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/luxembourgish.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_LUXEMBOURGISH} "Uninstalling previous version."
 LangString launch_qbt ${LANG_LUXEMBOURGISH} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_LUXEMBOURGISH} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_LUXEMBOURGISH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/macedonian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_MACEDONIAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_MACEDONIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_MACEDONIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_MACEDONIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/malay.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_MALAY} "Uninstalling previous version."
 LangString launch_qbt ${LANG_MALAY} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_MALAY} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_MALAY} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/mongolian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_MONGOLIAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_MONGOLIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_MONGOLIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_MONGOLIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/norwegian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_NORWEGIAN} "Avinstallerer forrige versjon."
 LangString launch_qbt ${LANG_NORWEGIAN} "Sett i gang qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_NORWEGIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_NORWEGIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/norwegiannynorsk.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_NORWEGIANNYNORSK} "Uninstalling previous version."
 LangString launch_qbt ${LANG_NORWEGIANNYNORSK} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_NORWEGIANNYNORSK} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_NORWEGIANNYNORSK} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/polish.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_POLISH} "Uninstalling previous version."
 LangString launch_qbt ${LANG_POLISH} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_POLISH} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_POLISH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/portuguese.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_PORTUGUESE} "A desinstalar versão anterior."
 LangString launch_qbt ${LANG_PORTUGUESE} "Iniciar qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_PORTUGUESE} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_PORTUGUESE} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/portugueseBR.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_PORTUGUESEBR} "Desinstalando versão anterior."
 LangString launch_qbt ${LANG_PORTUGUESEBR} "Executar qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_PORTUGUESEBR} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_PORTUGUESEBR} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/romanian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_ROMANIAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_ROMANIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_ROMANIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_ROMANIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/russian.nsi

@@ -9,23 +9,21 @@ LangString inst_startmenu ${LANG_RUSSIAN} "Создать ярлык в меню
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
 LangString inst_torrent ${LANG_RUSSIAN} "Открывать торрент-файлы с помощью qBittorrent"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
-LangString inst_magnet ${LANG_RUSSIAN} "Открывать магнет-ссылки с помощью qBittorrent"
+LangString inst_magnet ${LANG_RUSSIAN} "Открывать magnet-ссылки с помощью qBittorrent"
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_RUSSIAN} "Добавить в список исключений брандмауэра"
+LangString inst_firewall ${LANG_RUSSIAN} "Добавить в список исключений брандмауера"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_RUSSIAN} "Добавление в список исключений брандмауэра"
+LangString inst_firewallinfo ${LANG_RUSSIAN} "Добавление в список исключений брандмауера"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_RUSSIAN} "qBittorrent запущен. Пожалуйста, закройте qBittorrent и перезапустите программу установки."
 ;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 LangString inst_uninstall_question ${LANG_RUSSIAN} "Обнаружена предыдущая установка. Она будет деинсталлирована без удаления пользовательских настроек."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_RUSSIAN} "Деинсталлируется старая версия."
+LangString inst_unist ${LANG_RUSSIAN} "Деинсталлируем старую версию."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_RUSSIAN} "Запустить qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_RUSSIAN} "Этот установщик работает только на 64-битных версиях Windows."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_RUSSIAN} "Для работы этой версии qBittorrent требуется Windows 7 или выше."
 
 
 ;------------------------------------
@@ -42,9 +40,9 @@ LangString remove_registry ${LANG_RUSSIAN} "Удалить данные из р
 ;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
 LangString remove_conf ${LANG_RUSSIAN} "Удалить пользовательские настройки"
 ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_RUSSIAN} "Удалить из списка исключений брандмауэра"
+LangString remove_firewall ${LANG_RUSSIAN} "Удалить из списка исключений брандмауера"
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_RUSSIAN} "Удаление из списка исключений брандмауэра"
+LangString remove_firewallinfo ${LANG_RUSSIAN} "Удаление из списка исключений брандмауера"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
 LangString remove_cache ${LANG_RUSSIAN} "Удалить сохранённые торрент-файлы"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
@@ -52,4 +50,4 @@ LangString uninst_warning ${LANG_RUSSIAN} "qBittorrent запущен. Пожа
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
 LangString uninst_tor_warn ${LANG_RUSSIAN} "Ассоциации торрент-файлов не сброшены. Уже ассоциированы с:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_RUSSIAN} "Ассоциации магнет-ссылок не сброшены. Уже ассоциированы с:"
+LangString uninst_mag_warn ${LANG_RUSSIAN} "Ассоциации magnet-ссылок не сброшены. Уже ассоциированы с:"

dist/windows/installer-translations/serbian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_SERBIAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_SERBIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_SERBIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_SERBIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/serbianlatin.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_SERBIANLATIN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_SERBIANLATIN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_SERBIANLATIN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_SERBIANLATIN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/simpchinese.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_SIMPCHINESE} "卸载以前的版本。"
 LangString launch_qbt ${LANG_SIMPCHINESE} "启动 qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_SIMPCHINESE} "此安装程序只能在64位的Windows上工作。"
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_SIMPCHINESE} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/slovak.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_SLOVAK} "Uninstalling previous version."
 LangString launch_qbt ${LANG_SLOVAK} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_SLOVAK} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_SLOVAK} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/slovenian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_SLOVENIAN} "Uninstalling previous version."
 LangString launch_qbt ${LANG_SLOVENIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_SLOVENIAN} "This installer works only in 64-bit Windows versions."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_SLOVENIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/spanish.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_SPANISH} "Desinstalando la versión anterior."
 LangString launch_qbt ${LANG_SPANISH} "Iniciar qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_SPANISH} "Este instalador solo funciona en versiones de 64-bit de Windows."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_SPANISH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/spanishinternational.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_SPANISHINTERNATIONAL} "Desinstalando la versión an
 LangString launch_qbt ${LANG_SPANISHINTERNATIONAL} "Iniciar qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_SPANISHINTERNATIONAL} "Este instalador solo funciona en versiones de 64-bit de Windows."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_SPANISHINTERNATIONAL} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------