Bump to 4.1.6

Backport #10445 to v4_1_x

.appveyor.yml

@@ -51,8 +51,6 @@ before_build:
 
 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*
@@ -36,7 +35,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

@@ -8,24 +8,21 @@ dist: xenial
 
 env:
   matrix:
-    - libt_branch=RC_1_2 gui=true build_system=qmake
+    # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
-    - libt_branch=RC_1_2 gui=false build_system=qmake
+    #- lt_branch=dist gui=true
-    - libt_branch=RC_1_2 gui=true build_system=cmake
+    #- lt_branch=dist gui=false
-    - libt_branch=RC_1_2 gui=false build_system=cmake
+    - lt_branch=RC_1_0 gui=true build_system=cmake
-    - libt_branch=RC_1_1 gui=true build_system=qmake
+    - lt_branch=RC_1_0 gui=false build_system=cmake
-    - libt_branch=RC_1_1 gui=false build_system=qmake
+    - lt_branch=RC_1_0 gui=true build_system=qmake
-    - libt_branch=RC_1_1 gui=true build_system=cmake
+    - lt_branch=RC_1_0 gui=false build_system=qmake
-    - libt_branch=RC_1_1 gui=false build_system=cmake
   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: lt_branch=RC_1_0 gui=true build_system=cmake
-    - env: libt_branch=RC_1_2 gui=false build_system=cmake
+    - env: lt_branch=RC_1_0 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
 
 branches:
   except:
@@ -40,89 +37,86 @@ notifications:
 cache:
   ccache: true
   directories:
-    - $HOME/travis/deb
+    - $HOME/hombebrew_cache
-    - $HOME/travis/brew
 
 addons:
   coverity_scan:
     project:
       name: "qbittorrent/qBittorrent"
       description: "Build submitted via Travis CI"
-    build_command_prepend: "./bootstrap.sh && ./configure $qmake_conf"
+    build_command_prepend: "./bootstrap.sh && ./configure $qbtconf"
-    build_command: "make -j2"
+    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
       - sourceline: 'ppa:qbittorrent-team/qbittorrent-stable'
-      - sourceline: 'ppa:beineri/opt-qt59-xenial'
     packages:
       # packages list: https://github.com/travis-ci/apt-package-safelist/blob/master/ubuntu-trusty
       - [autoconf, automake, colormake]
-      - [libboost-dev, libboost-system-dev]
+      - [ninja-build]
       - libssl-dev
+      - [libboost-dev, libboost-system-dev]
       - libtorrent-rasterbar-dev
-      - [qt59base, qt59svg, qt59tools]
+      - [qtbase5-dev, qttools5-dev-tools, libqt5svg5-dev]
-      - zlib1g-dev
-      # required for Qt 5.9 from 'beineri' PPA
-      - libgl1-mesa-dev
 
 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)
   - 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" PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
+      CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedefs -Wno-inconsistent-missing-override"
+    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"
-
-      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"
     fi
 
   # print settings
-  - echo $libt_branch
+  - echo $lt_branch
   - echo $gui
   - echo $build_system
-  - echo $qmake_conf
+  - echo $ltconf
-  - echo $cmake_conf
+  - 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 outdated "pkg-config" || brew upgrade "pkg-config"
-      brew link --force qt zlib
+      brew install colormake ccache zlib qt openssl libtorrent-rasterbar
+      PATH="/usr/local/opt/ccache/libexec:$PATH"
+      brew link --force zlib qt
 
       if [ "$build_system" = "cmake" ]; then
+        brew outdated cmake || brew upgrade cmake
+        brew install ninja
+
         sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
         sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins
+        
+        MY_CMAKE_OPENSSL_HINT="-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/"
       fi
     fi
   - |
@@ -131,92 +125,29 @@ install:
       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
+    if [ "$build_system" = "cmake" ]; then
-      # scan only as lupdate is prone to hang
+      mkdir build
-      lupdate -extensions c,cpp,h,hpp,ui ./
+      cd build
-      ./bootstrap.sh
+      if [ "$gui" = "false" ]; then
-      ./configure $qmake_conf CXXFLAGS="$CXXFLAGS"
+        DISABLE_GUI_OPTION="-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=ON"
-    else
+      fi
-      mkdir build && cd build
+      cmake $DISABLE_GUI_OPTION -DCMAKE_INSTALL_PREFIX="$qbt_path" "$MY_CMAKE_OPENSSL_HINT" \
-      cmake $cmake_conf ../
+        -G "Ninja" -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE ..
+      BUILD_TOOL="ninja"
     fi
-  - make && make install
+    if [ "$build_system" = "qmake" ]; then
+      ./bootstrap.sh && ./configure $qbtconf CXXFLAGS="$CXXFLAGS"
+      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

