Bump to 4.2.0

.appveyor.yml

@@ -3,7 +3,7 @@ version: '{branch}-{build}'
 # Do not build on tags (GitHub only)
 skip_tags: true
 
-image: Visual Studio 2019
+image: Visual Studio 2017
 
 branches:
   except:  # blacklist
@@ -13,8 +13,8 @@ environment:
   REPO_DIR: &REPO_DIR c:\qbittorrent
   CACHE_DIR: &CACHE_DIR c:\qbt_cache
 
-  QBT_VER_URL: https://builds.shiki.hu/appveyor/version_64
-  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries_64.7z
+  QBT_VER_URL: https://builds.shiki.hu/appveyor/version
+  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries.7z
 
 # project directory
 clone_folder: *REPO_DIR
@@ -38,12 +38,12 @@ install:
       appveyor DownloadFile "%QBT_LIB_URL%" -FileName "c:\qbt_lib.7z" && 7z x "c:\qbt_lib.7z" -o"%CACHE_DIR%" > nul &&
       COPY "c:\version_new" "%CACHE_DIR%\version")
   # Qt stay compressed in cache
-  - 7z x "%CACHE_DIR%\qt5_64.7z" -o"c:\qbt" > nul
+  - 7z x "%CACHE_DIR%\qt5_32.7z" -o"c:\qbt" > nul
 
 before_build:
   # setup env
-  - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-  - SET PATH=%PATH%;C:\Qt\5.15.2\msvc2019_64\bin;%CACHE_DIR%\jom
+  - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+  - SET PATH=%PATH%;c:\qbt\qt5_32\bin;%CACHE_DIR%\jom;
   # setup project
   - COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"
   # workarounds

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: "https://www.qbittorrent.org/donate.php"

