Fix wrong 'tracker error' count

This happens when a torrent contains some tracker URLs that share the same domain.
Closes #17808.

.appveyor.yml

@@ -3,7 +3,7 @@ version: '{branch}-{build}'
 # Do not build on tags (GitHub only)
 skip_tags: true
 
-image: Visual Studio 2017
+image: Visual Studio 2022
 
 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
-  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries.7z
+  QBT_VER_URL: https://builds.shiki.hu/appveyor/version_64
+  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries_64.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_32.7z" -o"c:\qbt" > nul
+  - 7z x "%CACHE_DIR%\qt5_64.7z" -o"c:\qbt" > nul
 
 before_build:
   # setup env
-  - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
-  - SET PATH=%PATH%;c:\qbt\qt5_32\bin;%CACHE_DIR%\jom;
+  - CALL "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+  - SET PATH=%PATH%;C:\Qt\5.15.2\msvc2019_64\bin;%CACHE_DIR%\jom
   # setup project
   - COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"
   # workarounds
@@ -56,4 +56,38 @@ build_script:
   - qmake qbittorrent.pro && cd src && qmake src.pro
   - jom -j2 -f Makefile.Release
 
+after_build:
+  - cd "%REPO_DIR%"
+  - MKDIR upload
+  - COPY dist\windows\qt.conf upload
+  - COPY src\release\qbittorrent.exe upload
+  - COPY src\release\qbittorrent.pdb upload
+  - COPY "%CACHE_DIR%\base\bin\libcrypto-1_1-x64.dll" upload
+  - COPY "%CACHE_DIR%\base\bin\libssl-1_1-x64.dll" upload
+  - COPY "%CACHE_DIR%\base\lib\torrent-rasterbar.dll" upload
+  - COPY "%CACHE_DIR%\base\lib\zlib1.dll" upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Core.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Gui.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Network.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Sql.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Svg.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Widgets.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5WinExtras.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Xml.dll upload
+  - MKDIR upload\plugins\iconengines
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\iconengines\qsvgicon.dll upload\plugins\iconengines
+  - MKDIR upload\plugins\imageformats
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\imageformats\qico.dll upload\plugins\imageformats
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\imageformats\qsvg.dll upload\plugins\imageformats
+  - MKDIR upload\plugins\platforms
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\platforms\qwindows.dll upload\plugins\platforms
+  - MKDIR upload\plugins\sqldrivers
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\sqldrivers\qsqlite.dll upload\plugins\sqldrivers
+  - MKDIR upload\plugins\styles
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\styles\qwindowsvistastyle.dll upload\plugins\styles
+
 test: off
+
+artifacts:
+  - path: upload
+    name: qBittorrent-Appveyor_Windows-x64

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE.md

@@ -1,20 +0,0 @@
-**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.yml