CMakeLists.txt

@@ -2,10 +2,6 @@ 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()
-
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 include(FunctionReadVersion)
 
@@ -34,10 +30,8 @@ include(GNUInstallDirs)
 include(FeatureSummary)
 
 # version requirements
-set(requiredBoostVersion 1.40)
+set(requiredBoostVersion 1.35)
-set(requiredQtVersion 5.9.0)
+set(requiredQtVersion 5.5.1)
-set(requiredOpensslVersion 1.0)
-set(requiredLibtorrentVersion 1.1.10)
 
 if(WIN32)
     include(winconf)

CODING_GUIDELINES.md

@@ -306,7 +306,7 @@ Example:
 #include <QString>
 #include <QUrl>
 
-#ifdef Q_OS_MACOS  // conditional
+#ifdef Q_OS_MAC  // conditional
 #include <QFont>
 #endif
 

Changelog

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

INSTALL

@@ -1,26 +1,7 @@
 qBittorrent - A BitTorrent client in C++ / Qt
 ------------------------------------------
 
-1) Install these dependencies:
+1) Compile and install qBittorrent with Qt graphical interface
-
-  - 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
 
   $ ./configure
   $ make && make install
@@ -28,7 +9,21 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   will install and execute qBittorrent.
 
-2b) Compile and install qBittorrent without Qt graphical interface
+  Dependencies:
+    - Qt >= 5.5.1
+
+    - pkg-config
+
+    - libtorrent-rasterbar >= 1.0.6 (by Arvid Norberg)
+        * https://www.libtorrent.org/
+        * Be careful: another library (the one used by rTorrent) uses a similar name
+
+    - Boost >= 1.35
+
+    - Python >= 2.7.9 / 3.3.0 (optional, runtime only)
+        * Required by the internal search engine
+
+2) Compile and install qBittorrent without Qt graphical interface
 
   $ ./configure --disable-gui
   $ make && make install
@@ -36,6 +31,17 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   will install and execute qBittorrent.
 