.github/ISSUE_TEMPLATE.md

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,89 +0,0 @@
----
-name: Bug Report
-about: Report a problem with qBittorrent to help us resolve it.
-title: ''
-labels: ''
-assignees: ''
----
-
-# Bug report
-
-<!--
-###############################################################################
-  WARNING!
-  IGNORING THE INSTRUCTIONS IN THIS TEMPLATE WILL RESULT IN THE ISSUE BEING
-  CLOSED AS INCOMPLETE/INVALID
-###############################################################################
--->
-
-## Checklist
-
-<!--
-################################## IMPORTANT ##################################
-
-As you read and fulfill each of the following requirements below,
-put an "x" between the square brackets to mark each task as done, like so: [x]
--->
-
-- [ ] I have read the **issue reporting section** in the [contributing guidelines](https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md), so I know how to submit a good bug report with the required information
-- [ ] I have verified that the **issue is not fixed and is reproducible** in the **[latest version](https://www.qbittorrent.org/download.php)**
-- [ ] (optional but recommended) I have verified that the **issue is not fixed and is reproducible** in the **[latest CI build](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci.yaml?query=branch%3Amaster+event%3Apush)**
-- [ ] I have **checked the [frequent/common issues list](https://github.com/qbittorrent/qBittorrent/projects/2)** and **searched** the issue tracker for similar bug reports (including closed ones) **to avoid posting a duplicate**
-- [ ] This report is **not a support request or question**, both of which are better suited for either the [discussions section](https://github.com/qbittorrent/qBittorrent/discussions), [forum](https://qbforums.shiki.hu/), or [subreddit](https://www.reddit.com/r/qBittorrent/). The [wiki](https://github.com/qbittorrent/qBittorrent/wiki) did not contain a suitable solution either
-- [ ] I have **pasted/attached the settings file and relevant log(s)** in the **Attachments** section at the bottom of the report. Mandatory: the settings file and at least the most recent log. See [this wiki page](https://github.com/qbittorrent/qBittorrent/wiki/Frequently-Asked-Questions#Where_does_qBittorrent_save_its_settings) if you're not sure where to find them.
-
-## Description
-
-<!--
-################################## IMPORTANT ##################################
-
-Delete each "(type here)" indicator and type your text in their place in the subsections below.
-You MUST fill in ALL subsections marked with "(type here)" with the appropriate information.
-
-Please make sure the description is worded well enough to be understood.
-Provide steps to reproduce the issue, any additional relevant information, suggested solution (if applicable) and as much context and examples as possible.
-For more information consult the Contributing Guidelines at https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md.
-
-Do not forget about the mandatory attachments!
-
-Use the Preview tab before posting to make sure your report looks like it is formatted properly.
-You don't need to delete these comments, they won't show up in the final post.
--->
-
-### qBittorrent info and operating system(s)
-
-<!--
-IMPORTANT:
-if you did not get the qBittorrent installer from the links in the official website
-or if you did not install it from the PPA, please mention that after the version
--->
-
-- qBittorrent version: (type here)
-- Operating system(s) where the issue occurs: (type here)
-
-### If on Linux, `libtorrent-rasterbar` and `Qt` versions
-
-- Qt: (type here)
-- libtorrent-rasterbar: (type here)
-
-### What is the problem
-
-(type here)
-
-### Detailed steps to reproduce the problem
-
-1. (type here)
-2. (type here)
-3. (etc.)
-
-### What is the expected behavior
-
-(type here)
-
-### Extra info (if any)
-
-(type here)
-
-## Attachments
-
-<!-- paste file contents here (or attach the files if they are big), do NOT link to external sites -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,20 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  -
-    about: "Consult the wiki first (especially the FAQ), it might already contain the information you are looking for"
-    name: Wiki
-    url: "https://github.com/qbittorrent/qBittorrent/wiki/"
-
-  -
-    about: "Please ask questions related to usage/setup/support/non-issue development discussion in the Discussions section"
-    name: Question
-    url: "https://github.com/qbittorrent/qBittorrent/discussions"
-
-  -
-    about: "Alternatively, ask on the official forum"
-    name: Question
-    url: "http://forum.qbittorrent.org/"
-  -
-    about: "Alternatively, use the subreddit"
-    name: Question
-    url: "https://www.reddit.com/r/qBittorrent/"

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,61 +0,0 @@
----
-name: Feature Request
-about: Suggest a new feature or enhancement for qBittorrent.
-title: ''
-labels: 'Feature request'
-assignees: ''
----
-
-# Feature request
-
-<!--
-###############################################################################
-  WARNING!
-  IGNORING THE INSTRUCTIONS IN THIS TEMPLATE WILL RESULT IN THE ISSUE BEING
-  CLOSED AS INCOMPLETE/INVALID
-###############################################################################
--->
-
-## Checklist
-
-<!--
-################################## IMPORTANT ##################################
-
-As you read and fulfill each of the following requirements below,
-put an "x" between the square brackets to mark each task as done, like so: [x]
--->
-
-- [ ] I have read the **feature request section** in the [contributing guidelines](https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md), so I know how to submit a good feature request with the required information
-- [ ] I have verified that the **feature** I am requesting is **not available** in the **[latest version](https://www.qbittorrent.org/download.php)**
-- [ ] (optional but recommended) I have verified that the **feature** I am requesting is **not available** in the **[latest CI build](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci.yaml?query=branch%3Amaster+event%3Apush)**
-- [ ] I have **checked the [frequent/common issues list](https://github.com/qbittorrent/qBittorrent/projects/2)** and **searched** the issue tracker for similar feature requests (including closed ones) **to avoid posting a duplicate**
-- [ ] This request is **not a support request or question**, both of which are better suited for either the [discussions section](https://github.com/qbittorrent/qBittorrent/discussions), [forum](https://qbforums.shiki.hu/), or [subreddit](https://www.reddit.com/r/qBittorrent/). The [wiki](https://github.com/qbittorrent/qBittorrent/wiki) did not contain a suitable solution either
-
-## Description
-
-<!--
-################################## IMPORTANT ##################################
-
-Delete each "(type here)" indicator and type your text in their place in the subsections below.
-You MUST fill in ALL subsections marked with "(type here)" with the appropriate information.
-
-Please make sure the description is worded well enough to be understood.
-Provide a detailed description of the feature and as much context and examples as necessary.
-If the feature request has to do with visual elements and the GUI, images/screenshots are always helpful.
-For more information consult the Contributing Guidelines at https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md.
-
-Use the Preview tab before posting to make sure your report looks like it is formatted properly.
-You don't need to delete these comments, they won't show up in the final post.
--->
-
-### Suggestion
-
-(type here)
-
-### Use case
-
-(type here)
-
-### Extra info/examples/attachments
-
-<!-- optional -->

.github/PULL_REQUEST_TEMPLATE/pull_request.md

@@ -1,16 +0,0 @@
-# Changes proposed in this pull request
-
-<!--
-IMPORTANT: an image is worth a thousand words.
-It is often a good idea to post screenshots showing the "before" and "after" your PR's changes,
-especially with changes related to the GUI, along with the textual description.
-Images makes it immediately clearer for others what your proposed changes are all about.
--->
-
-(type here)
-
-<!--
-OPTIONAL: if this PR directly addresses an issue, make sure to include a "Closes #XXXXX" statement at the end.
--->
-
-<!-- You don't need to delete these comments before posting, they won't show up in the post :) -->

.github/SUPPORT.md

@@ -1,18 +0,0 @@
-# Support Resources
-
-The issue tracker is only for bug reports/feature requests related to the project itself.
-
-Please do not use the issue tracker for questions about general program usage,
-how BitTorrent (the protocol) works in general, etc.
-
-For such questions, use one of the following community support resources:
-
-* The [discussions section][discussions-url]
-
-* The official forum [official forum][forum-url]
-
-* The [qBittorrent subreddit][subreddit-url]
-
-[discussions-url]: https://github.com/qbittorrent/qBittorrent/discussions
-[forum-url]: http://forum.qbittorrent.org/
-[subreddit-url]: https://www.reddit.com/r/qBittorrent/

.github/workflows/ci.yaml

@@ -1,254 +0,0 @@
-name: GitHub Actions CI
-
-# Cache is used for all Windows and macOS dependencies (size approx. 1230 * 2 + 1850 = 4310 MiB)
-# Cache is not used for Ubuntu builds, because it already has all dependencies except
-# the appropriate libtorrent version, which only takes 3-5 minutes to build from source anyway
-
-on: [pull_request, push]
-
-env:
-  VCPKG_COMMIT: 8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb
-  VCPKG_DEST_MACOS: /Users/runner/qbt_tools/vcpkg
-  VCPKG_DEST_WIN: C:\qbt_tools\vcpkg
-  LIBTORRENT_VERSION_TAG: v1.2.14
-
-jobs:
-
-  ci_ubuntu:
-    name: Ubuntu
-
-    strategy:
-      matrix:
-        os: [ubuntu-20.04]
-        qbt_gui: ["GUI=ON", "GUI=OFF"]
-      fail-fast: false
-
-    runs-on: ${{ matrix.os }}
-
-    defaults:
-      run:
-        shell: bash
-
-    steps:
-    - name: checkout repository
-      uses: actions/checkout@v2
-
-    - name: install all build dependencies except libtorrent from Ubuntu repos
-      run: |
-        sudo apt update
-        sudo apt install \
-          build-essential cmake git ninja-build pkg-config \
-          libssl-dev libgeoip-dev zlib1g-dev \
-          libboost-dev libboost-chrono-dev libboost-random-dev libboost-system-dev
-      # sudo apt install libqt5svg5-dev qtbase5-dev qttools5-dev # the Qt version in the standard repositories is too old...
-
-    # this will be installed under /opt/qt515. CMake will still find it automatically without additional hints
-    # to speed up the process, only the required components are installed rather than the full qt515-meta-full metapackage
-    - name: install Qt 5.15.2 from an external PPA
-      run: |
-        sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-focal
-        sudo apt install qt515base qt515svg qt515tools
-
-    - name: install libtorrent from source
-      run: |
-        git clone https://github.com/arvidn/libtorrent && cd libtorrent
-        git checkout ${{ env.LIBTORRENT_VERSION_TAG }}
-        cmake -B cmake-build-dir -G "Ninja" \
-          -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -Ddeprecated-functions=OFF \
-          --graphviz=cmake-build-dir/target_graph.dot
-        cmake --build cmake-build-dir
-        sudo cmake --install cmake-build-dir --prefix /usr/local
-
-    - name: build qBittorrent
-      run: |
-        cmake -B build -G "Ninja" \
-          -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -D${{ matrix.qbt_gui }} \
-          -DVERBOSE_CONFIGURE=ON \
-          --graphviz=build/target_graph.dot
-        cmake --build build
-
-    - name: install qBittorrent
-      run: sudo cmake --install build --prefix /usr/local
-
-    - name: upload artifact as zip
-      uses: actions/upload-artifact@v2
-      with:
-        name: qBittorrent-CI_${{ matrix.os }}-x64_${{ matrix.qbt_gui }}
-        path: |
-          build/compile_commands.json
-          build/install_manifest.txt
-          build/target_graph.dot
-          build/qbittorrent
-          build/qbittorrent-nox
-          libtorrent/cmake-build-dir/compile_commands.json
-          libtorrent/cmake-build-dir/target_graph.dot
-
-  ci_windows:
-    name: Windows + vcpkg
-
-    runs-on: windows-2019
-
-    defaults:
-      run:
-        shell: pwsh
-
-    steps:
-    - name: checkout repository
-      uses: actions/checkout@v2
-
-    # - ninja is needed for building qBittorrent (because it's preferable, not a hard requirement)
-    - name: install additional required packages with chocolatey
-      run: |
-        choco install ninja
-
-    - name: setup vcpkg (cached, if possible)
-      uses: lukka/run-vcpkg@v7
-      with:
-        vcpkgDirectory: ${{ env.VCPKG_DEST_WIN }}
-        vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
-        setupOnly: true
-
-    # Tell vcpkg to only build Release variants of the dependencies
-    - name: configure vcpkg triplet overlay for release builds only
-      run: |
-        New-Item -Path ${{ github.workspace }} -Name "triplets_overlay" -ItemType Directory
-        Copy-Item ${{ env.RUNVCPKG_VCPKG_ROOT }}/triplets/x64-windows-static.cmake `
-          ${{ github.workspace }}/triplets_overlay/x64-windows-static-release.cmake
-        Add-Content ${{ github.workspace }}/triplets_overlay/x64-windows-static-release.cmake `
-          -Value "set(VCPKG_BUILD_TYPE release)"
-
-    # clear buildtrees after each package installation to reduce disk space requirements
-    - name: install dependencies via vcpkg
-      run: |
-        $packages = `
-          "boost-circular-buffer:x64-windows-static-release",
-          "libtorrent:x64-windows-static-release",
-          "qt5-base:x64-windows-static-release",
-          "qt5-svg:x64-windows-static-release",
-          "qt5-tools:x64-windows-static-release",
-          "qt5-winextras:x64-windows-static-release"
-        ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe upgrade `
-            --overlay-triplets=${{ github.workspace }}/triplets_overlay `
-            --no-dry-run
-        foreach($package in $packages)
-        {
-          ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe install $package `
-            --overlay-triplets=${{ github.workspace }}/triplets_overlay `
-            --clean-after-build
-        }
-
-    # NOTE: this is necessary to correctly find and use cl.exe with the Ninja generator for now
-    - name: setup devcmd
-      uses: ilammy/msvc-dev-cmd@v1
-
-    - name: build qBittorrent
-      shell: cmd
-      run: |
-        cmake -B build -G "Ninja" ^
-          -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ^
-          -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_DEST_WIN }}\scripts\buildsystems\vcpkg.cmake ^
-          -DVCPKG_TARGET_TRIPLET=x64-windows-static-release ^
-          -DVERBOSE_CONFIGURE=ON ^
-          -DMSVC_RUNTIME_DYNAMIC=OFF ^
-          --graphviz=build\target_graph.dot
-        cmake --build build
-
-    - name: upload artifact as zip
-      uses: actions/upload-artifact@v2
-      with:
-        name: qBittorrent-CI_Windows-x64
-        path: |
-          build/compile_commands.json
-          build/target_graph.dot
-          build/qbittorrent.exe
-          build/qbittorrent.pdb
-          dist/windows/qt.conf
-
-  ci_macos:
-    name: macOS + vcpkg
-
-    strategy:
-      matrix:
-        qbt_gui: ["GUI=ON", "GUI=OFF"]
-      fail-fast: false
-
-    runs-on: macos-10.15
-
-    defaults:
-      run:
-        shell: pwsh
-
-    steps:
-    - name: checkout repository
-      uses: actions/checkout@v2
-
-    # - ninja is needed for building qBittorrent (because it's preferable, not a hard requirement)
-    # - automake is needed for the installation the vcpkg installation of fontconfig, a dependency of qt5-base
-    - name: install additional required packages with homebrew
-      shell: bash
-      run: |
-        brew install automake ninja
-
-    - name: setup vcpkg (cached, if possible)
-      uses: lukka/run-vcpkg@v7
-      with:
-        vcpkgDirectory: ${{ env.VCPKG_DEST_MACOS }}
-        vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
-        setupOnly: true
-
-    - name: configure vcpkg triplet overlay for release builds only
-      run: |
-        New-Item -Path ${{ github.workspace }} -Name "triplets_overlay" -ItemType Directory
-        Copy-Item ${{ env.RUNVCPKG_VCPKG_ROOT }}/triplets/x64-osx.cmake `
-          ${{ github.workspace }}/triplets_overlay/x64-osx-release.cmake
-        Add-Content ${{ github.workspace }}/triplets_overlay/x64-osx-release.cmake `
-          -Value "set(VCPKG_BUILD_TYPE release)","set(VCPKG_OSX_DEPLOYMENT_TARGET 10.15)"
-
-    # NOTE: Avoids a libtorrent ABI issue. See https://github.com/arvidn/libtorrent/issues/4965
-    - name: force AppleClang to compile libtorrent with the same C++ standard as qBittorrent
-      run: |
-        (Get-Content -path ${{ env.RUNVCPKG_VCPKG_ROOT }}/ports/libtorrent/portfile.cmake).Replace( `
-          '${FEATURE_OPTIONS}', '${FEATURE_OPTIONS} -DCMAKE_CXX_STANDARD=17') `
-          | Set-Content -Path ${{ env.RUNVCPKG_VCPKG_ROOT }}/ports/libtorrent/portfile.cmake
-
-    - name: install dependencies via vcpkg
-      run: |
-        $packages = `
-          "boost-circular-buffer:x64-osx-release",
-          "libtorrent:x64-osx-release",
-          "qt5-base:x64-osx-release",
-          "qt5-svg:x64-osx-release",
-          "qt5-tools:x64-osx-release",
-          "qt5-macextras:x64-osx-release"
-        ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg upgrade `
-            --overlay-triplets=${{ github.workspace }}/triplets_overlay `
-            --no-dry-run
-        foreach($package in $packages)
-        {
-          ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg install $package `
-            --overlay-triplets=${{ github.workspace }}/triplets_overlay `
-            --clean-after-build
-        }
-
-    - name: build qBittorrent
-      shell: bash
-      run: |
-        cmake -B build -G "Ninja" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_DEST_MACOS }}/scripts/buildsystems/vcpkg.cmake \
-          -DVCPKG_TARGET_TRIPLET=x64-osx-release \
-          -D${{ matrix.qbt_gui }} \
-          -DVERBOSE_CONFIGURE=ON \
-          --graphviz=build/target_graph.dot
-        cmake --build build
-
-    - name: upload artifact as zip
-      uses: actions/upload-artifact@v2
-      with:
-        name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}
-        path: |
-          build/compile_commands.json
-          build/target_graph.dot
-          build/qbittorrent.app
-          build/qbittorrent-nox.app

.github/workflows/file_health.sh

@@ -1,85 +0,0 @@
-#!/usr/bin/env zsh
-
-set -o nounset
-
-# Assumption: file names don't contain `:` (for the `cut` invocation).
-# Safe to assume, as such a character in a filename would cause trouble on Windows, a platform we support
-
-# any regression turn this non-zero
-regressions=0
-
-# exclusions (these are just grep extended regular expressions to match against paths relative to the root of the repository)
-exclusions_nonutf8='(.*(7z|gif|ic(ns|o)|png|qm|zip))'
-exclusions_bom='src/base/unicodestrings.h'
-exclusions_tw='(*.ts)|src/webui/www/private/scripts/lib/mootools-1.2-more.js'
-exclusions_trailing_newline='configure'
-exclusions_no_lf='(*.ts)|(.*svg)|compile_commands.json|src/webui/www/private/scripts/lib/mootools-1.2-(core-yc.js|more.js)'
-
-echo -e "\n*** Detect files not encoded in UTF-8 ***\n"
-
-find . -path ./build -prune -false -o -path ./.git -prune -false -o -type f -exec file --mime {} \; | sort \
-    | grep -v -e "charset=us-ascii" -e "charset=utf-8" | cut -d ":" -f 1 \
-    | grep -E -v -e "${exclusions_nonutf8}" \
-    | tee >(echo -e "--> Files not encoded in UTF-8: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
-    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
-regressions=$((regressions+$?))
-
-echo -e "\n*** Detect files encoded in UTF-8 with BOM ***\n"
-
-grep --exclude-dir={.git,build} -rIl $'\xEF\xBB\xBF' | sort \
-    | grep -E -v -e "${exclusions_bom}" \
-    | tee >(echo -e "--> Files encoded in UTF-8 with BOM: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
-    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
-regressions=$((regressions+$?))
-
-echo -e "\n*** Detect usage of CR byte ***\n"
-
-grep --exclude-dir={.git,build} -rIlU $'\x0D' | sort \
-    | tee >(echo -e "--> Usage of CR byte: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
-    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
-regressions=$((regressions+$?))
-
-echo -e "\n*** Detect trailing whitespace in lines ***\n"
-
-grep --exclude-dir={.git,build} -rIl "[[:blank:]]$" | sort \
-    | grep -E -v -e "${exclusions_tw}" \
-    | tee >(echo -e "--> Trailing whitespace in lines: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
-    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0';
-regressions=$((regressions+$?))
-
-echo -e "\n*** Detect too many trailing newlines ***\n"
-
-find . -path ./build -prune -false -o -path ./.git -prune -false -o -type f -exec file --mime {} \; | sort \
-    | grep -e "charset=us-ascii" -e "charset=utf-8" | cut -d ":" -f 1 \
-    | grep -E -v -e "${exclusions_trailing_newline}" \
-    | xargs -L1 -I my_input bash -c 'test "$(tail -q -c2 "my_input" | hexdump -C | grep "0a 0a")" && echo "my_input"' \
-    | tee >(echo -e "--> Too many trailing newlines: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
-    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
-regressions=$((regressions+$?))
-
-echo -e "\n*** Detect no trailing newline ***\n"
-
-find . -path ./build -prune -false -o -path ./.git -prune -false -o -type f -exec file --mime {} \; | sort \
-    | grep -e "charset=us-ascii" -e "charset=utf-8" |  cut -d ":" -f 1 \
-    | grep -E -v -e "${exclusions_no_lf}" \
-    | xargs -L1 -I my_input bash -c 'test "$(tail -q -c1 "my_input" | hexdump -C | grep "0a")" || echo "my_input"' \
-    | tee >(echo -e "--> No trailing newline: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
-    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
-regressions=$((regressions+$?))
-
-echo -e "\n*** Detect translation closing tag in new line ***\n"
-
-grep --exclude-dir={.git,build} -nri "^</translation>" | sort \
-    | cut -d ":" -f 1,2 \
-    | tee >(echo -e "--> Translation closing tag in new line: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
-    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
-regressions=$((regressions+$?))
-
-if [ "$regressions" -ne 0 ]; then
-    regressions=1
-    echo "\nFile health regressions found. Please fix them (or add them as exclusions)."
-else
-    echo "All OK, no file health regressions found."
-fi
-
-exit $regressions;

.github/workflows/file_health.yaml

@@ -1,22 +0,0 @@
-name: GitHub Actions file health check
-
-on: [pull_request, push]
-
-jobs:
-  check_file_health:
-    name: Check file health
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - name: checkout repository
-      uses: actions/checkout@v2
-
-    - name: install zsh
-      run: |
-        sudo apt update
-        sudo apt install zsh
-
-    - name: run check file health script
-      run: |
-        ./.github/workflows/file_health.sh

.github/workflows/webui_ci.yaml

@@ -1,31 +0,0 @@
-name: WebUI CI
-
-on: [pull_request, push]
-
-jobs:
-  check_webui:
-    name: Check WebUI
-    runs-on: ubuntu-20.04
-    defaults:
-      run:
-        working-directory: src/webui/www
-
-    steps:
-    - name: checkout repository
-      uses: actions/checkout@v2
-
-    - name: setup nodejs
-      uses: actions/setup-node@v2
-      with:
-        node-version: '14'
-
-    - name: install tools
-      run: npm install
-
-    - name: lint code
-      run: npm run lint
-
-    - name: format code
-      run: |
-        npm run format
-        git diff --exit-code

.gitignore

@@ -4,7 +4,6 @@ src/qbittorrent
 src/qbittorrent-nox
 src/release
 src/debug
-src/base/version.h
 CMakeLists.txt.user*
 qbittorrent.pro.user*
 conf.pri
@@ -38,9 +37,6 @@ src/icons/qbt-theme/build-icons/node_modules/
 src/icons/skin/build-icons/node_modules/
 src/icons/skin/build-icons/icons/*.png
 
-# CMake build directory
-build/
-
 # Web UI tools
 node_modules
 package-lock.json

.travis.yml

@@ -0,0 +1,233 @@
+language: cpp
+
+os:
+  - linux
+  - osx
+
+dist: xenial
+
+env:
+  matrix:
+    - libt_branch=RC_1_2 gui=true build_system=qmake
+    - libt_branch=RC_1_2 gui=false build_system=qmake
+    - libt_branch=RC_1_2 gui=true build_system=cmake
+    - libt_branch=RC_1_2 gui=false build_system=cmake
+    - libt_branch=RC_1_1 gui=true build_system=qmake
+    - libt_branch=RC_1_1 gui=false build_system=qmake
+    - libt_branch=RC_1_1 gui=true build_system=cmake
+    - libt_branch=RC_1_1 gui=false build_system=cmake
+  global:
+    - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
+    - coverity_branch: coverity_scan
+
+matrix:
+  allow_failures:
+    - env: libt_branch=RC_1_2 gui=true build_system=cmake
+    - env: libt_branch=RC_1_2 gui=false build_system=cmake
+    - env: libt_branch=RC_1_1 gui=true build_system=cmake
+    - env: libt_branch=RC_1_1 gui=false build_system=cmake
+
+branches:
+  except:
+    - search_encoding_windows
+    - v2_9_x
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change
+
+cache:
+  ccache: true
+  directories:
+    - $HOME/travis/deb
+    - $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: "make -j2"
+    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]
+      - libssl-dev
+      - libtorrent-rasterbar-dev
+      - [qt59base, qt59svg, qt59tools]
+      - 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
+
+  - 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"
+
+  # options for specific branches
+  - |
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      # setup virtual display for after_success target
+      if [ "$gui" = "true" ]; then export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi ;
+
+      # Qt 5.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 $gui
+  - echo $build_system
+  - echo $qmake_conf
+  - echo $cmake_conf
+
+install:
+  - |
+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      # dependencies
+      PATH="/usr/local/opt/ccache/libexec:$PATH"
+
+      brew update > /dev/null
+      brew install ccache colormake boost openssl qt zlib
+      brew link --force qt zlib
+
+      if [ "$build_system" = "cmake" ]; then
+        sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
+        sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins
+      fi
+    fi
+  - |
+    if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
+      export use_ccache=true
+      ccache -M 512M
+      ccache -V && ccache --show-stats && ccache --zero-stats
+    fi
+  - |
+    if [ "$libt_branch" = "RC_1_2" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      wget https://builds.shiki.hu/travis/deb/version
+      if ! cmp --quiet "version" "$HOME/travis/deb/version" ; then
+        echo "Cached files are different from server. Downloading new ones."
+        # First delete old files
+        rm -r "$HOME/travis/deb"
+        mkdir "$HOME/travis/deb"
+        cp "version" $HOME/travis/deb
+        cd "$HOME/travis/deb"
+        wget https://builds.shiki.hu/travis/deb/libtorrent-rasterbar-dev_1.2.x_amd64.deb
+        wget https://builds.shiki.hu/travis/deb/libtorrent-rasterbar10_1.2.x_amd64.deb
+      fi
+
+      sudo dpkg -i "$HOME/travis/deb/libtorrent-rasterbar-dev_1.2.x_amd64.deb" "$HOME/travis/deb/libtorrent-rasterbar10_1.2.x_amd64.deb"
+    fi
+  - |
+    if [ "$libt_branch" = "RC_1_1" ] && [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      wget https://builds.shiki.hu/travis/brew/1_1/version
+      if ! cmp --quiet "version" "$HOME/travis/brew/1_1/version" ; then
+        echo "Cached files are different from server. Downloading new ones."
+        # First delete old files
+        rm -r "$HOME/travis/brew/1_1"
+        mkdir "$HOME/travis/brew/1_1"
+        cp "version" $HOME/travis/brew/1_1
+        cd "$HOME/travis/brew/1_1"
+        wget https://builds.shiki.hu/travis/brew/1_1/libtorrent-rasterbar.rb
+        wget https://builds.shiki.hu/travis/brew/1_1/bd36a4b440aa138a88e375c1a3b672f1a1bc6606e7866fc3415b6b98fa49e771--libtorrent-rasterbar-1.1.13.high_sierra.bottle.tar.gz
+      fi
+      # Copy custom libtorrent bottle to homebrew's download cache so it can find and install it
+      # Also install our custom libtorrent formula by passing the local path to it
+      # These 2 files are restored from Travis' cache.
+      cp "$HOME/travis/brew/1_1/bd36a4b440aa138a88e375c1a3b672f1a1bc6606e7866fc3415b6b98fa49e771--libtorrent-rasterbar-1.1.13.high_sierra.bottle.tar.gz" "$(brew --cache)/downloads"
+      brew uninstall libtorrent-rasterbar
+      brew install "$HOME/travis/brew/1_1/libtorrent-rasterbar.rb"
+
+      # NOTE about the bottle name
+      # The part before the "--" characters is a sha256 hash of the string
+      # of the URL homebrew itself would use to download the bottle.
+      # In this case the URL is the following:
+      # http://127.0.0.1/libtorrent-rasterbar-1.1.13.high_sierra.bottle.tar.gz
+    fi
+  - |
+    if [ "$libt_branch" = "RC_1_2" ] && [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      wget https://builds.shiki.hu/travis/brew/version
+      if ! cmp --quiet "version" "$HOME/travis/brew/version" ; then
+        echo "Cached files are different from server. Downloading new ones."
+        # First delete old files
+        rm -r "$HOME/travis/brew"
+        mkdir "$HOME/travis/brew"
+        cp "version" $HOME/travis/brew
+        cd "$HOME/travis/brew"
+        wget https://builds.shiki.hu/travis/brew/libtorrent-rasterbar.rb
+        wget https://builds.shiki.hu/travis/brew/6e4eb13f70df35e8fc7ff41883fef3e5c7b535dd55c78cd2ce1eae3fb4288e21--libtorrent-rasterbar-1.2.0.high_sierra.bottle.tar.gz
+      fi
+      # Copy custom libtorrent bottle to homebrew's download cache so it can find and install it
+      # Also install our custom libtorrent formula by passing the local path to it
+      # These 2 files are restored from Travis' cache.
+      cp "$HOME/travis/brew/6e4eb13f70df35e8fc7ff41883fef3e5c7b535dd55c78cd2ce1eae3fb4288e21--libtorrent-rasterbar-1.2.0.high_sierra.bottle.tar.gz" "$(brew --cache)/downloads"
+      brew uninstall libtorrent-rasterbar
+      brew install "$HOME/travis/brew/libtorrent-rasterbar.rb"
+
+      # NOTE about the bottle name
+      # The part before the "--" characters is a sha256 hash of the string
+      # of the URL homebrew itself would use to download the bottle.
+      # In this case the URL is the following:
+      # http://127.0.0.1/libtorrent-rasterbar-1.2.0.high_sierra.bottle.tar.gz
+    fi
+
+script:
+  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # skip usual build when running coverity scan
+  - |
+    cd "$TRAVIS_BUILD_DIR"
+    if [ "$build_system" = "qmake" ]; then
+      # scan only as lupdate is prone to hang
+      lupdate -extensions c,cpp,h,hpp,ui ./
+      ./bootstrap.sh
+      ./configure $qmake_conf CXXFLAGS="$CXXFLAGS"
+    else
+      mkdir build && cd build
+      cmake $cmake_conf ../
+    fi
+  - make && make install
+
+after_success:
+  - 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
+      if [ "$build_system" = "qmake" ]; then
+        macdeployqt "$TRAVIS_BUILD_DIR/src/$qbt_exe.app"
+        cd "$TRAVIS_BUILD_DIR/src/$qbt_exe.app/Contents/MacOS"
+      else
+        cd "$qbt_path/$qbt_exe.app/Contents/MacOS"
+      fi
+    fi
+  - ./$qbt_exe --version
+
+after_script:
+  - if [ "$use_ccache" = true ]; then ccache --show-stats ; fi

AUTHORS

@@ -17,23 +17,19 @@ Contributors:
 * Nick Tiskov <daymansmail@gmail.com>
 
 Code from other projects:
-* files src/app/qtlocalpeer/*
+* files src/qtsingleapplication/* src/lineedit/*
   copyright: Nokia Corporation
-  license: mixed
+  license: LGPL
 
-* files src/gui/lineedit.*
-  copyright: Trolltech ASA <info@trolltech.com>
-  license: custom
+* files src/ico.cpp src/ico.h
+  copyright: Malte Starostik <malte@kde.org>
+  license: LGPL
 
 * files src/search_engine/socks.py
   copyright: Dan Haim <negativeiq@users.sourceforge.net>
   license: BSD
 
-* file src/app/stacktrace.h
-  copyright: Timo Bingmann from http://idlebox.net/
-  license: WTFPL v2.0
-
-* file src/app/stacktrace_win.h
+* file src/stacktrace_win.h
   copyright: Quassel Project
   license: GPLv2/3
 
@@ -66,7 +62,7 @@ Images Authors:
   copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
   license: GPLv2
 
-* file: src/icons/tabs.gif
+* file: src/icons/skin/tabs.gif
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
@@ -123,7 +119,7 @@ Translations authors:
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net), Stephanos Antaris (santaris@csd.auth.gr), sledgehammer999(hammered999@gmail.com) and Γιάννης Ανθυμίδης Evropi(Transifex)
   - Hebrew: David Deutsch (d.deffo@gmail.com)
-  - Hungarian: Majoros Péter
+  - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
   - Italian: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)
   - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)

CMakeLists.txt

@@ -1,64 +1,60 @@
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # Policies <= CMP0097 default to NEW
+cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
+message(AUTHOR_WARNING "If the build fails, please try the autotools/qmake method.")
 
-project(qBittorrent
-    DESCRIPTION "The qBittorrent BitTorrent client"
-    HOMEPAGE_URL "https://www.qbittorrent.org/"
-    LANGUAGES CXX
-)
-
-# use CONFIG mode first in find_package
-set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
-# version requirements - older vesions may work, but you are on your own
-set(minBoostVersion 1.65)
-set(minQtVersion 5.15.2)
-set(minOpenSSLVersion 1.1.1)
-set(minLibtorrentVersion 1.2.14)
-set(minZlibVersion 1.2.11)
-
-# features (some are platform-specific)
-include(CheckCXXSourceCompiles) # TODO: migrate to CheckSourceCompiles in CMake >= 3.19
-include(FeatureSummary)
-include(FeatureOptionsSetup)
-feature_option(STACKTRACE "Enable stacktraces" ON)
-feature_option(GUI "Build GUI application" ON)
-feature_option(WEBUI "Enables built-in HTTP server for headless use" ON)
-feature_option(VERBOSE_CONFIGURE "Show information about PACKAGES_FOUND and PACKAGES_NOT_FOUND in the configure output (only useful for debugging the CMake build scripts)" OFF)
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    feature_option_dependent(DBUS
-        "Enables support for notifications and power-management features on Linux via D-Bus"
-        ON "GUI" OFF
-    )
-    feature_option_dependent(SYSTEMD
-        "Install systemd service file to a directory manually overridable with Systemd_SERVICES_INSTALL_DIR"
-        OFF "NOT GUI" OFF
-    )
-    if (STACKTRACE)
-        check_cxx_source_compiles(
-            "#include <execinfo.h>
-            int main(){return 0;}"
-            QBITTORRENT_HAS_EXECINFO_H
-        )
-        if (NOT QBITTORRENT_HAS_EXECINFO_H)
-            message(FATAL_ERROR "execinfo.h header file not found.\n"
-                "Please either disable the STACKTRACE feature or use a libc that has this header file, such as glibc (GNU libc)."
-            )
-        endif()
-    endif()
-elseif (MSVC)
-    feature_option(MSVC_RUNTIME_DYNAMIC "Use MSVC dynamic runtime library (-MD) instead of static (-MT)" ON)
+if(POLICY CMP0074)
+    cmake_policy(SET CMP0074 NEW)
 endif()
 
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
+include(FunctionReadVersion)
+
+read_version("${CMAKE_CURRENT_SOURCE_DIR}/version.pri" VER_MAJOR VER_MINOR VER_BUGFIX VER_BUILD VER_STATUS)
+# message(STATUS "Project version is: ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD} (${VER_STATUS})")
+
+project(qBittorrent VERSION ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD})
+
+set(PROJECT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}")
+
+if (NOT VER_BUILD EQUAL 0)
+    set(PROJECT_VERSION "${PROJECT_VERSION}.${VER_BUILD}")
+endif()
+
+set(PROJECT_VERSION "${PROJECT_VERSION}${VER_STATUS}")
+
+add_definitions(-DQBT_VERSION_MAJOR=${VER_MAJOR})
+add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
+add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
+add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
+
+add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
+add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
+
 include(GNUInstallDirs)
+include(FeatureSummary)
+
+# version requirements
+set(requiredBoostVersion 1.40)
+set(requiredQtVersion 5.9.0)
+set(requiredOpensslVersion 1.0)
+set(requiredLibtorrentVersion 1.1.10)
+
+if(WIN32)
+    include(winconf)
+endif(WIN32)
+
+
+# we need options here, at the top level, because they are used not only in "src" subdir, but in the "dist" dir too
+include(CompileFeature)
+
+optional_compile_definitions(COUNTRIES_RESOLUTION FEATURE DESCRIPTION "Enable resolving peers IP addresses to countries"
+    DEFAULT ON DISABLED DISABLE_COUNTRIES_RESOLUTION)
+optional_compile_definitions(STACKTRACE FEATURE DESCRIPTION "Enable stacktraces"
+    DEFAULT ON ENABLED STACKTRACE)
+optional_compile_definitions(WEBUI FEATURE DESCRIPTION "Enables built-in HTTP server for headless use"
+    DEFAULT ON DISABLED DISABLE_WEBUI)
+
 add_subdirectory(src)
 add_subdirectory(dist)
 
-if (VERBOSE_CONFIGURE)
-    feature_summary(WHAT ALL)
-else()
-    feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES)
-endif()
-
-# Generate version header
-configure_file("src/base/version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/base/version.h" @ONLY)
+feature_summary(DESCRIPTION "\nConfiguration results:" WHAT ALL)

CODING_GUIDELINES.md

@@ -1,14 +1,12 @@
-# Coding Guidelines
-
-All new code **must** follow the following coding guidelines. \
-If you make changes in a file that still uses another coding style, make sure that you follow these guidelines for your changes. \
+All new code **must** follow the following coding guidelines.  
+If you make changes in a file that still uses another coding style, make sure that you follow these guidelines for your changes.  
 For programming languages other than C++ (e.g. JavaScript) used in this repository and submodules, unless otherwise specified, coding guidelines listed here applies as much as possible.
 
-**Note 1:** I will not take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style. \
-**Note 2:** You can use the `uncrustify` program/tool to clean up any source file. Use it with the `uncrustify.cfg` configuration file found in the root folder. \
+**Note 1:** I will not take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style.  
+**Note 2:** You can use the `uncrustify` program/tool to clean up any source file. Use it with the `uncrustify.cfg` configuration file found in the root folder.  
 **Note 3:** There is also a style for QtCreator but it doesn't cover all cases. In QtCreator `Tools->Options...->C++->Code Style->Import...` and choose the `codingStyleQtCreator.xml` file found in the root folder.  
 
-## Table Of Contents
+### Table Of Contents
 
 * [1. New lines & curly braces](#1-new-lines--curly-braces)
   * [a. Function blocks, class/struct definitions, namespaces](#a-function-blocks-classstruct-definitions-namespaces)
@@ -31,13 +29,11 @@ For programming languages other than C++ (e.g. JavaScript) used in this reposito
 * [9. Misc](#9-misc)
 * [10. Git commit message](#10-git-commit-message)
 * [11. Not covered above](#11-not-covered-above)
-
 ---
 
-## 1. New lines & curly braces
-
-### a. Function blocks, class/struct definitions, namespaces
+### 1. New lines & curly braces ###
 
+#### a. Function blocks, class/struct definitions, namespaces ####
 ```c++
 int myFunction(int a)
 {
@@ -47,7 +43,7 @@ int myFunction(int a)
 void myFunction() {} // empty body
 
 MyClass::MyClass(int *parent)
-    : m_parent {parent}
+    : m_parent(parent)
 {
     // initialize
 }
@@ -83,21 +79,17 @@ namespace Name
 }
 ```
 
-### b. Other code blocks
-
+#### b. Other code blocks ####
 ```c++
-if (condition)
-{
+if (condition) {
     // code
 }
 
-for (int a = 0; a < b; ++b)
-{
+for (int a = 0; a < b; ++b) {
     // code
 }
 
-switch (a)
-{
+switch (a) {
 case 1:
     // blah
 case 2:
@@ -105,25 +97,17 @@ case 2:
 default:
     // blah
 }
-
-{
-    // code
-}
 ```
 
-### c. Blocks in switch's case labels
-
+#### c. Blocks in switch's case labels ####
 ```c++
-switch (var)
-{
-case 1:
-    {
+switch (var) {
+case 1: {
         // declare local variables
         // code
     }
     break;
-case 2:
-    {
+case 2: {
         // declare local variables
         // code
     }
@@ -133,29 +117,22 @@ default:
 }
 ```
 
-### d. If-else statements
-
+#### d. If-else statements ####
 The `else if`/`else` must be on their own lines:
-
 ```c++
-if (condition)
-{
+if (condition) {
     // code
 }
-else if (condition)
-{
+else if (condition) {
     // code
 }
-else
-{
+else {
     // code
 }
 ```
 
-### e. Single statement if blocks
-
+#### e. Single statement if blocks ####
 Most single statement if blocks should look like this:
-
 ```c++
 if (condition)
     a = a + b;
@@ -164,23 +141,19 @@ if (condition)
 One acceptable exception to this can be `return`, `break` or `continue` statements,
 provided that the test condition isn't very long and its body statement occupies only one line.
 However you can still choose to use the first rule.
-
 ```c++
 if (a > 0) return;
 
-while (p)
-{
+while (p) {
     // ...
     if (!b) continue;
 }
 ```
 
-### f. Acceptable conditions to omit braces
-
+#### f. Acceptable conditions to omit braces ####
 When the conditional statement in `if`/`else` has only one line and its body occupy only one line,
-this also applies to loops statements. \
+this also applies to loops statements.  
 Notice that for a series of `if - else` branches, if one branch needs braces then all branches must add braces.
-
 ```c++
 if (a < b)  // conditional statement
     do(a);  // body
@@ -192,27 +165,21 @@ else if (a > b)
 else
     do(c);
 
-if (a < b)
-{
+if (a < b) {
     do(a);
 }
-else if (a > b)
-{
-    // curly braces required here, then all branches should also add them
+else if (a > b) {  // curly braces required here, then all branches should also add them
     do(b);
     do(d);
 }
-else
-{
+else {
     do(c);
 }
 ```
 
-### g. Brace enclosed initializers
-
-Unlike single-line functions, you must not insert spaces between the brackets and concluded expressions. \
+#### g. Brace enclosed initializers ####
+Unlike single-line functions, you must not insert spaces between the brackets and concluded expressions.<br/>
 But you must insert a space between the variable name and initializer.
-
 ```c++
 Class obj {}; // empty
 Class obj {expr};
@@ -220,33 +187,28 @@ Class obj {expr1, /*...,*/ exprN};
 QVariantMap map {{"key1", 5}, {"key2", 10}};
 ```
 
-## 2. Indentation
-
+### 2. Indentation ###
 4 spaces.
 
-## 3. File encoding and line endings
+### 3. File encoding and line endings ###
 
 UTF-8 and Unix-like line ending (LF). Unless some platform specific files need other encodings/line endings.
 
-## 4. Initialization lists
-
+### 4. Initialization lists ###
 Initialization lists should be vertical. This will allow for more easily readable diffs. The initialization colon should be indented and in its own line along with first argument. The rest of the arguments should be indented too and have the comma prepended.
-
 ```c++
 myClass::myClass(int a, int b, int c, int d)
-    : m_a {a}
-    , m_b {b}
-    , m_c {c}
-    , m_d {d}
+    : m_a(a)
+    , m_b(b)
+    , m_c(c)
+    , m_d(d)
 {
     // code
 }
 ```
 
-## 5. Enums
-
+### 5. Enums ###
 Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
-
 ```c++
 enum Days
 {
@@ -260,14 +222,11 @@ enum Days
 };
 ```
 
-## 6. Names
-
+### 6. Names ###
 All names should be camelCased.
 
-### a. Type names and namespaces
-
+#### a. Type names and namespaces ####
 Type names and namespaces start with Upper case letter (except POD types).
-
 ```c++
 class ClassName {};
 
@@ -282,18 +241,14 @@ namespace NamespaceName
 }
 ```
 
-### b. Variable names
-
+#### b. Variable names ####
 Variable names start with lower case letter.
-
 ```c++
 int myVar;
 ```
 
-### c. Private member variable names
-
+#### c. Private member variable names ####
 Private member variable names start with lower case letter and should have ```m_``` prefix.
-
 ```c++
 class MyClass
 {
@@ -301,26 +256,23 @@ class MyClass
 }
 ```
 
-## 7. Header inclusion order
-
+### 7. Header inclusion order ###
 The headers should be placed in the following group order:
+  1. Module header (in .cpp)
+  2. C++ Standard Library headers
+  3. System headers
+  4. Boost library headers
+  5. Libtorrent headers
+  6. Qt headers
+  7. qBittorrent's own headers, starting from the *base* headers.
 
-1. Module header (in .cpp)
-2. C++ Standard Library headers
-3. System headers
-4. Boost library headers
-5. Libtorrent headers
-6. Qt headers
-7. qBittorrent's own headers, starting from the *base* headers.
-
-The headers should be ordered alphabetically within each group. \
-If there are conditionals for the same header group, then put them at the bottom of the respective group. \
+The headers should be ordered alphabetically within each group.  
+If there are conditionals for the same header group, then put them at the bottom of the respective group.  
 If there are conditionals that contain headers from several different header groups, then put them above the "qBittorrent's own headers" group.
 
 One exception is the header containing the library version (for example, QtGlobal), this particular header isn't constrained by the aforementioned order.
 
 Example:
-
 ```c++
 // file: examplewidget.cpp
 
@@ -370,10 +322,8 @@ Example:
 #include "ui_examplewidget.h"
 ```
 
-## 8. Include guard
-
-`#pragma once` must be used instead of a "classic include guard":
-
+### 8. Include guard ###
+`#pragma once` should be used instead of "include guard" in new code:
 ```c++
 // examplewidget.h
 
@@ -388,77 +338,75 @@ class ExampleWidget : public QWidget
 
 ```
 
-## 9. Misc
+### 9. Misc ###
 
 * Line breaks for long lines with operation:
 
-  ```c++
-  a += "b"
+```c++
+a += "b"
   + "c"
   + "d";
-  ```
+```
 
 * **auto** keyword
 
-  We allow the use of the **auto** keyword only where it is strictly necessary (for example, to declare a lambda object, etc.), or where it **enhances** the readability of the code. \
-  Declarations for which one can gather enough information about the object interface (type) from its name or the usage pattern (an iterator or a loop variable are good examples of clear patterns) or the right part of the expression nicely fit here.
-
-  When weighing whether to use an auto-typed variable please think about potential reviewers of your code, who will read it as a plain diff (on github.com, for instance). \
-  Please make sure that such reviewers can understand the code completely and without excessive effort.
-
-  Some valid use cases:
-
-  * Container iteration and casts:
-
-    ```c++
-    template <typename List>
-    void doSomethingWithList(const List &list)
-    {
-        foreach (const auto &item, list)
-        {
+We allow the use of the **auto** keyword only where it is strictly necessary 
+(for example, to declare a lambda object, etc.), or where it **enhances** the readability of the code.
+Declarations for which one can gather enough information about the object interface (type) from its name 
+or the usage pattern (an iterator or a loop variable are good examples of clear patterns) 
+or the right part of the expression nicely fit here.<br/>
+<br/>
+When weighing whether to use an auto-typed variable please think about potential reviewers of your code, 
+who will read it as a plain diff (on github.com, for instance). Please make sure that such reviewers can 
+understand the code completely and without excessive effort.<br/>
+<br/>
+Some valid use cases:
+```c++
+template <typename List>
+void doSomethingWithList(const List &list)
+{
+    foreach (const auto &item, list) {
         // we don't know item type here so we use 'auto' keyword
         // do something with item
     }
-    }
+}
 
-    for (auto it = container.begin(), end = container.end(); it != end; ++it)
-    {
+for (auto it = container.begin(), end = container.end(); it != end; ++it) {
     // we don't need to know the exact iterator type,
     // because all iterators have the same interface
-    }
+}
 
-    auto spinBox = static_cast<QSpinBox*>(sender());
-    // we know the variable type based on the right-hand expression
-    ```
+auto spinBox = static_cast<QSpinBox*>(sender());
+// we know the variable type based on the right-hand expression
+```
 
-  * Notice the spaces in the following specific situations:
+* Notice the spaces in the following specific situations:
+```c++
+// Before and after the assignment and other binary (and ternary) operators there should be a space
+// There should not be a space between increment/decrement and its operand
+a += 20;
+a = (b <= MAX_B ? b : MAX_B);
+++a;
+--b;
 
-    ```c++
-    // Before and after the assignment and other binary (and ternary) operators there should be a space
-    // There should not be a space between increment/decrement and its operand
-    a += 20;
-    a = (b <= MAX_B ? b : MAX_B);
-    ++a;
-    --b;
-    for (int a = 0; a < b; ++b)
-    {
-    }
-    // Range-based for loop, spaces before and after the colon
-    for (auto i : container)
-    {
-    }
-    // Derived class, spaces before and after the colon
-    class Derived : public Base
-    {
-    };
-    ```
+for (int a = 0; a < b; ++b) {
+}
+
+// Range-based for loop, spaces before and after the colon
+for (auto i : container) {
+}
+
+// Derived class, spaces before and after the colon
+class Derived : public Base
+{
+};
+```
 
 * Prefer pre-increment, pre-decrement operators
-
-  ```c++
-  ++i, --j;  // Yes
-  i++, j--;  // No
-  ```
+```c++
+++i, --j;  // Yes
+i++, j--;  // No
+```
 
 * private/public/protected must not be indented
 
@@ -466,8 +414,7 @@ class ExampleWidget : public QWidget
 
 * Method definitions aren't allowed in header files
 
-## 10. Git commit message
-
+### 10. Git commit message ###
 1. Limit the subject line to 50 characters. Subject should contain only the very essence of the changes (you should avoid extra details and internals)
 2. Separate subject from body with a blank line
 3. Capitalize the subject line
@@ -477,7 +424,6 @@ class ExampleWidget : public QWidget
 7. Use the body to explain what and why vs. how
 8. If commit fixes a reported issue, mention it in the message body (e.g. `Closes #4134.`)
 
-## 11. Not covered above
-
-If something isn't covered above, just follow the same style the file you are editing has. \
+### 11. Not covered above ###
+If something isn't covered above, just follow the same style the file you are editing has.  
 *This guide is not exhaustive and the style for a particular piece of code not specified here will be determined by project members on code review.*

CONTRIBUTING.md

@@ -138,7 +138,7 @@ These are unstable/unsupported platforms, and in all likelihood, whatever the is
 *   **For performance-related issues**, include as much profiling data as you can (resource usage graphs, etc).
 
 *   Paste the **qBittorrent log** (or put the contents of the log in a gist and provide a link to the gist). The log can be viewed in the GUI (View -> Log -> tick all boxes). If you can't do that, the file is at:
-    -   Linux: `~/.local/share/qBittorrent/logs/qBittorrent.log`
+    -   Linux: `~/.local/share/data/qBittorrent/logs/qBittorrent.log`
     -   Windows: `%LocalAppData%\qBittorrent\logs`
     -   macOS: `~/Library/Application Support/qBittorrent/qBittorrent.log`
 

COPYING

@@ -1,6 +1,5 @@
-qBittorrent is licensed under the GNU General Public License either version 2,
-or (at your option) any later version with the addition of the following
-special exception:
+qBittorrent is licensed under the GNU General Public License version 2 with the
+addition of the following special exception:
 
 In addition, as a special exception, the copyright holders give permission to
 link this program with the OpenSSL project's "OpenSSL" library (or with
@@ -11,8 +10,6 @@ modify file(s), you may extend this exception to your version of the file(s),
 but you are not obligated to do so. If you do not wish to do so, delete this
 exception statement from your version.
 
-See also the AUTHORS file
-
 ----------
 
                     GNU GENERAL PUBLIC LICENSE

Changelog

@@ -1,60 +1,3 @@
-Unreleased - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.4.0
-    - FEATURE: Add support for creating v2 torrents(requires libtorrent 2.0.x) (Chocobo1)
-    - FEATURE: Expose libtorrent hashing_threads settings (Anton Bershanskiy)
-
-Sun Oct 18 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.0
-    - FEATURE: Many UI elements colors are themeable now (jagannatharjun)
-    - FEATURE: Allow changing GUI icons from theme bundles (jagannatharjun)
-    - FEATURE: Notify user when torrent moving finished (glassez)
-    - FEATURE: Shortcut CTRL + I opens Statistics window (LoopsGod)
-    - FEATURE: Add RSS functionality in Web UI (Sepro)
-    - FEATURE: Drop ".unwanted folder" feature (glassez)
-    - FEATURE: Expose libtorrent peer_turnover, max_concurrent_http_announces, no_connect_privileged_ports settings (Sophist, an0n666, NotTsunami)
-    - BUGFIX: Fix typo in Options dialog (Andrei Stepanov)
-    - BUGFIX: Remove "requires restart" from network interface settings (an0n666)
-    - BUGFIX: Rename "Create subfolder" to "Keep top-level folder" (thalieht)
-    - BUGFIX: Show tooltip for some properties in transfer list (Nick Korotysh)
-    - BUGFIX: Fix calculation of torrent current state (glassez)
-    - BUGFIX: Improve detecting completed files when adding, rechecking or moving a torrent (glassez)
-    - BUGFIX: Fixed broken announce logic in embedded tracker causing failures in some cases (FranciscoPombal)
-    - BUGFIX: Disable checkbox if torrent doesn't have root folder (thalieht)
-    - BUGFIX: Update country flag icons with upstream (Chocobo1)
-    - BUGFIX: Private torrent: If tracker entry is edited clear old peer list. Also don't allow user to manually add peers. (an0n666)
-    - BUGFIX: Fix large strings not visible in log widget (jagannatharjun)
-    - BUGFIX: Disable edit action in Peer list widget (Chocobo1)
-    - BUGFIX: Add a scroll area to torrent creator dialog (Ernesto Castellotti)
-    - BUGFIX: Content tab: Open double-clicked folder regardless on which column the click happens (Chocobo1)
-    - BUGFIX: "Open containing folder" on a folder now opens it in its parent folder (Chocobo1)
-    - BUGFIX: Fix GeoDB download in systems with non-C locales (FranciscoPombal)
-    - BUGFIX: Fix peer blocked message (FranciscoPombal)
-    - BUGFIX: Make more robust the banning of selected peers from the list (NotTsunami)
-    - BUGFIX: Use toned green color for downloading pieces in Pieces bar (jagannatharjun)
-    - BUGFIX: Correctly fill whole width of speed graph (jagannatharjun)
-    - BUGFIX: Fix impossible speed in speed graph (jagannatharjun)
-    - WEBUI: Hide additional search filters on small screens (Thomas Piccirello)
-    - WEBUI: Shrink search bar on small screens (Thomas Piccirello)
-    - WEBUI: Fix search categories only working in English (Thomas Piccirello)
-    - WEBUI: Add Trackers section to sidebar (Thomas Piccirello)
-    - WEBUI: Fix Enter button behavior in textarea (Tom Piccirello)
-    - WEBUI: Fix wrong file renaming selection range (MR)
-    - WEBUI: Preselect "Default save path" in watched folders (thalieht)
-    - WEBUI: Fix banning peers (brvphoenix)
-    - WEBUI: Fix seeding time checkbox placement (Chocobo1)
-    - WEBUI: Bump Web API version (Thomas Piccirello)
-    - RSS: Fix renaming RSS autodownload rule (glassez)
-    - RSS: Fix RSS article is not marked as "read" when torrent is downloaded (glassez)
-    - SEARCH: Update minimum Python version to 3.5.0 (ngosang)
-    - SEARCH: Make middle-click close search tabs (Will Da Silva)
-    - WINDOWS: NSIS: Update Dutch translation (Thomas De Rocker)
-    - WINDOWS: NSIS: Change the installers uninstallation question to clear confusion (an0n666)
-    - LINUX: Fix typo in systemd service file (Shane Allgeier)
-    - LINUX: Don't use HTML in tray tooltip (thalieht)
-    - LINUX: Don't create 'data' subdirectory in XDG_DATA_HOME (lbilli)
-    - LINUX/MACOS: Add HTTPS tracker certificate validation option (NotTsunami)
-    - OTHER: Many CMake improvements (FranciscoPombal)
-    - OTHER: Support for libtorrent 1.1.x is dropped (Chocobo1)
-    - OTHER: Many code cleanups and improvements (FranciscoPombal, Chocobo1, glassez)
-
 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)
@@ -86,7 +29,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - 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: Improve DownloadManager code (glassez)
+    - 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)
@@ -317,10 +260,10 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - BUGFIX: Restore torrent in two steps (glassez)
     - BUGFIX: Improve scaling of speed graphs (dzmat)
     - BUGFIX: Add isNetworkFileSystem() detection on Windows. This allows network mounts to be monitored correctly by polling timer. (Chocobo1)
-    - BUGFIX: Reduce horizontal graphs resolution. Improves performance. (dzmat)
+    - BUGFIX: Reduce horizontal graphs resolution. Improves perfomance. (dzmat)
     - BUGFIX: Don't recheck just checked torrent (mj-p, glassez)
     - BUGFIX: Add SMB2 magic number (Chocobo1)
-    - BUGFIX: Restore startup performance to v4.1.2 times. Needs at least libtorrent 1.1.10 (sledgehammer999)
+    - BUGFIX: Restore startup perfomance to v4.1.2 times. Needs at least libtorrent 1.1.10 (sledgehammer999)
     - BUGFIX: Make strings actually translatable (sledgehammer999)
     - WEBUI: Handle downloading .torrent file as success (Tom Piccirello)
     - WEBUI: Fix Alternative Web UI to be available (glassez)
@@ -391,7 +334,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - BUGFIX: Improve torrent initialization (glassez)
     - BUGFIX: Save resume data on torrent change events (glassez)
     - BUGFIX: Increase default resume data save interval (Chocobo1)
-    - BUGFIX: Work around crash when processing recursive download. Closes #9086 (Chocobo1)
+    - BUGFIX: Work around crash when procesing recursive download. Closes #9086 (Chocobo1)
     - BUGFIX: Reduce queries to python version (Chocobo1)
     - BUGFIX: Disable certain mouse wheel events in Options dialog (Chocobo1)
     - WEBUI: Send all rechecks in one request (Thomas Piccirello)
@@ -878,7 +821,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - COSMETIC: Change RSS view layout to horizontal. Closes #5920. (Chocobo1)
     - OSX: Fix crash on exit using Qt4. (Yez Ezey)
     - OSX: Change QSettings to IniFormat on macOS. Closes #5770 #5808. (Yez Ezey)
-    - LINUX: Workaround a Qt5 bug which results in a flood of network interface change signals. (Eugene Shalygin)
+    - LINUX: Workaround a Qt5 bug which results in a flood of network interface change singals. (Eugene Shalygin)
     - OTHER: Turkish translation for installer. (Burak Yavuz)
     - OTHER: Update portugueseBR for installer. (DaRKSoM)
     - OTHER: Update portuguese for installer. (EdwardLinux)
@@ -2225,7 +2168,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - FEATURE: Added "Unread" item to RSS feed list to display all unread news
     - FEATURE: If a torrent contains a torrent file, process downloaded torrent file too
     - FEATURE: A random listening port can be chosen automatically
-    - BUGFIX: torrent resume code rewritten
+    - BUGFIX: torrent resume code rewrited
     - BUGFIX: Fixed uTorrent spoofing code
     - BUGFIX: Greatly improved column sorting code
     - BUGFIX: Possibility to create trackerless torrents

INSTALL

@@ -3,27 +3,23 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
 1) Install these dependencies:
 
-  - Boost >= 1.65
+  - Boost >= 1.40
 
-  - libtorrent-rasterbar >= 1.2.14 (by Arvid Norberg)
+  - 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.1.1
+  - OpenSSL >= 1.0
 
-  - Qt >= 5.15.2
+  - Qt >= 5.9.0
 
-  - zlib >= 1.2.11
+  - zlib >= 1.2.5.2
 
-  - pkg-config (compile-time only on *nix systems)
+  - pkg-config (compile-time only)
 
-  - Python >= 3.5.0 (optional, runtime only)
+  - Python >= 2.7.9 / 3.3.0 (optional, runtime only)
       * Required by the internal search engine
 
-Dependency version numbers are bumped every once in a while to keep the range of properly tested configurations manageable, even if not strictly required to build.
-You may be able to build with older versions of (some of) the dependencies other than the minimum versions specified in the build scripts, but support for such builds is not provided - you are on your own.
-Please ensure you are building with an officially supported configuration when reporting bugs.
-
 2a) Compile and install qBittorrent with Qt graphical interface
 
   $ ./configure

README.md

@@ -1,8 +1,8 @@
 qBittorrent - A BitTorrent client in Qt
 ------------------------------------------
 
+[![TravisCI Status](https://travis-ci.org/qbittorrent/qBittorrent.svg?branch=master)](https://travis-ci.org/qbittorrent/qBittorrent)
 [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/qbittorrent/qBittorrent?branch=master&svg=true)](https://ci.appveyor.com/project/qbittorrent/qBittorrent)
-[![GitHub Actions CI Status](https://github.com/qbittorrent/qBittorrent/workflows/GitHub%20Actions%20CI/badge.svg)](https://github.com/qbittorrent/qBittorrent/actions)
 [![Coverity Status](https://scan.coverity.com/projects/5494/badge.svg)](https://scan.coverity.com/projects/5494)
 ********************************
 ### Description:
@@ -13,7 +13,8 @@ It aims to be a good alternative to all other bittorrent clients
 out there. qBittorrent is fast, stable and provides unicode
 support as well as many features.
 
-The free [IP to Country Lite database](https://db-ip.com/db/download/ip-to-country-lite) by [DB-IP](https://db-ip.com/) is used for resolving the countries of peers. The database is licensed under the [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/).
+This product includes GeoLite data created by MaxMind, available from
+https://www.maxmind.com/
 
 ### Installation:
 For installation, follow the instructions from INSTALL file, but simple:

TODO

@@ -1 +1,2 @@
 See https://blueprints.launchpad.net/qbittorrent/
+

build_dist.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# get version numbers
-versionSrc="src/base/version.h.in"
-versionMajor="$(grep -Po '(?<=QBT_VERSION_MAJOR )\d+' "$versionSrc")"
-versionMinor="$(grep -Po '(?<=QBT_VERSION_MINOR )\d+' "$versionSrc")"
-versionBugfix="$(grep -Po '(?<=QBT_VERSION_BUGFIX )\d+' "$versionSrc")"
-versionBuild="$(grep -Po '(?<=QBT_VERSION_BUILD )\d+' "$versionSrc")"
-versionStatus="$(grep -Po '(?<=QBT_VERSION_STATUS ")\w+' "$versionSrc")"
-
-if [ "$versionBuild" != "0" ]; then
-    projectVersion="$versionMajor.$versionMinor.$versionBugfix.$versionBuild$versionStatus"
-else
-    projectVersion="$versionMajor.$versionMinor.$versionBugfix$versionStatus"
-fi
-
-# pack archives
-git archive --format=tar --prefix="qbittorrent-$projectVersion/" HEAD | gzip -9 > "qbittorrent-$projectVersion.tar.gz"
-git archive --format=tar --prefix="qbittorrent-$projectVersion/" HEAD | xz -9 > "qbittorrent-$projectVersion.tar.xz"

cmake/Modules/CompileFeature.cmake

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

cmake/Modules/DeployQt5.cmake

@@ -0,0 +1,355 @@
+# Borrowed from Avogadro project (https://github.com/OpenChemistry/avogadroapp)
+
+#.rst:
+# DeployQt5
+# ---------
+#
+# Functions to help assemble a standalone Qt5 executable.
+#
+# A collection of CMake utility functions useful for deploying Qt5
+# executables.
+#
+# The following functions are provided by this module:
+#
+# ::
+#
+#    write_qt5_conf
+#    resolve_qt5_paths
+#    fixup_qt5_executable
+#    install_qt5_plugin_path
+#    install_qt5_plugin
+#    install_qt5_executable
+#
+# Requires CMake 2.8.9 or greater because Qt 5 does.
+# Also depends on BundleUtilities.cmake.
+#
+# ::
+#
+#   WRITE_QT5_CONF(<qt_conf_dir> <qt_conf_contents>)
+#
+# Writes a qt.conf file with the <qt_conf_contents> into <qt_conf_dir>.
+#
+# ::
+#
+#   RESOLVE_QT5_PATHS(<paths_var> [<executable_path>])
+#
+# Loop through <paths_var> list and if any don't exist resolve them
+# relative to the <executable_path> (if supplied) or the
+# CMAKE_INSTALL_PREFIX.
+#
+# ::
+#
+#   FIXUP_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf>])
+#
+# Copies Qt plugins, writes a Qt configuration file (if needed) and
+# fixes up a Qt5 executable using BundleUtilities so it is standalone
+# and can be drag-and-drop copied to another machine as long as all of
+# the system libraries are compatible.
+#
+# <executable> should point to the executable to be fixed-up.
+#
+# <qtplugins> should contain a list of the names or paths of any Qt
+# plugins to be installed.
+#
+# <libs> will be passed to BundleUtilities and should be a list of any
+# already installed plugins, libraries or executables to also be
+# fixed-up.
+#
+# <dirs> will be passed to BundleUtilities and should contain and
+# directories to be searched to find library dependencies.
+#
+# <plugins_dir> allows an custom plugins directory to be used.
+#
+# <request_qt_conf> will force a qt.conf file to be written even if not
+# needed.
+#
+# ::
+#
+#   INSTALL_QT5_PLUGIN_PATH(plugin executable copy installed_plugin_path_var <plugins_dir> <component> <configurations>)
+#
+# Install (or copy) a resolved <plugin> to the default plugins directory
+# (or <plugins_dir>) relative to <executable> and store the result in
+# <installed_plugin_path_var>.
+#
+# If <copy> is set to TRUE then the plugins will be copied rather than
+# installed.  This is to allow this module to be used at CMake time
+# rather than install time.
+#
+# If <component> is set then anything installed will use this COMPONENT.
+#
+# ::
+#
+#   INSTALL_QT5_PLUGIN(plugin executable copy installed_plugin_path_var <plugins_dir> <component>)
+#
+# Install (or copy) an unresolved <plugin> to the default plugins
+# directory (or <plugins_dir>) relative to <executable> and store the
+# result in <installed_plugin_path_var>.  See documentation of
+# INSTALL_QT5_PLUGIN_PATH.
+#
+# ::
+#
+#   INSTALL_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf> <component>])
+#
+# Installs Qt plugins, writes a Qt configuration file (if needed) and
+# fixes up a Qt5 executable using BundleUtilities so it is standalone
+# and can be drag-and-drop copied to another machine as long as all of
+# the system libraries are compatible.  The executable will be fixed-up
+# at install time.  <component> is the COMPONENT used for bundle fixup
+# and plugin installation.  See documentation of FIXUP_QT5_BUNDLE.
+
+#=============================================================================
+# Copyright 2011 Mike McQuaid <mike@mikemcquaid.com>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# The functions defined in this file depend on the fixup_bundle function
+# (and others) found in BundleUtilities.cmake
+
+include(BundleUtilities)
+set(DeployQt5_cmake_dir "${CMAKE_CURRENT_LIST_DIR}")
+set(DeployQt5_apple_plugins_dir "PlugIns")
+
+function(write_qt5_conf qt_conf_dir qt_conf_contents)
+  set(qt_conf_path "${qt_conf_dir}/qt.conf")
+  message(STATUS "Writing ${qt_conf_path}")
+  file(WRITE "${qt_conf_path}" "${qt_conf_contents}")
+endfunction()
+
+function(resolve_qt5_paths paths_var)
+  set(executable_path ${ARGV1})
+
+  set(paths_resolved)
+  foreach(path ${${paths_var}})
+    if(EXISTS "${path}")
+      list(APPEND paths_resolved "${path}")
+    else()
+      if(${executable_path})
+        list(APPEND paths_resolved "${executable_path}/${path}")
+      else()
+        list(APPEND paths_resolved "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${path}")
+      endif()
+    endif()
+  endforeach()
+  set(${paths_var} ${paths_resolved} PARENT_SCOPE)
+endfunction()
+
+function(fixup_qt5_executable executable)
+  set(qtplugins ${ARGV1})
+  set(libs ${ARGV2})
+  set(dirs ${ARGV3})
+  set(plugins_dir ${ARGV4})
+  set(request_qt_conf ${ARGV5})
+
+  message(STATUS "fixup_qt5_executable")
+  message(STATUS "  executable='${executable}'")
+  message(STATUS "  qtplugins='${qtplugins}'")
+  message(STATUS "  libs='${libs}'")
+  message(STATUS "  dirs='${dirs}'")
+  message(STATUS "  plugins_dir='${plugins_dir}'")
+  message(STATUS "  request_qt_conf='${request_qt_conf}'")
+
+  if(QT_LIBRARY_DIR)
+    list(APPEND dirs "${QT_LIBRARY_DIR}")
+  endif()
+  if(QT_BINARY_DIR)
+    list(APPEND dirs "${QT_BINARY_DIR}")
+  endif()
+
+  if(APPLE)
+    set(qt_conf_dir "${executable}/Contents/Resources")
+    set(executable_path "${executable}")
+    set(write_qt_conf TRUE)
+    if(NOT plugins_dir)
+      set(plugins_dir "${DeployQt5_apple_plugins_dir}")
+    endif()
+  else()
+    get_filename_component(executable_path "${executable}" PATH)
+    if(NOT executable_path)
+      set(executable_path ".")
+    endif()
+    set(qt_conf_dir "${executable_path}")
+    set(write_qt_conf ${request_qt_conf})
+  endif()
+
+  foreach(plugin ${qtplugins})
+    set(installed_plugin_path "")
+    install_qt5_plugin("${plugin}" "${executable}" 1 installed_plugin_path)
+    list(APPEND libs ${installed_plugin_path})
+  endforeach()
+
+  foreach(lib ${libs})
+    if(NOT EXISTS "${lib}")
+      message(FATAL_ERROR "Library does not exist: ${lib}")
+    endif()
+  endforeach()
+
+  resolve_qt5_paths(libs "${executable_path}")
+
+  if(write_qt_conf)
+    set(qt_conf_contents "[Paths]\nPlugins = ${plugins_dir}")
+    write_qt5_conf("${qt_conf_dir}" "${qt_conf_contents}")
+  endif()
+
+  fixup_bundle("${executable}" "${libs}" "${dirs}")
+endfunction()
+
+function(install_qt5_plugin_path plugin executable copy installed_plugin_path_var)
+  set(plugins_dir ${ARGV4})
+  set(component ${ARGV5})
+  set(configurations ${ARGV6})
+  if(EXISTS "${plugin}")
+    if(APPLE)
+      if(NOT plugins_dir)
+        set(plugins_dir "${DeployQt5_apple_plugins_dir}")
+      endif()
+      set(plugins_path "${executable}/Contents/${plugins_dir}")
+    else()
+      get_filename_component(plugins_path "${executable}" PATH)
+      if(NOT plugins_path)
+        set(plugins_path ".")
+      endif()
+      if(plugins_dir)
+        set(plugins_path "${plugins_path}/${plugins_dir}")
+      endif()
+    endif()
+
+    set(plugin_group "")
+
+    get_filename_component(plugin_path "${plugin}" PATH)
+    get_filename_component(plugin_parent_path "${plugin_path}" PATH)
+    get_filename_component(plugin_parent_dir_name "${plugin_parent_path}" NAME)
+    get_filename_component(plugin_name "${plugin}" NAME)
+    string(TOLOWER "${plugin_parent_dir_name}" plugin_parent_dir_name)
+
+    if("${plugin_parent_dir_name}" STREQUAL "plugins")
+      get_filename_component(plugin_group "${plugin_path}" NAME)
+      set(${plugin_group_var} "${plugin_group}")
+    endif()
+    set(plugins_path "${plugins_path}/${plugin_group}")
+
+    if(${copy})
+      file(MAKE_DIRECTORY "${plugins_path}")
+      file(COPY "${plugin}" DESTINATION "${plugins_path}")
+    else()
+      if(configurations AND (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE))
+        set(configurations CONFIGURATIONS ${configurations})
+      else()
+        unset(configurations)
+      endif()
+      install(FILES "${plugin}" DESTINATION "${plugins_path}" ${configurations} ${component})
+    endif()
+    set(${installed_plugin_path_var} "${plugins_path}/${plugin_name}" PARENT_SCOPE)
+  endif()
+endfunction()
+
+function(install_qt5_plugin plugin executable copy installed_plugin_path_var)
+  set(plugins_dir ${ARGV4})
+  set(component ${ARGV5})
+  if(EXISTS "${plugin}")
+    install_qt5_plugin_path("${plugin}" "${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}" "${component}")
+  else()
+    string(TOUPPER "QT_${plugin}_PLUGIN" plugin_var)
+    set(plugin_release_var "${plugin_var}_RELEASE")
+    set(plugin_debug_var "${plugin_var}_DEBUG")
+    set(plugin_release "${${plugin_release_var}}")
+    set(plugin_debug "${${plugin_debug_var}}")
+    if(DEFINED "${plugin_release_var}" AND DEFINED "${plugin_debug_var}" AND NOT EXISTS "${plugin_release}" AND NOT EXISTS "${plugin_debug}")
+      message(WARNING "Qt plugin \"${plugin}\" not recognized or found.")
+    endif()
+    if(NOT EXISTS "${${plugin_debug_var}}")
+      set(plugin_debug "${plugin_release}")
+    endif()
+
+    if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+      install_qt5_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}_release" "${plugins_dir}" "${component}" "Release|RelWithDebInfo|MinSizeRel")
+      install_qt5_plugin_path("${plugin_debug}" "${executable}" "${copy}" "${installed_plugin_path_var}_debug" "${plugins_dir}" "${component}" "Debug")
+
+      if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
+        set(${installed_plugin_path_var} ${${installed_plugin_path_var}_debug})
+      else()
+        set(${installed_plugin_path_var} ${${installed_plugin_path_var}_release})
+      endif()
+    else()
+      install_qt5_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}" "${component}")
+    endif()
+  endif()
+  set(${installed_plugin_path_var} ${${installed_plugin_path_var}} PARENT_SCOPE)
+endfunction()
+
+function(install_qt5_executable executable)
+  set(qtplugins ${ARGV1})
+  set(libs ${ARGV2})
+  set(dirs ${ARGV3})
+  set(plugins_dir ${ARGV4})
+  set(request_qt_conf ${ARGV5})
+  set(component ${ARGV6})
+  if(QT_LIBRARY_DIR)
+    list(APPEND dirs "${QT_LIBRARY_DIR}")
+  endif()
+  if(QT_BINARY_DIR)
+    list(APPEND dirs "${QT_BINARY_DIR}")
+  endif()
+  if(TARGET Qt5::Core)
+    get_property(_locCore TARGET Qt5::Core PROPERTY LOCATION_RELEASE)
+    get_filename_component(_loc ${_locCore} DIRECTORY)
+    message(STATUS "Adding Qt 5 directory: ${_loc}")
+    list(APPEND dirs "${_loc}")
+  else()
+    message(FATAL_ERROR "No Qt5::Core target found, ensure it is available")
+  endif()
+  if(component)
+    set(component COMPONENT ${component})
+  else()
+    unset(component)
+  endif()
+
+  get_filename_component(executable_absolute "${executable}" ABSOLUTE)
+  if(EXISTS "${QT_QTCORE_LIBRARY_RELEASE}")
+    gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_RELEASE}" qtcore_type)
+  elseif(EXISTS "${QT_QTCORE_LIBRARY_DEBUG}")
+    gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_DEBUG}" qtcore_type)
+  endif()
+  if(qtcore_type STREQUAL "system")
+    set(qt_plugins_dir "")
+  endif()
+
+  if(QT_IS_STATIC)
+    message(WARNING "Qt built statically: not installing plugins.")
+  else()
+    if(APPLE)
+      get_property(loc TARGET Qt5::QCocoaIntegrationPlugin
+        PROPERTY LOCATION_RELEASE)
+      install_qt5_plugin("${loc}" "${executable}" 0 installed_plugin_paths
+        "PlugIns" "${component}")
+      list(APPEND libs ${installed_plugin_paths})
+    elseif(WIN32)
+      get_property(loc TARGET Qt5::QWindowsIntegrationPlugin
+        PROPERTY LOCATION_RELEASE)
+      install_qt5_plugin("${loc}" "${executable}" 0 installed_plugin_paths
+        "" "${component}")
+      list(APPEND libs ${installed_plugin_paths})
+    endif()
+    foreach(plugin ${qtplugins})
+      set(installed_plugin_paths "")
+      install_qt5_plugin("${plugin}" "${executable}" 0 installed_plugin_paths "${plugins_dir}" "${component}")
+      list(APPEND libs ${installed_plugin_paths})
+    endforeach()
+  endif()
+
+  resolve_qt5_paths(libs "")
+
+  install(CODE
+  "include(\"${DeployQt5_cmake_dir}/DeployQt5.cmake\")
+  set(BU_CHMOD_BUNDLE_ITEMS TRUE)
+  fixup_qt5_executable(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${executable}\" \"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")"
+    ${component}
+    )
+endfunction()

cmake/Modules/FeatureOptionsSetup.cmake

@@ -1,14 +0,0 @@
-# Helper functions for coupling add_feature_info() or CMAKE_DEPENDENT_OPTION() and option()
-
-function(feature_option _name _description _default)
-    string(CONCAT _desc "${_description} (default: ${_default})")
-    option("${_name}" "${_desc}" "${_default}")
-    add_feature_info("${_name}" "${_name}" "${_desc}")
-endfunction()
-
-include(CMakeDependentOption)
-function(feature_option_dependent _name _description _default_opt _dependency _default_dep_not_sat)
-    string(CONCAT _desc "${_description} (default: ${_default_opt}; depends on condition: ${_dependency})")
-    CMAKE_DEPENDENT_OPTION("${_name}" "${_desc}" "${_default_opt}" "${_dependency}" "${_default_dep_not_sat}")
-    add_feature_info("${_name}" "${_name}" "${_desc}")
-endfunction()

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -0,0 +1,129 @@
+# - Try to find libtorrent-rasterbar
+#
+# If not using pkg-config, you can pre-set LibtorrentRasterbar_CUSTOM_DEFINITIONS
+# for definitions unrelated to Boost's separate compilation (which are already
+# decided by the LibtorrentRasterbar_USE_STATIC_LIBS variable).
+#
+# Once done this will define
+#  LibtorrentRasterbar_FOUND - System has libtorrent-rasterbar
+#  LibtorrentRasterbar_INCLUDE_DIRS - The libtorrent-rasterbar include directories
+#  LibtorrentRasterbar_LIBRARIES - The libraries needed to use libtorrent-rasterbar
+#  LibtorrentRasterbar_DEFINITIONS - Compiler switches required for using libtorrent-rasterbar
+#  LibtorrentRasterbar_OPENSSL_ENABLED - libtorrent-rasterbar uses and links against OpenSSL
+
+find_package(Threads REQUIRED)
+find_package(PkgConfig QUIET)
+
+macro(_detect_boost_components _outComponets librariesList)
+    string(REGEX MATCHALL "boost_[a-z_]+[-a-z]*" _boost_libraries "${librariesList}")
+    string(REGEX REPLACE "boost_([a-z_]+)[-a-z]*" "\\1" ${_outComponets} "${_boost_libraries}")
+endmacro()
+
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_LIBTORRENT_RASTERBAR QUIET libtorrent-rasterbar)
+endif()
+
+if(LibtorrentRasterbar_USE_STATIC_LIBS)
+    set(LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
+endif()
+
+if(PC_LIBTORRENT_RASTERBAR_FOUND)
+    set(LibtorrentRasterbar_DEFINITIONS ${PC_LIBTORRENT_RASTERBAR_CFLAGS})
+else()
+    if(LibtorrentRasterbar_CUSTOM_DEFINITIONS)
+        set(LibtorrentRasterbar_DEFINITIONS ${LibtorrentRasterbar_CUSTOM_DEFINITIONS})
+    else()
+        # Without pkg-config, we can't possibly figure out the correct build flags.
+        # libtorrent is very picky about those. Let's take a set of defaults and
+        # hope that they apply. If not, you the user are on your own.
+        set(LibtorrentRasterbar_DEFINITIONS
+            -DTORRENT_USE_LIBCRYPTO
+            # TODO: remove the following define as it is not used since OpenSSL >= 1.1
+            -DTORRENT_USE_OPENSSL
+            -DBOOST_ASIO_ENABLE_CANCELIO
+            -DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64)
+    endif()
+
+    if(NOT LibtorrentRasterbar_USE_STATIC_LIBS)
+        list(APPEND LibtorrentRasterbar_DEFINITIONS
+            -DTORRENT_LINKING_SHARED
+            -DBOOST_SYSTEM_DYN_LINK)
+    endif()
+endif()
+
+message(STATUS "libtorrent definitions: ${LibtorrentRasterbar_DEFINITIONS}")
+
+find_path(LibtorrentRasterbar_INCLUDE_DIR libtorrent
+          HINTS ${PC_LIBTORRENT_RASTERBAR_INCLUDEDIR} ${PC_LIBTORRENT_RASTERBAR_INCLUDE_DIRS}
+          PATH_SUFFIXES libtorrent-rasterbar)
+
+find_library(LibtorrentRasterbar_LIBRARY NAMES torrent-rasterbar libtorrent
+             HINTS ${PC_LIBTORRENT_RASTERBAR_LIBDIR} ${PC_LIBTORRENT_RASTERBAR_LIBRARY_DIRS})
+
+if(LibtorrentRasterbar_USE_STATIC_LIBS)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ${LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+endif()
+
+set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIR})
+
+# Without pkg-config, we can't possibly figure out the correct boost dependencies
+if (LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
+    set(_boost_components "${LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES}")
+else(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
+    if(PC_LIBTORRENT_RASTERBAR_FOUND)
+        _detect_boost_components(_boost_components "${PC_LIBTORRENT_RASTERBAR_LIBRARIES}")
+    else()
+        # all possible boost dependencies
+        set(_boost_components
+            date_time
+            system
+            chrono
+            random
+            thread
+        )
+    endif()
+endif(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
+
+list(SORT _boost_components)
+message(STATUS "Libtorrent Boost dependencies: ${_boost_components}")
+find_package(Boost REQUIRED COMPONENTS ${_boost_components})
+set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+foreach(_boost_cmpnt IN LISTS _boost_components)
+    list(APPEND LibtorrentRasterbar_LIBRARIES "Boost::${_boost_cmpnt}")
+endforeach(_boost_cmpnt)
+
+set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIRS})
+
+list(FIND LibtorrentRasterbar_DEFINITIONS -DTORRENT_USE_OPENSSL LibtorrentRasterbar_ENCRYPTION_INDEX)
+if(LibtorrentRasterbar_ENCRYPTION_INDEX GREATER -1)
+    find_package(OpenSSL REQUIRED)
+    set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto)
+    list(APPEND LibtorrentRasterbar_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
+    set(LibtorrentRasterbar_OPENSSL_ENABLED ON)
+endif()
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LibtorrentRasterbar_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(LibtorrentRasterbar DEFAULT_MSG
+                                  LibtorrentRasterbar_LIBRARY
+                                  LibtorrentRasterbar_INCLUDE_DIR)
+
+mark_as_advanced(LibtorrentRasterbar_INCLUDE_DIR LibtorrentRasterbar_LIBRARY
+    LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES
+    LibtorrentRasterbar_ENCRYPTION_INDEX)
+
+if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::torrent-rasterbar)
+    add_library(LibtorrentRasterbar::torrent-rasterbar UNKNOWN IMPORTED)
+
+    set_target_properties(LibtorrentRasterbar::torrent-rasterbar PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${LibtorrentRasterbar_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"
+        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${LibtorrentRasterbar_LIBRARIES}"
+        INTERFACE_COMPILE_OPTIONS "${LibtorrentRasterbar_DEFINITIONS}"
+    )
+endif()

cmake/Modules/FindSystemd.cmake

@@ -8,7 +8,7 @@ find_package(PkgConfig QUIET REQUIRED)
 
 if (NOT SYSTEMD_FOUND)
     pkg_check_modules(SYSTEMD "systemd")
-endif()
+endif(NOT SYSTEMD_FOUND)
 
 if (SYSTEMD_FOUND AND "${SYSTEMD_SERVICES_INSTALL_DIR}" STREQUAL "")
     execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE}
@@ -23,4 +23,4 @@ endif()
 
 if (SYSTEMD_FOUND)
     message(STATUS "systemd services install dir: ${SYSTEMD_SERVICES_INSTALL_DIR}")
-endif()
+endif(SYSTEMD_FOUND)

cmake/Modules/FunctionReadVersion.cmake

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

cmake/Modules/MacroConfigureMSVCRuntime.cmake

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

cmake/Modules/MacroGlibcDetect.cmake

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

cmake/Modules/MacroLinkQtComponents.cmake

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

cmake/Modules/MacroQbtCommonConfig.cmake

@@ -1,93 +0,0 @@
-# Set common variables and create some interface-only library targets
-# that some or all other targets will link to, either directly or transitively,
-# to consume common compile options/definitions
-
-macro(qbt_common_config)
-
-    # treat value specified by the CXX_STANDARD target property as a requirement by default
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-    add_library(qbt_common_cfg INTERFACE)
-
-    # Full C++ 17 support is required
-    # See also https://cmake.org/cmake/help/latest/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html
-    # for a breakdown of the features that CMake recognizes for each C++ standard
-    target_compile_features(qbt_common_cfg INTERFACE
-        cxx_std_17
-    )
-
-    target_compile_definitions(qbt_common_cfg INTERFACE
-        QT_DISABLE_DEPRECATED_BEFORE=0x050f02
-        QT_NO_CAST_TO_ASCII
-        QT_NO_CAST_FROM_BYTEARRAY
-        QT_USE_QSTRINGBUILDER
-        QT_STRICT_ITERATORS
-        $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>
-    )
-
-    if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-        target_compile_definitions(qbt_common_cfg INTERFACE
-            NTDDI_VERSION=0x06010000
-            _WIN32_WINNT=0x0601
-            _WIN32_IE=0x0601
-            WIN32_LEAN_AND_MEAN
-            NOMINMAX
-            UNICODE
-            _UNICODE
-        )
-    endif()
-
-    if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
-        target_compile_options(qbt_common_cfg INTERFACE
-            -Wall
-            -Wextra
-            -Wcast-qual
-            -Wcast-align
-            -Winvalid-pch
-            -Woverloaded-virtual
-            -Wold-style-cast
-            -Wnon-virtual-dtor
-            -pedantic
-            -pedantic-errors
-        )
-
-        # Clang 11 still doesn't support -Wstrict-null-sentinel
-        include(CheckCXXCompilerFlag)
-        check_cxx_compiler_flag(-Wstrict-null-sentinel SNS_SUPPORT)
-        if (SNS_SUPPORT)
-            target_compile_options(qbt_common_cfg INTERFACE -Wstrict-null-sentinel)
-        endif()
-    endif()
-
-    if ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
-        target_compile_options(qbt_common_cfg INTERFACE
-            -Wno-range-loop-analysis
-        )
-    endif()
-
-    if (MINGW)
-        target_link_options(qbt_common_cfg INTERFACE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:LINKER:--dynamicbase>)
-    endif()
-
-    if (MSVC_RUNTIME_DYNAMIC)
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-    else()
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-    endif()
-
-    if (MSVC)
-        target_compile_options(qbt_common_cfg INTERFACE
-            /guard:cf
-            /utf-8
-            # https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
-            /Zc:__cplusplus
-        )
-        target_link_options(qbt_common_cfg INTERFACE
-            /guard:cf
-            $<$<NOT:$<CONFIG:Debug>>:/OPT:REF /OPT:ICF>
-            # suppress linking warning due to /INCREMENTAL and /OPT:ICF being both ON
-            $<$<CONFIG:RelWithDebInfo>:/INCREMENTAL:NO>
-        )
-    endif()
-
-endmacro(qbt_common_config)

cmake/Modules/MacroQbtCompilerSettings.cmake

@@ -0,0 +1,102 @@
+# Sets cache variable QBT_ADDITONAL_FLAGS and QBT_ADDITONAL_CXX_FLAGS to list of additional
+# compiler flags for C and C++ (QBT_ADDITONAL_FLAGS) and for C++ only (QBT_ADDITONAL_CXX_FLAGS)
+# and appends them to CMAKE_XXX_FLAGS variables.
+
+# It could use add_compile_options(), but then it is needed to use generator expressions,
+# and most interesting of them are not compatible with Visual Studio :(
+
+macro(qbt_set_compiler_options)
+# if (NOT QBT_ADDITONAL_FLAGS)
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+        #-Wshadow -Wconversion ?
+        set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra"
+            "-Wcast-qual -Wcast-align"
+            "-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"
+            #"-Weffc++"
+            #"-Werror -Wno-error=cpp"
+            # we should modify code to make these ones obsolete
+            #"-Wno-error=sign-conversion -Wno-error=float-equal"
+        )
+
+        if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+            # GCC 4.8 has problems with std::array and its initialization
+            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=missing-field-initializers")
+        endif()
+
+        include(CheckCXXCompilerFlag)
+        # check for -pedantic
+        check_cxx_compiler_flag(-pedantic _PEDANTIC_IS_SUPPORTED)
+        if (_PEDANTIC_IS_SUPPORTED)
+            list(APPEND _GCC_COMMON_CXX_FLAGS "-pedantic -pedantic-errors")
+        else (_PEDANTIC_IS_SUPPORTED)
+            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wpedantic")
+        endif (_PEDANTIC_IS_SUPPORTED)
+
+        if (CMAKE_SYSTEM_NAME MATCHES Linux)
+            # if Glibc version is 2.20 or higher, set -D_DEFAULT_SOURCE
+            include(MacroGlibcDetect)
+            message(STATUS "Detecting Glibc version...")
+            glibc_detect(GLIBC_VERSION)
+            if(${GLIBC_VERSION})
+                if(GLIBC_VERSION LESS "220")
+                    message(STATUS "Glibc version is ${GLIBC_VERSION}")
+                else(GLIBC_VERSION LESS "220")
+                    message(STATUS "Glibc version is ${GLIBC_VERSION}, adding -D_DEFAULT_SOURCE")
+                    add_definitions(-D_DEFAULT_SOURCE)
+                endif(GLIBC_VERSION LESS "220")
+            endif(${GLIBC_VERSION})
+        endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+
+        if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+            # Clang 5.0 still doesn't support -Wstrict-null-sentinel
+            check_cxx_compiler_flag(-Wstrict-null-sentinel _STRICT_NULL_SENTINEL_IS_SUPPORTED)
+            if (_STRICT_NULL_SENTINEL_IS_SUPPORTED)
+                list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
+            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")
+        else ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+            # GCC supports it
+            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
+        endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+
+        string(REPLACE ";" " " _GCC_COMMON_C_AND_CXX_FLAGS_STRING "${_GCC_COMMON_C_AND_CXX_FLAGS}")
+        string(REPLACE ";" " " _GCC_COMMON_CXX_FLAGS_STRING "${_GCC_COMMON_CXX_FLAGS}")
+
+        string(APPEND CMAKE_C_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING}")
+        string(APPEND CMAKE_CXX_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING} ${_GCC_COMMON_CXX_FLAGS_STRING}")
+
+        # 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 -march=native -pipe" CACHE STRING
+                "Additional qBittorent compile flags")
+            set(QBT_ADDITONAL_CXX_FLAGS "-Og -g3 -march=native -pipe" CACHE STRING
+                "Additional qBittorent C++ compile flags")
+        else(_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
+            set(QBT_ADDITONAL_FLAGS "-O0 -g3 -march=native -pipe" CACHE STRING
+                "Additional qBittorent compile flags")
+            set(QBT_ADDITONAL_CXX_FLAGS "-O0 -g3 -march=native -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")
+    endif ()
+
+    string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITONAL_FLAGS}")
+    string(APPEND CMAKE_CXX_FLAGS " ${QBT_ADDITONAL_FLAGS}")
+
+# endif (NOT QBT_ADDITONAL_FLAGS)
+endmacro(qbt_set_compiler_options)
+

cmake/Modules/QbtTargetSources.cmake

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

cmake/Modules/QbtTranslations.cmake

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

cmake/Modules/bundle.cmake

@@ -0,0 +1,21 @@
+set(BU_CHMOD_BUNDLE_ITEMS ON)
+include(DeployQt5)
+
+set(plugins "")
+
+get_property(svgIconPluginLocation TARGET Qt5::QSvgIconPlugin
+        PROPERTY LOCATION_RELEASE)
+list(APPEND plugins "${svgIconPluginLocation}")
+get_property(svgPluginLocation TARGET Qt5::QSvgPlugin
+        PROPERTY LOCATION_RELEASE)
+list(APPEND plugins "${svgPluginLocation}")
+
+set(sfx "")
+if(APPLE)
+    set(sfx ".app")
+elseif(WIN32)
+    set(sfx "${CMAKE_EXECUTABLE_SUFFIX}")
+endif()
+
+get_target_property(exe qBittorrent OUTPUT_NAME)
+install_qt5_executable("${exe}${sfx}" "${plugins}" "" "" "")

cmake/Modules/winconf-mingw.cmake

@@ -0,0 +1,11 @@
+if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
+    link_libraries(-Wl,--dynamicbase)
+endif ()
+
+list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
+    -D_FILE_OFFSET_BITS=64
+    -D__USE_W32_SOCKETS)
+
+# libraries from winconf.pri
+link_libraries(advapi32 iphlpapi ole32 shell32 user32 wsock32 ws2_32)
+