@@ -0,0 +1,76 @@
+name: Bug Report
+description: File a bug report to help improve qBittorrent user experience.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        #### ADVISORY
+        "We do not support any versions older than the current release series"
+
+        "We do not support any 3rd party/forked versions e.g. `portableapps`/`Enhanced Edition`etc."
+
+        "Please post all details in **English**."
+
+        #### Prerequisites before submitting an issue!
+        - Read the issue reporting section in the **[contributing guidelines](https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md)**, to know how to submit a good bug report with the required information.
+        - Verify that the issue is not fixed and is reproducible in the **[latest official qBittorrent version](https://www.qbittorrent.org/download.php).**
+        - (Optional, but recommended) Verify that the issue is not fixed and is reproducible in the latest CI (**[macOS](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_macos.yaml?query=branch%3Amaster+event%3Apush)** / **[Ubuntu](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_ubuntu.yaml?query=branch%3Amaster+event%3Apush)** / **[Windows](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_windows.yaml?query=branch%3Amaster+event%3Apush)**) builds.
+        - Check the **[frequent/common issues list](https://github.com/qbittorrent/qBittorrent/projects/2)** and perform a **[search of the issue tracker (including closed ones)](https://github.com/qbittorrent/qBittorrent/issues)** to avoid posting a duplicate.
+        - Make sure this 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/)**.
+        - Verify that the **[wiki](https://github.com/qbittorrent/qBittorrent/wiki)** did not contain a suitable solution either.
+        - If relevant to issue/when asked, the qBittorrent preferences file, qBittorrent.log & watched_folders.json (if using "Watched Folders" feature) must be provided.
+          See **[Where does qBittorrent save its settings?](https://github.com/qbittorrent/qBittorrent/wiki/Frequently-Asked-Questions#Where_does_qBittorrent_save_its_settings)**
+
+  - type: textarea
+    attributes:
+      label: qBittorrent & operating system versions
+      description: |
+        Qt and libtorrent-rasterbar versions are required when: 1. You are using linux. 2. You are not using an official build downloaded from our website.
+
+        Example of preferred formatting:
+        qBittorrent: 4.3.7 x64
+        Operating system: Windows 10 Pro 21H1/2009 x64
+        Qt: 5.15.2
+        libtorrent-rasterbar: 1.2.14
+      placeholder: |
+        qBittorrent:
+        Operating system:
+        Qt:
+        libtorrent-rasterbar:
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What is the problem?
+      description: Please add the "crash report" (if encountered) or give a clear and concise description of problem.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Please provide reliable steps to reproduce the problem.
+      placeholder: |
+        1. First step
+        2. Second step
+        3. and so on...
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add screenshots etc. (Anything that will provide more context about the problem)
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Log(s) & preferences file(s)
+      description: |
+        Add these files: qBittorrent preferences file, qBittorrent.log & watched_folders.json (if using "Watched Folders" feature).
+        See **[Where does qBittorrent save its settings?](https://github.com/qbittorrent/qBittorrent/wiki/Frequently-Asked-Questions#Where_does_qBittorrent_save_its_settings)**
+        #### Note: It's the user's responsibility to redact any sensitive information
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,37 @@
+name: Feature Request
+description: Suggest a new feature or enhancement for qBittorrent.
+labels: ["Feature request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        #### ADVISORY
+
+        "Please post all details in **English**."
+
+        #### Prerequisites before submitting a feature request!
+        - Read the feature request section in the **[contributing guidelines](https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md)**, to know how to submit a good feature request with the required information.
+        - Verify that the feature being requested is not available in the **[latest official qBittorrent version](https://www.qbittorrent.org/download.php).**
+        - (Optional but recommended) Verify that the feature being requested is not available in the latest CI (**[macOS](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_macos.yaml?query=branch%3Amaster+event%3Apush)** / **[Ubuntu](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_ubuntu.yaml?query=branch%3Amaster+event%3Apush)** / **[Windows](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_windows.yaml?query=branch%3Amaster+event%3Apush)**) builds.
+        - Search the issue tracker with the **[feature request filter](https://github.com/qbittorrent/qBittorrent/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature+request%22)** for similar feature requests (including closed ones) to avoid posting a duplicate.
+        - Make sure this 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/)**.
+        - Verify that the **[wiki](https://github.com/qbittorrent/qBittorrent/wiki)** did not contain a suitable solution either.
+
+  - type: textarea
+    attributes:
+      label: Suggestion
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Use case
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Extra info/examples/attachments
+      description: Add screenshots etc. (Anything that will give us more context about what is being requested!)
+    validations:
+      required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+<!--
+MANDATORY Before submitting your work, make sure you have:
+1. Read https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md#opening-a-pull-request
+2. Delete this comment block
+-->

.github/SUPPORT.md

@@ -0,0 +1,18 @@
+# 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/check_translation_tag.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+
+# A pre-commit hook for detecting problematic <translation> tags
+# Copyright (C) 2021  Mike Tzou (Chocobo1)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# In addition, as a special exception, the copyright holders give permission to
+# link this program with the OpenSSL project's "OpenSSL" library (or with
+# modified versions of it that use the same license as the "OpenSSL" library),
+# and distribute the linked executables. You must obey the GNU General Public
+# License in all respects for all of the code used other than "OpenSSL".  If you
+# 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.
+
+from typing import Optional, Sequence
+import argparse
+import re
+
+def main(argv: Optional[Sequence[str]] = None) -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('filenames', nargs='*', help='Filenames to check')
+    args = parser.parse_args(argv)
+
+    error_msg = ""
+    regex = re.compile(r"\s*</translation>")
+
+    for filename in args.filenames:
+        line_counter = 1
+        error_buffer = ""
+
+        with open(filename) as file:
+            try:
+                for line in file:
+                    if (match := regex.match(line)) is not None:
+                        error_buffer += str(f"Defect file: \"{filename}\"\n"
+                              f"Line: {line_counter}\n"
+                              f"Column span: {match.span()}\n"
+                              f"Part: \"{match.group()}\"\n\n")
+                    line_counter += 1
+
+            except UnicodeDecodeError as error:
+                # not a text file, skip
+                continue
+
+        error_msg += error_buffer
+
+    if len(error_msg) > 0:
+        print(error_msg)
+        return 1
+
+    return 0
+
+if __name__ == '__main__':
+    exit(main())

.github/workflows/ci_file_health.yaml

@@ -0,0 +1,17 @@
+name: CI - File health
+
+on: [pull_request, push]
+
+jobs:
+  ci:
+    name: Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install tools
+        uses: actions/setup-python@v2
+
+      - name: Check files
+        uses: pre-commit/action@v2.0.3

.github/workflows/ci_macos.yaml

@@ -0,0 +1,116 @@
+name: CI - macOS
+on: [pull_request, push]
+
+jobs:
+  ci:
+    name: Build
+    runs-on: macos-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        libt_version: ["2.0.5", "1.2.15"]
+        qbt_gui: ["GUI=ON", "GUI=OFF"]
+        qt_version: ["5.15.2", "6.2.0"]
+        exclude:
+          - libt_version: "1.2.15"
+            qt_version: "6.2.0"
+
+    env:
+      boost_path: "${{ github.workspace }}/../boost"
+      openssl_root: /usr/local/opt/openssl@1.1
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          brew update > /dev/null
+          brew install \
+            cmake ninja \
+            openssl@1.1 zlib
+
+      - name: Setup ccache
+        uses: Chocobo1/setup-ccache-action@v1
+        with:
+          update_packager_index: false
+
+      - name: Install boost
+        run: |
+          curl \
+            -L \
+            -o "${{ runner.temp }}/boost.tar.bz2" \
+            "https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2"
+          tar -xf "${{ runner.temp }}/boost.tar.bz2" -C "${{ github.workspace }}/.."
+          mv "${{ github.workspace }}/.."/boost_* "${{ env.boost_path }}"
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: ${{ matrix.qt_version }}
+
+      - name: Install libtorrent
+        run: |
+          git clone \
+            --branch v${{ matrix.libt_version }} \
+            --depth 1 \
+            --recurse-submodules \
+            https://github.com/arvidn/libtorrent.git
+          cd libtorrent
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_CXX_STANDARD=17 \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DBOOST_ROOT="${{ env.boost_path }}" \
+            -Ddeprecated-functions=OFF \
+            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}"
+          cmake --build build
+          sudo cmake --install build
+
+      - name: Build qBittorrent (Qt5)
+        if: ${{ startsWith(matrix.qt_version, 5) }}
+        run: |
+          lupdate -extensions c,cpp,h,hpp,ui ./
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DBOOST_ROOT="${{ env.boost_path }}" \
+            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
+            -DVERBOSE_CONFIGURE=ON \
+            -D${{ matrix.qbt_gui }}
+          cmake --build build
+
+      - name: Build qBittorrent (Qt6)
+        if: ${{ startsWith(matrix.qt_version, 6) }}
+        run: |
+          lupdate -extensions c,cpp,h,hpp,ui ./
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DBOOST_ROOT="${{ env.boost_path }}" \
+            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
+            -DQT6=ON \
+            -DVERBOSE_CONFIGURE=ON \
+            -D${{ matrix.qbt_gui }}
+          cmake --build build
+
+      - name: Prepare build artifacts
+        run: |
+          mkdir upload
+          mkdir upload/cmake
+          cp build/compile_commands.json upload/cmake
+          mkdir upload/cmake/libtorrent
+          cp libtorrent/build/compile_commands.json upload/cmake/libtorrent
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: build-info_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
+          path: upload

.github/workflows/ci_ubuntu.yaml

@@ -0,0 +1,102 @@
+name: CI - Ubuntu
+on: [pull_request, push]
+
+jobs:
+  ci:
+    name: Build
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        libt_version: ["2.0.5", "1.2.15"]
+        qbt_gui: ["GUI=ON", "GUI=OFF"]
+        qt_version: ["5.15.2", "6.2.0"]
+        exclude:
+          - libt_version: "1.2.15"
+            qt_version: "6.2.0"
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install \
+            build-essential cmake ninja-build pkg-config \
+            libboost-dev libssl-dev zlib1g-dev
+
+      - name: Setup ccache
+        uses: Chocobo1/setup-ccache-action@v1
+        with:
+          update_packager_index: false
+          ccache_options: |
+            max_size=2G
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: ${{ matrix.qt_version }}
+
+      - name: Install libtorrent
+        run: |
+          git clone \
+            --branch v${{ matrix.libt_version }} \
+            --depth 1 \
+            --recurse-submodules \
+            https://github.com/arvidn/libtorrent.git
+          cd libtorrent
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -Ddeprecated-functions=OFF
+          cmake --build build
+          sudo cmake --install build
+
+      - name: Build qBittorrent (Qt5)
+        if: ${{ startsWith(matrix.qt_version, 5) }}
+        run: |
+          lupdate -extensions c,cpp,h,hpp,ui ./
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DCMAKE_INSTALL_PREFIX="/usr" \
+            -DVERBOSE_CONFIGURE=ON \
+            -D${{ matrix.qbt_gui }}
+          cmake --build build
+          DESTDIR="qbittorrent" cmake --install build
+
+      - name: Build qBittorrent (Qt6)
+        if: ${{ startsWith(matrix.qt_version, 6) }}
+        run: |
+          lupdate -extensions c,cpp,h,hpp,ui ./
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DCMAKE_INSTALL_PREFIX="/usr" \
+            -DQT6=ON \
+            -DVERBOSE_CONFIGURE=ON \
+            -D${{ matrix.qbt_gui }}
+          cmake --build build
+          DESTDIR="qbittorrent" cmake --install build
+
+      - name: Prepare build artifacts
+        run: |
+          mkdir upload
+          mkdir upload/cmake
+          cp build/compile_commands.json upload/cmake
+          mkdir upload/cmake/libtorrent
+          cp libtorrent/build/compile_commands.json upload/cmake/libtorrent
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: build-info_ubuntu-20.04-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
+          path: upload

.github/workflows/ci_webui.yaml

@@ -0,0 +1,32 @@
+name: CI - WebUI
+
+on: [pull_request, push]
+
+jobs:
+  ci:
+    name: Check
+    runs-on: ubuntu-latest
+
+    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: 'lts/*'
+
+      - name: Install tools
+        run: npm install
+
+      - name: Lint code
+        run: npm run lint
+
+      - name: Format code
+        run: |
+          npm run format
+          git diff --exit-code

.github/workflows/ci_windows.yaml

@@ -0,0 +1,154 @@
+name: CI - Windows
+on: [pull_request, push]
+
+jobs:
+  ci:
+    name: Build
+    runs-on: windows-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        libt_version: ["2.0.5", "1.2.15"]
+
+    env:
+      boost_path: "${{ github.workspace }}/../boost"
+      libtorrent_path: "${{ github.workspace }}/libtorrent"
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Setup devcmd
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Install build tools
+        run: |
+          choco install ninja
+
+      # use the preinstalled vcpkg from image
+      # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#package-management
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v7
+        with:
+          vcpkgDirectory: C:/vcpkg
+          doNotUpdateVcpkg: true  # the preinstalled vcpkg is updated regularly
+          setupOnly: true
+
+      - name: Install dependencies from vcpkg
+        run: |
+          # tell vcpkg to only build Release variants of the dependencies
+          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
+          $packages = `
+            "openssl:x64-windows-static-release",
+            "zlib:x64-windows-static-release"
+          ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe upgrade `
+            --overlay-triplets="${{ github.workspace }}/triplets_overlay" `
+            --no-dry-run
+          ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe install `
+            --overlay-triplets="${{ github.workspace }}/triplets_overlay" `
+            --clean-after-build `
+            $packages
+
+      - name: Install boost
+        run: |
+          aria2c `
+            "https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.7z" `
+            -d "${{ runner.temp }}" `
+            -o "boost.7z"
+          7z x "${{ runner.temp }}/boost.7z" -o"${{ github.workspace }}/.."
+          move "${{ github.workspace }}/../boost_*" "${{ env.boost_path }}"
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: "5.15.2"
+
+      - name: Install libtorrent
+        run: |
+          git clone `
+            --branch v${{ matrix.libt_version }} `
+            --depth 1 `
+            --recurse-submodules `
+            https://github.com/arvidn/libtorrent.git
+          cd libtorrent
+          cmake `
+            -B build `
+            -G "Ninja" `
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON `
+            -DCMAKE_INSTALL_PREFIX="${{ env.libtorrent_path }}" `
+            -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" `
+            -DBOOST_ROOT="${{ env.boost_path }}" `
+            -DBUILD_SHARED_LIBS=OFF `
+            -Ddeprecated-functions=OFF `
+            -Dstatic_runtime=ON `
+            -DVCPKG_TARGET_TRIPLET=x64-windows-static-release
+          cmake --build build
+          cmake --install build
+
+      - name: Build qBittorrent
+        run: |
+          lupdate -extensions c,cpp,h,hpp,ui .
+          cmake `
+            -B build `
+            -G "Ninja" `
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON `
+            -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" `
+            -DBOOST_ROOT="${{ env.boost_path }}" `
+            -DLibtorrentRasterbar_DIR="${{ env.libtorrent_path }}/lib/cmake/LibtorrentRasterbar" `
+            -DMSVC_RUNTIME_DYNAMIC=OFF `
+            -DVCPKG_TARGET_TRIPLET=x64-windows-static-release `
+            -DVERBOSE_CONFIGURE=ON `
+            --graphviz=build/target_graph.dot
+          cmake --build build
+
+      - name: Prepare build artifacts
+        run: |
+          mkdir upload
+          copy build/qbittorrent.exe upload
+          copy build/qbittorrent.pdb upload
+          copy dist/windows/qt.conf upload
+          # runtimes
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Core.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Gui.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Network.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Sql.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Svg.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Widgets.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5WinExtras.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Xml.dll" upload
+          mkdir upload/plugins/iconengines
+          copy "${{ env.Qt5_DIR }}/plugins/iconengines/qsvgicon.dll" upload/plugins/iconengines
+          mkdir upload/plugins/imageformats
+          copy "${{ env.Qt5_DIR }}/plugins/imageformats/qico.dll" upload/plugins/imageformats
+          copy "${{ env.Qt5_DIR }}/plugins/imageformats/qsvg.dll" upload/plugins/imageformats
+          mkdir upload/plugins/platforms
+          copy "${{ env.Qt5_DIR }}/plugins/platforms/qwindows.dll" upload/plugins/platforms
+          mkdir upload/plugins/sqldrivers
+          copy "${{ env.Qt5_DIR }}/plugins/sqldrivers/qsqlite.dll" upload/plugins/sqldrivers
+          mkdir upload/plugins/styles
+          copy "${{ env.Qt5_DIR }}/plugins/styles/qwindowsvistastyle.dll" upload/plugins/styles
+          # cmake additionals
+          mkdir upload/cmake
+          copy build/compile_commands.json upload/cmake
+          copy build/target_graph.dot upload/cmake
+          mkdir upload/cmake/libtorrent
+          copy libtorrent/build/compile_commands.json upload/cmake/libtorrent
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: qBittorrent-CI_Windows-x64_libtorrent-${{ matrix.libt_version }}
+          path: upload

.github/workflows/coverity-scan.yml

@@ -0,0 +1,74 @@
+name: Coverity Scan
+
+on:
+  schedule:
+    - cron: '0 0 1 * *' # Monthly (1st day of month at midnight)
+  workflow_dispatch: # Mainly for testing. Don't forget the Coverity usage limits.
+
+jobs:
+  coverity_scan:
+    name: Scan
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install \
+            build-essential cmake ninja-build pkg-config \
+            libboost-dev libssl-dev zlib1g-dev
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: "5.15.2"
+
+      - name: Install libtorrent
+        run: |
+          git clone \
+            --branch "v2.0.5" \
+            --depth 1 \
+            --recurse-submodules \
+            https://github.com/arvidn/libtorrent.git
+          cd libtorrent
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -Ddeprecated-functions=OFF
+          cmake --build build
+          sudo cmake --install build
+
+      - name: Download Coverity Build Tool
+        run: |
+          wget \
+            -q \
+            https://scan.coverity.com/download/linux64 \
+            --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=qbittorrent%2FqBittorrent" \
+            -O coverity_tool.tgz
+          mkdir coverity_tool
+          tar xzf coverity_tool.tgz --strip 1 -C coverity_tool
+
+      - name: Build qBittorrent
+        run: |
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DGUI=ON \
+            -DVERBOSE_CONFIGURE=ON
+          export PATH="$(pwd)/coverity_tool/bin:$PATH"
+          cov-build --dir cov-int cmake --build build
+
+      - name: Submit the result to Coverity Scan
+        run: |
+          tar caf qbittorrent.xz cov-int
+          curl \
+            --form token="${{ secrets.COVERITY_SCAN_TOKEN }}" \
+            --form email=sledgehammer999@qbittorrent.org \
+            --form file=@qbittorrent.xz \
+            --form version="$(git rev-parse --short HEAD)" \
+            --form description="master" \
+            https://scan.coverity.com/builds?project=qbittorrent%2FqBittorrent

.github/workflows/stale_bot.yaml

@@ -0,0 +1,22 @@
+name: Stale bot
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mark and close stale PRs
+        uses: actions/stale@v4
+        with:
+          stale-pr-message: "This PR is stale because it has been 60 days with no activity. This PR will be automatically closed within 7 days if there is no further activity."
+          close-pr-message: "This PR was closed because it has been stalled for some time with no activity."
+          days-before-stale: -1 # avoid marking issues
+          days-before-pr-stale: 60
+          days-before-close: -1 # avoid closing issues
+          days-before-pr-close: 7
+          exempt-all-pr-assignees: true  # avoid stale for all PR with assignees
+          exempt-all-pr-milestones: true # avoid stale for all PR with milestones
+          operations-per-run: 200

.gitignore

@@ -4,6 +4,7 @@ src/qbittorrent
 src/qbittorrent-nox
 src/release
 src/debug
+src/base/version.h
 CMakeLists.txt.user*
 qbittorrent.pro.user*
 conf.pri
@@ -37,6 +38,9 @@ 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

.pre-commit-config.yaml

@@ -0,0 +1,55 @@
+repos:
+  - repo: local
+    hooks:
+      - id: check-translation-tag
+        name: Check newline characters in <translation> tag
+        entry: .github/workflows/check_translation_tag.py
+        language: script
+        types_or:
+          - ts
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks.git
+    rev: v4.0.1
+    hooks:
+    - id: check-json
+      name: Check JSON files
+
+    - id: check-yaml
+      name: Check YAML files
+
+    - id: fix-byte-order-marker
+      name: Check file encoding (UTF-8 without BOM)
+      exclude: |
+        (?x)^(
+          src/base/unicodestrings.h
+        )$
+
+    - id: mixed-line-ending
+      name: Check line ending character (LF)
+      args: ["--fix=lf"]
+      exclude: |
+        (?x)^(
+          compile_commands.json |
+          src/webui/www/private/scripts/lib/.*
+        )$
+
+    - id: end-of-file-fixer
+      name: Check trailing newlines
+      exclude: |
+        (?x)^(
+          compile_commands.json |
+          configure |
+          src/webui/www/private/scripts/lib/.*
+        )$
+      exclude_types:
+        - svg
+        - ts
+
+    - id: trailing-whitespace
+      name: Check trailing whitespaces
+      exclude: |
+        (?x)^(
+          src/webui/www/private/scripts/lib/.*
+        )$
+      exclude_types:
+        - ts

.travis.yml

@@ -1,233 +0,0 @@
-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,19 +17,23 @@ Contributors:
 * Nick Tiskov <daymansmail@gmail.com>
 
 Code from other projects:
-* files src/qtsingleapplication/* src/lineedit/*
+* files src/app/qtlocalpeer/*
   copyright: Nokia Corporation
-  license: LGPL
+  license: mixed
 
-* files src/ico.cpp src/ico.h
-  copyright: Malte Starostik <malte@kde.org>
-  license: LGPL
+* files src/gui/lineedit.*
+  copyright: Trolltech ASA <info@trolltech.com>
+  license: custom
 
 * files src/search_engine/socks.py
   copyright: Dan Haim <negativeiq@users.sourceforge.net>
   license: BSD
 
-* file src/stacktrace_win.h
+* file src/app/stacktrace.h
+  copyright: Timo Bingmann from http://idlebox.net/
+  license: WTFPL v2.0
+
+* file src/app/stacktrace_win.h
   copyright: Quassel Project
   license: GPLv2/3
 
@@ -62,7 +66,7 @@ Images Authors:
   copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
   license: GPLv2
 
-* file: src/icons/skin/tabs.gif
+* file: src/icons/tabs.gif
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
@@ -87,7 +91,7 @@ Images Authors:
 
 * file: src/icons/oxygen/checked.png
   copyright: Victor Buinsky <allok.victor@gmail.com>
-  
+
 * file: src/icons/skin/ratio.png
   copyright: Fatcow Web Hosting
   license: Creative Commons Attribution 3.0 License
@@ -119,7 +123,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 (majoros.j.p@t-online.hu)
+  - Hungarian: Majoros Péter
   - 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,60 +1,67 @@
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
-
-message(AUTHOR_WARNING "If the build fails, please try the autotools/qmake method.")
-
-if(POLICY CMP0074)
-    cmake_policy(SET CMP0074 NEW)
-endif()
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # Policies <= CMP0097 default to NEW
 
 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
+    DESCRIPTION "The qBittorrent BitTorrent client"
+    HOMEPAGE_URL "https://www.qbittorrent.org/"
+    LANGUAGES CXX
+)
 
-project(qBittorrent VERSION ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD})
+# use CONFIG mode first in find_package
+set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
+# version requirements - older versions may work, but you are on your own
+set(minBoostVersion 1.65)
+set(minQt5Version 5.15.2)
+set(minQt6Version 6.2)
+set(minOpenSSLVersion 1.1.1)
+set(minLibtorrent1Version 1.2.14)
+set(minLibtorrentVersion 2.0.4)
+set(minZlibVersion 1.2.11)
 
-set(PROJECT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}")
-
-if (NOT VER_BUILD EQUAL 0)
-    set(PROJECT_VERSION "${PROJECT_VERSION}.${VER_BUILD}")
+# features (some are platform-specific)
+include(CheckCXXSourceCompiles) # TODO: migrate to CheckSourceCompiles in CMake >= 3.19
+include(FeatureSummary)
+include(FeatureOptionsSetup)
+feature_option(QT6 "Use Qt6" OFF)
+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)
 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)
 
-feature_summary(DESCRIPTION "\nConfiguration results:" WHAT ALL)
+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)

CONTRIBUTING.md

@@ -6,22 +6,14 @@ Read the respective section to find out more.
 ### Table Of Contents
 
 *   **[Bug reporting etiquette](#bug-reporting-etiquette)**
-
-
 *   **[Submitting an issue/bug report](#submitting-an-issuebug-report)**
     *   [What is an actual bug report?](#what-is-an-actual-bug-report)
     *   [Before submitting a bug report](#before-submitting-a-bug-report)
     *   [Steps to ensure a good bug report](#steps-to-ensure-a-good-bug-report)
-
-
 *   **[Suggesting enhancements/feature requests](#suggesting-enhancementsfeature-requests)**
     *   [Before submitting an enhancement/feature request](#before-submitting-an-enhancementfeature-request)
     *   [Steps to ensure a good enhancement/feature suggestion](#steps-to-ensure-a-good-enhancementfeature-suggestion)
-
-
 *   **[Opening a pull request](#opening-a-pull-request)**
-    *   [Must read](#must-read)
-    *   [Good to know](#good-to-know)
 
 # Bug reporting etiquette
 
@@ -138,7 +130,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/data/qBittorrent/logs/qBittorrent.log`
+    -   Linux: `~/.local/share/qBittorrent/logs/qBittorrent.log`
     -   Windows: `%LocalAppData%\qBittorrent\logs`
     -   macOS: `~/Library/Application Support/qBittorrent/qBittorrent.log`
 
@@ -194,28 +186,26 @@ Following these guidelines helps maintainers and the community understand your s
 
 # Opening a pull request
 
-### Must read
-*   Read our [**coding guidelines**][coding-guidelines-url]. There are some scripts to help you: [uncrustify script][uncrustify-script-url], [astyle script][astyle-script-url], [(related thread)][coding-guidelines-thread-url].
-*   Keep the title **short** and provide a **clear** description about what your pull request does.
-*   Provide **screenshots** for UI related changes.
-*   Keep your git commit history **clean** and **precise.** Refer to the section about "Git commit messages" in the [**coding guidelines**][coding-guidelines-url].
-*   If your commit fixes a reported issue (for example #4134), add the following message to the commit `Closes #4134.`. Example [here][commit-message-fix-issue-example-url].
+*   Consult [coding guidelines][coding-guidelines-url] first. If you are working on translation/i18n, read ["How to translate qBittorrent"][how-to-translate-url].
+*   Keep your git commit history clean.
+    * Refer to the section about ["Git commit messages"][coding-guidelines-git-commit-message-url] in the coding guidelines.
+    * When merge conflicts arise, do `git rebase <target_branch_name>` and fix the conflicts, don't do `git pull`. Here is a good explanation: [merging-vs-rebasing][merging-vs-rebasing-url].
+*   Keep pull request title concise and provide motivation and "what it does" in the pull request description area. Make it easy to read and understand.
+*   Provide screenshots for UI related changes.
+*   If your commit addresses a reported issue (for example issue #8454), append the following text to the commit body `Closes #8454.`. Example [commit][commit-message-fix-issue-example-url].
+*   Search [pull request list][pull-request-list-url] first. Others might have already implemented your idea (or got rejected already).
 
-### Good to know
-*   **Search** pull request history! Others might have already implemented your idea and it is waiting to be merged (or got rejected already). Save your precious time by doing a search first.
-*   When resolving merge conflicts, do `git rebase <target_branch_name>`, don't do `git pull`. Then you can start fixing the conflicts. Here is a good explanation: [link][merging-vs-rebasing-url].
-
-[astyle-script-url]: https://gist.github.com/Chocobo1/539cee860d1eef0acfa6
 [attachments-howto-url]: https://help.github.com/articles/file-attachments-on-issues-and-pull-requests
+[builds-url]: https://sourceforge.net/projects/qbittorrent/files/
 [coding-guidelines-url]: https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md
-[coding-guidelines-thread-url]: https://github.com/qbittorrent/qBittorrent/issues/2192
+[coding-guidelines-git-commit-message-url]: https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md#10-git-commit-message
 [commit-message-fix-issue-example-url]: https://github.com/qbittorrent/qBittorrent/commit/c07cd440cd46345297debb47cb260f8688975f50
 [forum-url]: http://forum.qbittorrent.org/
 [howto-report-bugs-url]: https://www.chiark.greenend.org.uk/~sgtatham/bugs.html
+[how-to-translate-url]: https://github.com/qbittorrent/qBittorrent/wiki/How-to-translate-qBittorrent
 [merging-vs-rebasing-url]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing
+[pull-request-list-url]: https://github.com/qbittorrent/qBittorrent/pulls
 [python-url]: https://www.python.org/
 [releases-url]: https://github.com/qbittorrent/qBittorrent/releases
 [search-plugins-url]: https://github.com/qbittorrent/search-plugins
-[uncrustify-script-url]: https://raw.githubusercontent.com/qbittorrent/qBittorrent/master/uncrustify.cfg
 [wiki-url]: https://github.com/qbittorrent/qBittorrent/wiki
-[builds-url]: https://sourceforge.net/projects/qbittorrent/files/

COPYING

@@ -1,5 +1,6 @@
-qBittorrent is licensed under the GNU General Public License version 2 with the
-addition of the following special exception:
+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:
 
 In addition, as a special exception, the copyright holders give permission to
 link this program with the OpenSSL project's "OpenSSL" library (or with
@@ -10,13 +11,15 @@ 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
                        Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -29,7 +32,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -292,3 +295,62 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

INSTALL

@@ -3,22 +3,28 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
 1) Install these dependencies:
 
-  - Boost >= 1.40
+  - Boost >= 1.65
 
-  - libtorrent-rasterbar >= 1.1.10 (by Arvid Norberg)
-      * https://www.libtorrent.org/
+  - libtorrent-rasterbar 1.2.14 - 1.2.x || 2.0.4 - 2.0.x
+      * By Arvid Norberg, https://www.libtorrent.org/
       * Be careful: another library (the one used by rTorrent) uses a similar name
 
-  - OpenSSL >= 1.0
+  - OpenSSL >= 1.1.1
 
-  - Qt >= 5.9.0
+  - Qt 5.15.2 - 5.x || 6.2.0 - 6.x
 
-  - zlib >= 1.2.5.2
+  - zlib >= 1.2.11
 
-  - pkg-config (compile-time only)
+  - pkg-config *
+      * Compile-time only on *nix systems
 
-  - Python >= 2.7.9 / 3.3.0 (optional, runtime only)
-      * Required by the internal search engine
+  - Python >= 3.5.0
+      * Optional, run-time only
+      * Used by the bundled 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
 

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,8 +13,7 @@ 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.
 
-This product includes GeoLite data created by MaxMind, available from
-https://www.maxmind.com/
+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/).
 
 ### Installation:
 For installation, follow the instructions from INSTALL file, but simple:
@@ -46,8 +45,8 @@ http://forum.qbittorrent.org
 Please report any bug (or feature request) to:
 http://bugs.qbittorrent.org
 
-You can also meet me (sledgehammer_999) on IRC:
-`#qbittorrent on irc.freenode.net`
+Official IRC channel:
+[#qbittorrent on irc.libera.chat](ircs://irc.libera.chat:6697/qbittorrent)
 
 ------------------------------------------
-sledgehammer999 <sledgehammer999@qbittorrent.org>
+sledgehammer999 \<sledgehammer999@qbittorrent.org\>

TODO

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

build_dist.sh

@@ -0,0 +1,19 @@
+#!/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

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

cmake/Modules/FeatureOptionsSetup.cmake

@@ -0,0 +1,14 @@
+# 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()