+  Dependencies:
+    - Qt >= 5.5.1
+
+    - pkg-config
+
+    - libtorrent-rasterbar >= 1.0.6 (by Arvid Norberg)
+        * https://www.libtorrent.org/
+        * Be careful: another library (the one used by rTorrent) uses a similar name
+
+    - Boost >= 1.35
+
 DOCUMENTATION:
 Please note that there is a "Compilation" section at http://wiki.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 | \
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-  icl | *[/\\]icl | icl.exe | *[/\\]icl.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"`
+      dst=$dstdir/`basename "$src"`
-      case $dst in
-	*/) dst=$dst$dstbase;;
-	*)  dst=$dst/$dstbase;;
-      esac
       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/d") >/dev/null 2>&1
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/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 "$tmpdir"`
-                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
                    case $ls_ld_tmpdir in
                      d????-?r-*) different_mode=700;;
                      d????-?--*) different_mode=755;;
                      *) false;;
                    esac &&
-                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$test_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.$$_
+    dsttmp=$dstdir/_inst.$$_
-    rmtmp=${dstdirslash}_rm.$$_
+    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/
+perl_URL=http://www.perl.org/
-flex_URL=https://github.com/westes/flex
+flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=https://www.gnu.org/software
+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/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()
 

cmake/Modules/FindQtSingleApplication.cmake

@@ -0,0 +1,79 @@
+# - 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 (Qt5Widgets_FOUND)
+    set(_includeFileName qtsingleapplication.h)
+else()
+    set(_includeFileName qtsinglecoreapplication.h)
+endif()
+
+FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
+    FIND_PATH(QtSingleApplication_INCLUDE_DIR ${_includeFileName} ${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}
+)
+
+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)
+    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)
+
+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)

cmake/Modules/MacroQbtCompilerSettings.cmake

@@ -10,14 +10,14 @@ 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"
+            "-Wfloat-equal -Wcast-qual -Wcast-align"
-            "-Winvalid-pch -Wno-long-long"
+            "-Wsign-conversion -Winvalid-pch -Wno-long-long"
             #"-fstack-protector-all"
             #"-Werror -Wno-error=deprecated-declarations"
         )
         set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti"
             "-Woverloaded-virtual -Wold-style-cast"
-            "-Wnon-virtual-dtor"
+            "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align"
             #"-Weffc++"
             #"-Werror -Wno-error=cpp"
             # we should modify code to make these ones obsolete
@@ -61,7 +61,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 +73,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
+            string(APPEND CMAKE_C_FLAGS_DEBUG " -Og -g3 -march=native -pipe" )
-                "Additional qBittorent compile flags")
+            string(APPEND CMAKE_CXX_FLAGS_DEBUG " -Og -g3 -march=native -pipe" )
-            set(QBT_ADDITONAL_CXX_FLAGS "-Og -g3 -pipe" CACHE STRING
-                "Additional qBittorent C++ compile flags")
         else(_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-            set(QBT_ADDITONAL_FLAGS "-O0 -g3 -pipe" CACHE STRING
+            string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g3 -march=native -pipe" )
-                "Additional qBittorent compile flags")
+            string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g3 -march=native -pipe" )
-            set(QBT_ADDITONAL_CXX_FLAGS "-O0 -g3 -pipe" CACHE STRING
-                "Additional qBittorent C++ compile flags")
         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/winconf-mingw.cmake

@@ -1,11 +1,14 @@
+if (STACKTRACE)
+    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)
+
 if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
     link_libraries(-Wl,--dynamicbase)
-endif ()
+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)
 
+# 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)
+    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)
+
+# 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
+    -DBOOST_SYSTEM_STATIC_LINK=1
-    # TODO: remove the following define as it is not used since OpenSSL >= 1.1
     -DTORRENT_USE_OPENSSL
-    # TODO: remove the following define as it is not used since libtorrent >= 1.2
+    -D__USE_W32_SOCKETS
-    -DTORRENT_DISABLE_RESOLVE_COUNTRIES
+    -D_FILE_OFFSET_BITS=64)
-)
 
-set(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES system)
+add_definitions(-DUNICODE
-
-# 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
     -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
 )
-
+# and boost
-# Enable if libtorrent was built with this flag defined
+set(Boost_USE_STATIC_LIBS  True)
-#list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS -DTORRENT_NO_DEPRECATE)
+# set(Boost_USE_STATIC_RUNTIME True)
-
-if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
-    list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
-    -DTORRENT_DEBUG)
-else ()
-    add_definitions(-DNDEBUG)
-endif ()
 
 # 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.windows

@@ -35,15 +35,26 @@ 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
+# 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 encountered build error with boost version <= 1.59
 #DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES
 
-# 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

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for qbittorrent v4.2.1.
+# Generated by GNU Autoconf 2.69 for qbittorrent v4.1.6.
 #
 # Report bugs to <bugs.qbittorrent.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='qbittorrent'
 PACKAGE_TARNAME='qbittorrent'
-PACKAGE_VERSION='v4.2.1'
+PACKAGE_VERSION='v4.1.6'
-PACKAGE_STRING='qbittorrent v4.2.1'
+PACKAGE_STRING='qbittorrent v4.1.6'
 PACKAGE_BUGREPORT='bugs.qbittorrent.org'
 PACKAGE_URL='https://www.qbittorrent.org/'
 
@@ -603,8 +603,6 @@ EXPAND_BINDIR
 EXPAND_PREFIX
 zlib_LIBS
 zlib_CFLAGS
-openssl_LIBS
-openssl_CFLAGS
 libtorrent_LIBS
 libtorrent_CFLAGS
 BOOST_SYSTEM_LIB
@@ -719,6 +717,7 @@ ac_user_opts='
 enable_option_checking
 enable_dependency_tracking
 enable_silent_rules
+with_qtsingleapplication
 enable_debug
 enable_stacktrace
 enable_gui
@@ -748,8 +747,6 @@ Qt5Svg_CFLAGS
 Qt5Svg_LIBS
 libtorrent_CFLAGS
 libtorrent_LIBS
-openssl_CFLAGS
-openssl_LIBS
 zlib_CFLAGS
 zlib_LIBS'
 
@@ -1302,7 +1299,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures qbittorrent v4.2.1 to adapt to many kinds of systems.
+\`configure' configures qbittorrent v4.1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1373,7 +1370,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of qbittorrent v4.2.1:";;
+     short | recursive ) echo "Configuration of qbittorrent v4.1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1398,6 +1395,9 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-qtsingleapplication=[system|shipped]
+                          Use the shipped qtsingleapplication library or the
+                          system one (default=shipped)
   --with-boost[=ARG]      use Boost library from a standard location
                           (ARG=yes), from the specified location (ARG=<path>),
                           or disable it (ARG=no) [ARG=yes]
@@ -1427,7 +1427,7 @@ Some influential environment variables:
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
-  QT_QMAKE    value of host_bins for Qt5Core >= 5.9.0, overriding pkg-config
+  QT_QMAKE    value of host_bins for Qt5Core >= 5.5.1, overriding pkg-config
   Qt5Svg_CFLAGS
               C compiler flags for Qt5Svg, overriding pkg-config
   Qt5Svg_LIBS linker flags for Qt5Svg, overriding pkg-config
@@ -1435,10 +1435,6 @@ Some influential environment variables:
               C compiler flags for libtorrent, overriding pkg-config
   libtorrent_LIBS
               linker flags for libtorrent, overriding pkg-config
-  openssl_CFLAGS
-              C compiler flags for openssl, overriding pkg-config
-  openssl_LIBS
-              linker flags for openssl, overriding pkg-config
   zlib_CFLAGS C compiler flags for zlib, overriding pkg-config
   zlib_LIBS   linker flags for zlib, overriding pkg-config
 
@@ -1509,7 +1505,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-qbittorrent configure v4.2.1
+qbittorrent configure v4.1.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1648,7 +1644,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by qbittorrent $as_me v4.2.1, which was
+It was created by qbittorrent $as_me v4.1.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3826,7 +3822,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='qbittorrent'
- VERSION='v4.2.1'
+ VERSION='v4.1.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4182,6 +4178,15 @@ QBT_CXX="$CXX"
 
 # Define --wth-* and --enable-* arguments
 
+
+# Check whether --with-qtsingleapplication was given.
+if test "${with_qtsingleapplication+set}" = set; then :
+  withval=$with_qtsingleapplication;
+else
+  with_qtsingleapplication=shipped
+fi
+
+
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
@@ -4485,8 +4490,8 @@ $as_echo "$enable_webui" >&6; }
 esac
 
 if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.5.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.9.0") 2>&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.5.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
@@ -4495,12 +4500,12 @@ if test -n "$QT_QMAKE"; then
     pkg_cv_QT_QMAKE="$QT_QMAKE"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.5.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.9.0") 2>&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.5.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_QT_QMAKE=`$PKG_CONFIG --variable="host_bins" "Qt5Core >= 5.9.0" 2>/dev/null`
+  pkg_cv_QT_QMAKE=`$PKG_CONFIG --variable="host_bins" "Qt5Core >= 5.5.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -4527,8 +4532,8 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 qmake >= 5.9.0" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 qmake >= 5.5.1" >&5
-$as_echo_n "checking for Qt5 qmake >= 5.9.0... " >&6; }
+$as_echo_n "checking for Qt5 qmake >= 5.5.1... " >&6; }
 if test "x$QT_QMAKE" != "x"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_QMAKE" >&5
 $as_echo "$QT_QMAKE" >&6; }