cmake/Modules/winconf-msvc.cmake

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

@@ -0,0 +1,102 @@
+# Settings for compiling qBittorrent on Windows
+
+list(APPEND CMAKE_LIBRARY_PATH "$ENV{LIB}")
+
+set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
+    -DBOOST_ASIO_DISABLE_CONNECTEX
+    -DBOOST_EXCEPTION_DISABLE
+    -DTORRENT_USE_LIBCRYPTO
+    # 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
+    -DTORRENT_DISABLE_RESOLVE_COUNTRIES
+)
+
+set(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES system)
+
+# If you want to link with static version of libtorrent
+#set(LibtorrentRasterbar_USE_STATIC_LIBS True)
+#list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
+#    -DBOOST_SYSTEM_STATIC_LINK=1)
+
+# and boost
+#set(Boost_USE_STATIC_LIBS True)
+#set(Boost_USE_STATIC_RUNTIME True)
+
+add_definitions(
+    -DNTDDI_VERSION=0x06010000
+    -D_WIN32_WINNT=0x0601
+    -D_WIN32_IE=0x0601
+    -DUNICODE
+    -D_UNICODE
+    -DWIN32
+    -D_WIN32
+    -DWIN32_LEAN_AND_MEAN
+    -D_CRT_SECURE_NO_DEPRECATE
+    -D_SCL_SECURE_NO_DEPRECATE
+    -DNOMINMAX
+    -DBOOST_ALL_NO_LIB
+)
+
+# Enable if libtorrent was built with this flag defined
+#list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS -DTORRENT_NO_DEPRECATE)
+
+if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
+    list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
+    -DTORRENT_DEBUG)
+else ()
+    add_definitions(-DNDEBUG)
+endif ()
+
+# Here we assume that all required libraries are installed into the same prefix
+# with usual unix subdirectories (bin, lib, include)
+# if so, we just need to set CMAKE_SYSTEM_PREFIX_PATH
+# If it is not the case, individual paths need to be specified manually (see below)
+set(COMMON_INSTALL_PREFIX "c:/usr" CACHE PATH "Prefix used to install all the required libraries")
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH "${COMMON_INSTALL_PREFIX}")
+
+# If two version of Qt are installed, separate prefixes are needed most likely
+set(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
+set(Qt5_DIR "${QT5_INSTALL_PREFIX}/lib/cmake/Qt5")
+
+# And now we can set specific values for the Boost and libtorrent libraries.
+# The following values are generated from the paths listed above just for an example
+# they have to be set to actual locations
+
+# Boost
+# set(BOOST_ROOT "${COMMON_INSTALL_PREFIX}")
+# set(Boost_version_suffix "1_59")
+# if a link like boost-version/boost -> boost was created or the boost directory was renamed in the same way,
+# the following needs adjustment
+# set(BOOST_INCLUDEDIR "${COMMON_INSTALL_PREFIX}/include/boost-${Boost_version_suffix}")
+# set(BOOST_LIBRARYDIR "${COMMON_INSTALL_PREFIX}/lib/")
+
+# libtorrent
+
+# set(PC_LIBTORRENT_RASTERBAR_INCLUDEDIR "${COMMON_INSTALL_PREFIX}")
+# set(PC_LIBTORRENT_RASTERBAR_LIBDIR "${COMMON_INSTALL_PREFIX}/lib")
+
+set(AUTOGEN_TARGETS_FOLDER "generated")
+
+set(CMAKE_INSTALL_BINDIR ".")
+
+# Test 32/64 bits
+if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    message(STATUS "Target is 64 bits")
+    if (WIN32)
+        set(WINXXBITS Win64)
+    endif(WIN32)
+else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    message(STATUS "Target is 32 bits")
+    if (WIN32)
+        set(WINXXBITS Win32)
+    endif(WIN32)
+endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+
+if (MSVC)
+    include(winconf-msvc)
+else (MSVC)
+    include(winconf-mingw)
+endif (MSVC)

conf.pri.windows

@@ -13,16 +13,17 @@ LIBS += $$quote(-LC:/qBittorrent/openssl/lib)
 # Adapt the lib names/versions accordingly
 # If you want to use Boost auto-linking then disable
 # BOOST_ALL_NO_LIB below and omit Boost libraries here
-LIBS += libcrypto.lib libssl.lib libtorrent.lib zlib.lib
 CONFIG(debug, debug|release) {
-    LIBS += boost_system-vc140-mt-d.lib
+    LIBS += libtorrentd.lib \
+            libboost_system-vc140-mt-sgd-1_64.lib
 }
 else {
-    LIBS += boost_system-vc140-mt.lib
+    LIBS += libtorrent.lib \
+            libboost_system-vc140-mt-s-1_64.lib
 }
-
+LIBS += libeay32.lib ssleay32.lib
+LIBS += zlib.lib
 # ...or if you use MinGW
-#LIBS += libcrypto libssl libz
 #CONFIG(debug, debug|release) {
 #    LIBS += libtorrent-rasterbar \
 #            libboost_system-mt
@@ -31,6 +32,8 @@ else {
 #    LIBS += libtorrent-rasterbar \
 #            libboost_system-mt
 #}
+#LIBS += libcrypto libssl
+#LIBS += libz
 
 # Disable to use Boost auto-linking
 DEFINES += BOOST_ALL_NO_LIB

configure.ac

@@ -1,9 +1,6 @@
-
-AC_INIT([qbittorrent], [v4.4.0alpha], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.2.0], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-: ${CFLAGS=""}
-: ${CXXFLAGS=""}
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_SED
@@ -142,7 +139,7 @@ AS_IF([test "x$QT_QMAKE" = "x"],
       [AC_MSG_ERROR([Could not find qmake])
       ])
 AS_IF([test "x$enable_gui" = "xyes"],
-      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.15.2])
+      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.5.1])
       ])
 AC_MSG_CHECKING([whether QtDBus should be enabled])
 AS_CASE(["x$enable_qt_dbus"],
@@ -160,7 +157,7 @@ AS_CASE(["x$enable_qt_dbus"],
         AC_MSG_ERROR([Unknown option "$enable_qt_dbus". Use either "yes" or "no".])])
 
 