@@ -4642,11 +4647,11 @@ case "x$enable_qt_dbus" in #(
   "xyes") :
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5DBus >= 5.9.0" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5DBus >= 5.5.1" >&5
-$as_echo_n "checking for Qt5DBus >= 5.9.0... " >&6; }
+$as_echo_n "checking for Qt5DBus >= 5.5.1... " >&6; }
        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5DBus >= 5.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5DBus >= 5.5.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "Qt5DBus >= 5.9.0") 2>&5
+  ($PKG_CONFIG --exists --print-errors "Qt5DBus >= 5.5.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
@@ -4716,10 +4721,10 @@ BOOST_CPPFLAGS=""
 if test "x$want_boost" = "xyes"; then :
 
 
-  if test "x1.40" = "x"; then :
+  if test "x1.35" = "x"; then :
   _AX_BOOST_BASE_TONUMERICVERSION_req="1.20.0"
 else
-  _AX_BOOST_BASE_TONUMERICVERSION_req="1.40"
+  _AX_BOOST_BASE_TONUMERICVERSION_req="1.35"
 fi
   _AX_BOOST_BASE_TONUMERICVERSION_req_shorten=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([0-9]*\.[0-9]*\)'`
   _AX_BOOST_BASE_TONUMERICVERSION_req_major=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([0-9]*\)'`
@@ -4744,9 +4749,7 @@ fi
                         case ${host_cpu} in #(
   x86_64) :
     libsubdirs="lib64 libx32 lib lib64" ;; #(
-  mips*64*) :
+  ppc64|s390x|sparc64|aarch64|ppc64le) :
-    libsubdirs="lib64 lib32 lib lib64" ;; #(
-  ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64) :
     libsubdirs="lib64 lib lib64" ;; #(
   *) :
     libsubdirs="lib"
@@ -4763,16 +4766,16 @@ esac
 
                 if test "x$_AX_BOOST_BASE_boost_path" != "x"; then :
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= 1.40 ($WANT_BOOST_VERSION) includes in \"$_AX_BOOST_BASE_boost_path/include\"" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= 1.35 ($WANT_BOOST_VERSION) includes in \"$_AX_BOOST_BASE_boost_path/include\"" >&5
-$as_echo_n "checking for boostlib >= 1.40 ($WANT_BOOST_VERSION) includes in \"$_AX_BOOST_BASE_boost_path/include\"... " >&6; }
+$as_echo_n "checking for boostlib >= 1.35 ($WANT_BOOST_VERSION) includes in \"$_AX_BOOST_BASE_boost_path/include\"... " >&6; }
          if test -d "$_AX_BOOST_BASE_boost_path/include" && test -r "$_AX_BOOST_BASE_boost_path/include"; then :
 
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
            BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path/include"
            for _AX_BOOST_BASE_boost_path_tmp in $multiarch_libsubdir $libsubdirs; do
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= 1.40 ($WANT_BOOST_VERSION) lib path in \"$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp\"" >&5
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= 1.35 ($WANT_BOOST_VERSION) lib path in \"$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp\"" >&5
-$as_echo_n "checking for boostlib >= 1.40 ($WANT_BOOST_VERSION) lib path in \"$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp\"... " >&6; }
+$as_echo_n "checking for boostlib >= 1.35 ($WANT_BOOST_VERSION) lib path in \"$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp\"... " >&6; }
                 if test -d "$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp" && test -r "$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp" ; then :
 
                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -4815,8 +4818,8 @@ fi
   BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_lib_path"
 fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= 1.40 ($WANT_BOOST_VERSION)" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= 1.35 ($WANT_BOOST_VERSION)" >&5
-$as_echo_n "checking for boostlib >= 1.40 ($WANT_BOOST_VERSION)... " >&6; }
+$as_echo_n "checking for boostlib >= 1.35 ($WANT_BOOST_VERSION)... " >&6; }
     CPPFLAGS_SAVED="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
     export CPPFLAGS
@@ -4985,8 +4988,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
     if test "x$succeeded" != "xyes" ; then
         if test "x$_version" = "x0" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: We could not detect the boost libraries (version 1.40 or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: We could not detect the boost libraries (version 1.35 or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&5
-$as_echo "$as_me: We could not detect the boost libraries (version 1.40 or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&6;}
+$as_echo "$as_me: We could not detect the boost libraries (version 1.35 or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&6;}
         else
             { $as_echo "$as_me:${as_lineno-$LINENO}: Your boost libraries seems to old (version $_version)." >&5
 $as_echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;}
@@ -5268,7 +5271,7 @@ fi
 
             fi
             if test "x$ax_lib" = "x"; then
-                as_fn_error $? "Could not find a version of the Boost::System library!" "$LINENO" 5
+                as_fn_error $? "Could not find a version of the library!" "$LINENO" 5
             fi
 			if test "x$link_system" = "xno"; then
 				as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5
@@ -5283,6 +5286,23 @@ fi
 $as_echo "$as_me: Boost.System LIB: \"$BOOST_SYSTEM_LIB\"" >&6;}
 LIBS="$BOOST_SYSTEM_LIB $LIBS"
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which qtsingleapplication to use" >&5
+$as_echo_n "checking which qtsingleapplication to use... " >&6; }
+case "x$with_qtsingleapplication" in #(
+  "xshipped") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: shipped" >&5
+$as_echo "shipped" >&6; }
+                   QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG usesystemqtsingleapplication" ;; #(
+  "xsystem") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
+$as_echo "system" >&6; }
+                  QBT_ADD_CONFIG="$QBT_ADD_CONFIG usesystemqtsingleapplication" ;; #(
+  *) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_qtsingleapplication" >&5
+$as_echo "$with_qtsingleapplication" >&6; }
+        as_fn_error $? "Unknown option \"$with_qtsingleapplication\". Use either \"system\" or \"shipped\"." "$LINENO" 5 ;;
+esac
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtorrent" >&5
@@ -5292,12 +5312,12 @@ if test -n "$libtorrent_CFLAGS"; then
     pkg_cv_libtorrent_CFLAGS="$libtorrent_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.1.10\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.0.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.1.10") 2>&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.0.6") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.1.10" 2>/dev/null`
+  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.0.6" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5309,12 +5329,12 @@ if test -n "$libtorrent_LIBS"; then
     pkg_cv_libtorrent_LIBS="$libtorrent_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.1.10\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.0.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.1.10") 2>&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.0.6") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.1.10" 2>/dev/null`
+  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.0.6" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5335,14 +5355,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.1.10" 2>&1`
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.0.6" 2>&1`
         else
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.1.10" 2>&1`
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.0.6" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libtorrent_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.1.10) were not met:
+	as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.0.6) were not met:
 
 $libtorrent_PKG_ERRORS
 
@@ -5377,99 +5397,6 @@ $as_echo "yes" >&6; }
 fi
 
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
-$as_echo_n "checking for openssl... " >&6; }
-
-if test -n "$openssl_CFLAGS"; then
-    pkg_cv_openssl_CFLAGS="$openssl_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "openssl >= 1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_openssl_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$openssl_LIBS"; then
-    pkg_cv_openssl_LIBS="$openssl_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "openssl >= 1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_openssl_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        openssl_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 1.0" 2>&1`
-        else
-	        openssl_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 1.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$openssl_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (openssl >= 1.0) were not met:
-
-$openssl_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables openssl_CFLAGS
-and openssl_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables openssl_CFLAGS
-and openssl_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	openssl_CFLAGS=$pkg_cv_openssl_CFLAGS
-	openssl_LIBS=$pkg_cv_openssl_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	CXXFLAGS="$openssl_CFLAGS $CXXFLAGS"
-                  LIBS="$openssl_LIBS $LIBS"
-fi
-
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
 $as_echo_n "checking for zlib... " >&6; }