-AX_BOOST_BASE([1.65],
+AX_BOOST_BASE([1.40],
               [AC_MSG_NOTICE([Boost CXXFLAGS: "$BOOST_CPPFLAGS"])
                AC_MSG_NOTICE([Boost LDFLAGS: "$BOOST_LDFLAGS"])],
               [AC_MSG_ERROR([Could not find Boost])])
@@ -176,49 +173,53 @@ m4_define([DETECT_BOOST_VERSION_PROGRAM],
 AC_COMPILE_IFELSE([DETECT_BOOST_VERSION_PROGRAM(106000)], [],
     [QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"])
 
+AX_BOOST_SYSTEM()
+AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
+LIBS="$BOOST_SYSTEM_LIB $LIBS"
+
 PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 1.2.14],
+                  [libtorrent-rasterbar >= 1.1.10],
                   [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS"
                   LIBS="$libtorrent_LIBS $LIBS"])
 
 PKG_CHECK_MODULES(openssl,
-                  [openssl >= 1.1.1],
+                  [openssl >= 1.0],
                   [CXXFLAGS="$openssl_CFLAGS $CXXFLAGS"
                   LIBS="$openssl_LIBS $LIBS"])
 
 PKG_CHECK_MODULES(zlib,
-                 [zlib >= 1.2.11],
+                 [zlib >= 1.2.5.2],
                  [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS"
                  LIBS="$zlib_LIBS $LIBS"])
 
-# Check if already in >= C++17 mode because of the flags returned by one of the above packages
+# Check if already in >= C++14 mode because of the flags returned by one of the above packages
 TMP_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=""
-AC_MSG_CHECKING([if compiler defaults to C++17 or later mode])
-AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
+AC_MSG_CHECKING([if compiler defaults to C++14 or later mode])
+AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
                   [AC_MSG_RESULT([yes])
-                   QBT_CXX17_FOUND="yes"],
+                   QBT_CXX14_FOUND="yes"],
                   [AC_MSG_RESULT([no])
-                   QBT_CXX17_FOUND="no"])
+                   QBT_CXX14_FOUND="no"])
 
-# In case of no, check if the compiler can support at least C++17
+# In case of no, check if the compiler can support at least C++14
 # and if yes, enable it leaving a warning to the user
-AS_IF([test "x$QBT_CXX17_FOUND" = "xno"],
-      [AC_MSG_CHECKING([if compiler supports C++17])
-       CXXFLAGS="-std=c++17"
-       AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
+AS_IF([test "x$QBT_CXX14_FOUND" = "xno"],
+      [AC_MSG_CHECKING([if compiler supports C++14])
+       CXXFLAGS="-std=c++14"
+       AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
                         [AC_MSG_RESULT([yes])
-                         AC_MSG_CHECKING([if C++17 is disabled by the set compiler flags])
+                         AC_MSG_CHECKING([if C++14 is disabled by the set compiler flags])
                          # prepend the flag so it won't override conflicting user defined flags
-                         CXXFLAGS="-std=c++17 $TMP_CXXFLAGS"
-                         AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
+                         CXXFLAGS="-std=c++14 $TMP_CXXFLAGS"
+                         AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
                                            [AC_MSG_RESULT([no])
-                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++17"
-                                            AC_MSG_WARN([C++17 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.])],
+                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++14"
+                                            AC_MSG_WARN([C++14 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])],
                                            [AC_MSG_RESULT([yes])
-                                            AC_MSG_ERROR([The compiler supports C++17 but the user or a dependency has explicitly enabled a lower mode.])])],
+                                            AC_MSG_ERROR([The compiler supports C++14 but the user or a dependency has explicitly enabled a lower mode.])])],
                         [AC_MSG_RESULT([no])
-                         AC_MSG_ERROR([A compiler supporting C++17 is required.])])
+                         AC_MSG_ERROR([A compiler supporting C++14 is required.])])
       ])
 CXXFLAGS="$TMP_CXXFLAGS"
 
@@ -269,13 +270,9 @@ AC_SUBST(QBT_REMOVE_CONFIG)
 AC_SUBST(QBT_ADD_DEFINES)
 AC_SUBST(QBT_REMOVE_DEFINES)
 
-QBT_CONFIG_FILES="conf.pri"
-
+AC_OUTPUT(conf.pri)
 AS_IF([test "x$enable_systemd" = "xyes"],
-      [QBT_CONFIG_FILES="$QBT_CONFIG_FILES dist/unix/systemd/qbittorrent-nox@.service"])
-
-AC_CONFIG_FILES(["$QBT_CONFIG_FILES"])
-AC_OUTPUT
+      [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)])
 
 AC_MSG_NOTICE([Running qmake to generate the makefile...])
 TOPDIR="$(cd "$(dirname "$0")" && pwd)"

dist/CMakeLists.txt

@@ -1,7 +1,12 @@
-if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+find_package(Qt5Widgets ${requiredQtVersion}) # to conditionally install desktop-related files
+
+if (APPLE)
     add_subdirectory(mac)
-elseif (UNIX AND (NOT APPLE))
+else (APPLE)
+    if (UNIX)
         add_subdirectory(unix)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    endif (UNIX)
+    if (WIN32)
         add_subdirectory(windows)
-endif()
+    endif (WIN32)
+endif (APPLE)

dist/mac/CMakeLists.txt

@@ -1 +0,0 @@
-# empty

dist/mac/Info.plist

@@ -47,7 +47,7 @@
 		</dict>
 	</array>
 	<key>CFBundleName</key>
-	<string>qBittorrent</string>
+	<string>@EXECUTABLE@</string>
 	<key>CFBundleIconFile</key>
 	<string>qbittorrent_mac.icns</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -55,9 +55,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.0</string>
+	<string>4.2.0</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.qbittorrent.qBittorrent</string>
 	<key>LSMinimumSystemVersion</key>
@@ -67,7 +67,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2021 The qBittorrent project</string>
+	<string>Copyright © 2006-2019 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>
@@ -84,21 +84,17 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.bittorrent.torrent</string>
 			<key>UTTypeReferenceURL</key>
-			<string>https://www.bittorrent.org/beps/bep_0000.html</string>
+			<string>http://www.bittorrent.org/beps/bep_0000.html</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>com.apple.ostype</key>
-				<array>
 				<string>TORR</string>
-				</array>
 				<key>public.filename-extension</key>
 				<array>
 					<string>torrent</string>
 				</array>
 				<key>public.mime-type</key>
-				<array>
 				<string>application/x-bittorrent</string>
-				</array>
 			</dict>
 		</dict>
 	</array>