@@ -5562,18 +5489,16 @@ $as_echo "yes" >&6; }
                  LIBS="$zlib_LIBS $LIBS"
 fi
 
-# Check if already in >= C++14 mode because of the flags returned by one of the above packages
+# Check if already in >= C++11 mode because of the flags returned by one of the above packages
-TMP_CXXFLAGS="$CXXFLAGS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler is using C++11 or later mode" >&5
-CXXFLAGS=""
+$as_echo_n "checking if compiler is using C++11 or later mode... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler defaults to C++14 or later mode" >&5
-$as_echo_n "checking if compiler defaults to C++14 or later mode... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
             #ifndef __cplusplus
             #error "This is not a C++ compiler"
-            #elif __cplusplus < 201402L
+            #elif __cplusplus < 201103L
-            #error "This is not a C++14 compiler"
+            #error "This is not a C++11 compiler"
             #endif
 int
 main ()
@@ -5587,27 +5512,28 @@ _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                   QBT_CXX14_FOUND="yes"
+                   QBT_CXX11_FOUND="yes"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                   QBT_CXX14_FOUND="no"
+                   QBT_CXX11_FOUND="no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-# In case of no, check if the compiler can support at least C++14
+# In case of no, check if the compiler can support at least C++11
 # and if yes, enable it leaving a warning to the user
-if test "x$QBT_CXX14_FOUND" = "xno"; then :
+if test "x$QBT_CXX11_FOUND" = "xno"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports C++14" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports C++11" >&5
-$as_echo_n "checking if compiler supports C++14... " >&6; }
+$as_echo_n "checking if compiler supports C++11... " >&6; }
-       CXXFLAGS="-std=c++14"
+       TMP_CXXFLAGS="$CXXFLAGS"
+       CXXFLAGS="$CXXFLAGS -std=c++11"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
             #ifndef __cplusplus
             #error "This is not a C++ compiler"
-            #elif __cplusplus < 201402L
+            #elif __cplusplus < 201103L
-            #error "This is not a C++14 compiler"
+            #error "This is not a C++11 compiler"
             #endif
 int
 main ()
@@ -5621,17 +5547,17 @@ _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++14 is disabled by the set compiler flags" >&5
+                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++11 is disabled by the set compiler flags" >&5
-$as_echo_n "checking if C++14 is disabled by the set compiler flags... " >&6; }
+$as_echo_n "checking if C++11 is disabled by the set compiler flags... " >&6; }
                          # prepend the flag so it won't override conflicting user defined flags
-                         CXXFLAGS="-std=c++14 $TMP_CXXFLAGS"
+                         CXXFLAGS="-std=c++11 $TMP_CXXFLAGS"
                          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
             #ifndef __cplusplus
             #error "This is not a C++ compiler"
-            #elif __cplusplus < 201402L
+            #elif __cplusplus < 201103L
-            #error "This is not a C++14 compiler"
+            #error "This is not a C++11 compiler"
             #endif
 int
 main ()
@@ -5645,24 +5571,29 @@ _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++14"
+                                            CXXFLAGS="$TMP_CXXFLAGS -std=c++11"
-                                            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 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." >&5
+                                            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++11 mode is now force enabled.
-$as_echo "$as_me: WARNING: 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." >&2;}
+Make sure you use the same C++ mode for qBittorrent and its dependencies.
+To explicitly set qBittorrent to a later mode use CXXFLAGS.
+Example: \`CXXFLAGS=\"\$CXXFLAGS -std=c++14\" ./configure\`" >&5
+$as_echo "$as_me: WARNING: C++11 mode is now force enabled.
+Make sure you use the same C++ mode for qBittorrent and its dependencies.
+To explicitly set qBittorrent to a later mode use CXXFLAGS.
+Example: \`CXXFLAGS=\"\$CXXFLAGS -std=c++14\" ./configure\`" >&2;}
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                                            as_fn_error $? "The compiler supports C++14 but the user or a dependency has explicitly enabled a lower mode." "$LINENO" 5
+                                            as_fn_error $? "The compiler supports C++11 but the user or a dependency has explicitly enabled a lower mode." "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                         as_fn_error $? "A compiler supporting C++14 is required." "$LINENO" 5
+                         as_fn_error $? "A compiler supporting C++11 is required." "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-CXXFLAGS="$TMP_CXXFLAGS"
 
 # These are required because autoconf doesn't expand these **particular**
 # vars automatically. And qmake cannot autoexpand them.
@@ -6343,7 +6274,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by qbittorrent $as_me v4.2.1, which was
+This file was extended by qbittorrent $as_me v4.1.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6401,7 +6332,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-qbittorrent config.status v4.2.1
+qbittorrent config.status v4.1.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7659,7 +7590,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by qbittorrent $as_me v4.2.1, which was
+This file was extended by qbittorrent $as_me v4.1.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7717,7 +7648,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-qbittorrent config.status v4.2.1
+qbittorrent config.status v4.1.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -8401,17 +8332,21 @@ fi
 
 fi
 
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: Running qmake to generate the makefile..." >&5
 $as_echo "$as_me: Running qmake to generate the makefile..." >&6;}
-TOPDIR="$(cd "$(dirname "$0")" && pwd)"
+CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
-$QT_QMAKE -r "$TOPDIR/qbittorrent.pro" "QMAKE_LRELEASE=$QMAKE_LRELEASE"
+
-qmake_ret="$?"
+$QT_QMAKE -r $CONFDIR/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE"
+
+ret="$?"
 
 $as_echo
-if test "x$qmake_ret" != "x0"; then :
+if test "x$ret" = "x0"; then :
-  as_fn_error $? "$QT_QMAKE failed to generate the makefile" "$LINENO" 5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Good, your configure finished." >&5
+$as_echo "$as_me: Good, your configure finished." >&6;}
+else
+  as_fn_error $? "Failed running $QT_QMAKE to generate the makefile" "$LINENO" 5
 fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Good, the configure finished." >&5
-$as_echo "$as_me: Good, the configure finished." >&6;}
 $as_echo

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v4.2.1], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.1.6], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
@@ -14,6 +14,12 @@ 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,7 +163,7 @@ AS_CASE(["x$enable_qt_dbus"],
         AC_MSG_ERROR([Unknown option "$enable_qt_dbus". Use either "yes" or "no".])])
 
 
-AX_BOOST_BASE([1.40],
+AX_BOOST_BASE([1.35],
               [AC_MSG_NOTICE([Boost CXXFLAGS: "$BOOST_CPPFLAGS"])
                AC_MSG_NOTICE([Boost LDFLAGS: "$BOOST_LDFLAGS"])],
               [AC_MSG_ERROR([Could not find Boost])])
@@ -177,51 +183,58 @@ AX_BOOST_SYSTEM()
 AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
 LIBS="$BOOST_SYSTEM_LIB $LIBS"
 
+AC_MSG_CHECKING([which qtsingleapplication to use])
+AS_CASE(["x$with_qtsingleapplication"],
+        ["xshipped"],
+                   [AC_MSG_RESULT([shipped])
+                   QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG usesystemqtsingleapplication"],
+        ["xsystem"],
+                  [AC_MSG_RESULT([system])
+                  QBT_ADD_CONFIG="$QBT_ADD_CONFIG usesystemqtsingleapplication"],
+        [AC_MSG_RESULT([$with_qtsingleapplication])
+        AC_MSG_ERROR([Unknown option "$with_qtsingleapplication". Use either "system" or "shipped".])])
+
 PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 1.1.10],
+                  [libtorrent-rasterbar >= 1.0.6],
                   [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS"
                   LIBS="$libtorrent_LIBS $LIBS"])
 
-PKG_CHECK_MODULES(openssl,
-                  [openssl >= 1.0],
-                  [CXXFLAGS="$openssl_CFLAGS $CXXFLAGS"
-                  LIBS="$openssl_LIBS $LIBS"])
-
 PKG_CHECK_MODULES(zlib,
                  [zlib >= 1.2.5.2],
                  [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS"
                  LIBS="$zlib_LIBS $LIBS"])
 
-# Check if already in >= C++14 mode because of the flags returned by one of the above packages
+# Check if already in >= C++11 mode because of the flags returned by one of the above packages
-TMP_CXXFLAGS="$CXXFLAGS"
+AC_MSG_CHECKING([if compiler is using C++11 or later mode])
-CXXFLAGS=""
+AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()],
-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"],
+                   QBT_CXX11_FOUND="yes"],
                   [AC_MSG_RESULT([no])
-                   QBT_CXX14_FOUND="no"])
+                   QBT_CXX11_FOUND="no"])
-
+                  
-# In case of no, check if the compiler can support at least C++14
+# In case of no, check if the compiler can support at least C++11
 # and if yes, enable it leaving a warning to the user
-AS_IF([test "x$QBT_CXX14_FOUND" = "xno"],
+AS_IF([test "x$QBT_CXX11_FOUND" = "xno"],
-      [AC_MSG_CHECKING([if compiler supports C++14])
+      [AC_MSG_CHECKING([if compiler supports C++11])
-       CXXFLAGS="-std=c++14"
+       TMP_CXXFLAGS="$CXXFLAGS"
-       AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+       CXXFLAGS="$CXXFLAGS -std=c++11"
+       AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()],
                         [AC_MSG_RESULT([yes])
-                         AC_MSG_CHECKING([if C++14 is disabled by the set compiler flags])
+                         AC_MSG_CHECKING([if C++11 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"
+                         CXXFLAGS="-std=c++11 $TMP_CXXFLAGS"
-                         AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+                         AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()],
                                            [AC_MSG_RESULT([no])
-                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++14"
+                                            CXXFLAGS="$TMP_CXXFLAGS -std=c++11"
-                                            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_WARN([C++11 mode is now force enabled.
+Make sure you use the same C++ mode for qBittorrent and its dependencies.
+To explicitly set qBittorrent to a later mode use CXXFLAGS.
+Example: `CXXFLAGS="\$CXXFLAGS -std=c++14" ./configure`])],
                                            [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_ERROR([The compiler supports C++11 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.])])
+                         AC_MSG_ERROR([A compiler supporting C++11 is required.])])
       ])
-CXXFLAGS="$TMP_CXXFLAGS"
 
 # These are required because autoconf doesn't expand these **particular**
 # vars automatically. And qmake cannot autoexpand them.
@@ -274,14 +287,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)"
+CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
-$QT_QMAKE -r "$TOPDIR/qbittorrent.pro" "QMAKE_LRELEASE=$QMAKE_LRELEASE"
+
-qmake_ret="$?"
+$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE"
+
+ret="$?"
 
 AS_ECHO()
-AS_IF([test "x$qmake_ret" != "x0"],
+AS_IF([test "x$ret" = "x0"],
-      [AC_MSG_ERROR([$QT_QMAKE failed to generate the makefile])])
+      [AC_MSG_NOTICE([Good, your configure finished.])],
-
+      [AC_MSG_ERROR([Failed running $QT_QMAKE to generate the makefile])])
-AC_MSG_NOTICE([Good, the configure finished.])
 AS_ECHO()

dist/mac/Info.plist

@@ -55,7 +55,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.2.1</string>
+	<string>4.1.6</string>
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>

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

@@ -72,8 +72,4 @@
   <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/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.target
-After=network-online.target nss-lookup.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."
 
 
 ;------------------------------------

dist/windows/installer-translations/swedish.nsi

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

dist/windows/installer-translations/thai.nsi

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

dist/windows/installer-translations/tradchinese.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_TRADCHINESE} "正在移除先前版本"
 LangString launch_qbt ${LANG_TRADCHINESE} "啟動 qBittorrent"
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_TRADCHINESE} "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_TRADCHINESE} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/turkish.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_TURKISH} "Önceki sürüm kaldırılıyor."
 LangString launch_qbt ${LANG_TURKISH} "qBittorrent'i çalıştır."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_TURKISH} "Bu yükleyici sadece 64-bit Windows sürümlerinde çalışır."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_TURKISH} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/ukrainian.nsi

@@ -24,8 +24,6 @@ LangString inst_unist ${LANG_UKRAINIAN} "Видалення попередньо
 LangString launch_qbt ${LANG_UKRAINIAN} "Запустити qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_UKRAINIAN} "Ця програма установки працює тільки в 64-розрядних версіях Windows."
-;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_UKRAINIAN} "This qBittorrent version requires at least Windows 7."
 
 
 ;------------------------------------

dist/windows/installer-translations/uzbek.nsi

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

dist/windows/installer-translations/welsh.nsi

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

dist/windows/installer.nsi

@@ -198,11 +198,6 @@ Function .onInit
 
   !insertmacro Init "installer"
   !insertmacro MUI_LANGDLL_DISPLAY
-  
-  ${IfNot} ${AtLeastWin7}
-    MessageBox MB_OK|MB_ICONEXCLAMATION $(inst_requires_win7)
-    Abort
-  ${EndIf}
 
   !ifdef APP64BIT
     ${IfNot} ${RunningX64}

dist/windows/options.nsi

@@ -14,7 +14,6 @@ XPStyle on
 !include "MUI.nsh"
 !include "UAC.nsh"
 !include "FileFunc.nsh"
-!include "WinVer.nsh"
 !ifdef APP64BIT
 !include "x64.nsh"
 !endif
@@ -28,7 +27,7 @@ XPStyle on
 !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
 
 ; Program specific
-!define PROG_VERSION "4.2.1"
+!define PROG_VERSION "4.1.6"
 
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun