Bump to 3.2.0

Update Transifex config file.
2025-12-18 14:38:04 -06:00 · 2015-05-10 04:20:19 +03:00 · 2015-05-10 04:20:06 +03:00
1848 changed files with 261083 additions and 878563 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,93 +0,0 @@
-version: '{branch}-{build}'
-
-# Do not build on tags (GitHub only)
-skip_tags: true
-
-image: Visual Studio 2022
-
-branches:
-  except:  # blacklist
-    - coverity_scan
-
-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
-
-# project directory
-clone_folder: *REPO_DIR
-
-# cache size should < 100MB (after compressing with fastest option):
-# see: https://www.appveyor.com/docs/build-cache#save-update-cache-before-build-finishes
-cache:
-  - *CACHE_DIR
-
-clone_depth: 50
-
-install:
-  # check if library needs update
-  - appveyor DownloadFile "%QBT_VER_URL%" -FileName "c:\version_new" && SET /P newVersion=<"c:\version_new"
-  - IF EXIST "%CACHE_DIR%\version" (SET /P oldVersion=<"%CACHE_DIR%\version")
-  - IF NOT EXIST "%CACHE_DIR%\version" (SET updateCache=1)
-  - IF NOT "%oldVersion%" == "%newVersion%" (SET updateCache=1)
-  # update library
-  - IF "%updateCache%" == "1" (ECHO "--- Will redownload libraries ---" &&
-      RMDIR /S /Q "%CACHE_DIR%" & MKDIR "%CACHE_DIR%" &&
-      appveyor DownloadFile "%QBT_LIB_URL%" -FileName "c:\qbt_lib.7z" && 7z x "c:\qbt_lib.7z" -o"%CACHE_DIR%" > nul &&
-      COPY "c:\version_new" "%CACHE_DIR%\version")
-  # Qt stay compressed in cache
-  - 7z x "%CACHE_DIR%\qt5_64.7z" -o"c:\qbt" > nul
-
-before_build:
-  # setup env
-  - 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
-  - MKLINK /J "c:\qbt\base" "%CACHE_DIR%\base"
-
-build_script:
-  - cd "%REPO_DIR%"
-  # scan only as lupdate is prone to hang
-  - lupdate -extensions c,cpp,h,hpp,ui .
-  - qmake qbittorrent.pro && cd src && qmake src.pro
-  - jom -j2 -f Makefile.Release
-
-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
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,12 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[**.yml]
-indent_size = 2
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +0,0 @@
-custom: "https://www.qbittorrent.org/donate.php"
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,76 +0,0 @@
-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
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,17 +0,0 @@
-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"
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,37 +0,0 @@
-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
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +0,0 @@
-<!--
-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
-->
--- a/.github/SUPPORT.md
+++ b/.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/
--- a/.github/workflows/check_translation_tag.py
+++ b/.github/workflows/check_translation_tag.py
@@ -1,68 +0,0 @@
-#!/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())
--- a/.github/workflows/ci_file_health.yaml
+++ b/.github/workflows/ci_file_health.yaml
@@ -1,17 +0,0 @@
-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
--- a/.github/workflows/ci_macos.yaml
+++ b/.github/workflows/ci_macos.yaml
@@ -1,104 +0,0 @@
-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:
-      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 \
-            boost openssl@1.1 zlib
-
-      - name: Setup ccache
-        uses: Chocobo1/setup-ccache-action@v1
-        with:
-          update_packager_index: false
-
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v2
-        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 \
-            -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 \
-            -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 \
-            -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
-          mv build/qbittorrent*.app 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: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
-          path: upload
--- a/.github/workflows/ci_ubuntu.yaml
+++ b/.github/workflows/ci_ubuntu.yaml
@@ -1,102 +0,0 @@
-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@v2
-        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
--- a/.github/workflows/ci_webui.yaml
+++ b/.github/workflows/ci_webui.yaml
@@ -1,32 +0,0 @@
-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
--- a/.github/workflows/ci_windows.yaml
+++ b/.github/workflows/ci_windows.yaml
@@ -1,154 +0,0 @@
-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@v2
-        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
--- a/.github/workflows/coverity-scan.yml
+++ b/.github/workflows/coverity-scan.yml
@@ -1,74 +0,0 @@
-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@v2
-        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
--- a/.github/workflows/stale_bot.yaml
+++ b/.github/workflows/stale_bot.yaml
@@ -1,22 +0,0 @@
-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
--- a/.gitignore
+++ b/.gitignore
@@ -2,45 +2,24 @@ src/gui/geoip/GeoIP.dat
 src/gui/geoip/GeoIP.dat.gz
 src/qbittorrent
 src/qbittorrent-nox
-src/release
-src/debug
-src/base/version.h
-CMakeLists.txt.user*
 qbittorrent.pro.user*
 conf.pri
-Makefile*
+Makefile
 *.pyc
 *.log
-
 # Compiled object files
 *.o
-*.pdb
-*.exe
-
 # Generated MOC, resource and UI files
 moc_*.cpp
-moc_*.h
 qrc_*.cpp
 ui_*.h
 *.moc
 src/lang/qbittorrent_*.qm
-src/webui/www/translations/webui_*.qm
 .DS_Store
 .qmake.stash
 src/qbittorrent.app
 *.dmg
-
 #Autotools junk
 aclocal.m4
 autom4te.cache/*
 config.status
-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
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,55 +0,0 @@
-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
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,60 @@
+language:
+  - cpp
+
+env:
+  # use libtorrent 0.15.10
+  # uncomment when Travis doesn't use Ubuntu 12.04 LTS, which has libtorrent 0.15.10 as package
+  #- lt_source=from_dist gui=true
+  #- lt_source=from_dist gui=false
+  # use libtorrent 0.16.X from RC_0_16 svn branch
+  - lt_source=from_svnRC_0_16 gui=true
+  - lt_source=from_svnRC_0_16 gui=false
+  - lt_source=from_svnRC_1_0 gui=true
+  - lt_source=from_svnRC_1_0 gui=false
+
+branches:
+  except:
+    - search_encoding_windows
+    - v2_9_x
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change 
+
+before_install:
+  - shopt -s expand_aliases
+  - alias sudo="sudo "
+  # Using nprocs/2 sometimes may fail (gcc is killed by system), just use two threads
+  - alias make="colormake -j2 "
+
+  # Also setup a virtual display for after_success target when gui == true
+  - if ! $gui; then qbtconf="$qbtconf --disable-gui"; else export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi
+  - qbtconf="$qbtconf --with-qt4"
+  - ltconf=" --with-libgeoip=system"
+
+  - echo settings
+  - echo $lt_source
+  - echo $ltconf
+  - echo $gui
+  - echo $qbtconf
+
+  - sudo apt-get -qq update
+  # Travis can stall during heavy load if these packages are installed in one step - split the command
+  - sudo apt-get -qq install debhelper autoconf automake colormake libssl-dev libgeoip-dev
+  # uncomment when Travis doesn't use Ubuntu 12.04 LTS, which has libtorrent 0.15.10 as package
+  #- sudo apt-get -qq install libboost-dev libboost-filesystem-dev libboost-system-dev
+  - sudo apt-get -qq install libboost-dev libboost-system-dev
+  - sudo apt-get -qq install libqt4-dev 
+
+install:
+  #- if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
+  - if [[ "$lt_source" == "from_svnRC_0_16" ]]; then qbtconf="$qbtconf --with-libtorrent-rasterbar0.16" && cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
+  - if [[ "$lt_source" == "from_svnRC_1_0" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_1_0 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
+
+script:
+  - ./bootstrap.sh
+  - ./configure $qbtconf && sudo make install
+  
+after_success:
+  - if $gui ; then qbittorrent --version ; else qbittorrent-nox --version ; fi
--- a/.tx/config
+++ b/.tx/config
@@ -1,27 +1,18 @@
 [main]
 host = https://www.transifex.com

-[qbittorrent.qbittorrent_master]
+[qbittorrent.qbittorrent_v3_2_x]
 file_filter = src/lang/qbittorrent_<lang>.ts
-lang_map = pt: pt_PT
 source_file = src/lang/qbittorrent_en.ts
 source_lang = en
 type = QT
 minimum_perc = 23
 mode = developer

+
 [qbittorrent.qbittorrentdesktop_master]
-source_file = dist/unix/org.qbittorrent.qBittorrent.desktop
+source_file = src/icons/qBittorrent.desktop
 source_lang = en
 type = DESKTOP
 minimum_perc = 23
 mode = developer
-
-[qbittorrent.qbittorrent_webui]
-file_filter = src/webui/www/translations/webui_<lang>.ts
-lang_map = pt: pt_PT
-source_file = src/webui/www/translations/webui_en.ts
-source_lang = en
-type = QT
-minimum_perc = 23
-mode = developer
--- a/5B7CC9A2.asc
+++ b/5B7CC9A2.asc
@@ -1,92 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
-
-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
-xdpwp07LYo2ilhMI8RnzmtoRmg==
-=UBeB
-----END PGP PUBLIC KEY BLOCK-----
--- a/41
+++ b/41
@@ -17,35 +17,23 @@ 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

 Images Authors:
-* files: src/icons/skin/qbittorrent-tray.svg (and related pngs)
-  copyright: Provided by HVS <hvs linuxmail org> (raster first proposal) and Atif Afzal(@atfzl github) <atif5801@gmail.com> (vectorized and modified)
-  license: GPLv2+
-
-* files: src/qbittorrent_file.ico src/icons/fileicon.svg
-  copyright: 'uknown.svg' (LGPLv3+) from Oxygen Icon Theme was used as base which was slightly modified and 'qbittorrent-tray.svg' (GPLv2+) was overlayed above it.
-  license: GPLv3+
-
 * files: src/icons/*.png
  copyright: Gnome Icon Theme
  license: GPLv2
@@ -56,17 +44,17 @@ Images Authors:
  license: LGPL
  url: http://www.oxygen-icons.org

-* files: src/icons/flags/*.svg
-  copyright: lipis/flag-icon-css
-  license: MIT
-  url: https://github.com/lipis/flag-icon-css/
+* files: src/icons/flags/*.png
+  copyright: Mark James <mjames@gmail.com>
+  license: Public Domain
+  url: http://www.famfamfam.com

 * files: src/icons/skin/*.png
  files: src/menuicons/YYxYY/*.png
  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

@@ -92,11 +80,6 @@ Images Authors:
 * file: src/icons/oxygen/checked.png
  copyright: Victor Buinsky <allok.victor@gmail.com>

-* file: src/icons/skin/ratio.png
-  copyright: Fatcow Web Hosting
-  license: Creative Commons Attribution 3.0 License
-  url: http://www.fatcow.com/free-icons
-
 Translations authors:
 * files: src/lang/*.ts
 * file: src/icons/qBittorrent.desktop
@@ -123,7 +106,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)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,67 +0,0 @@
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # Policies <= CMP0097 default to NEW
-
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
-
-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 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)
-
-# 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()
-
-include(GNUInstallDirs)
-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)
--- a/CODING_GUIDELINES.md
+++ b/CODING_GUIDELINES.md
@@ -1,103 +1,53 @@
-# 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. \
-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 3:** There is also a style for QtCreator but it doesn't cover all cases. In QtCreator `Tools->Options...->C++->Code Style->Import...` and choose the `codingStyleQtCreator.xml` file found in the root folder.
-
-## Table Of Contents
-
-* [1. New lines &amp; curly braces](#1-new-lines--curly-braces)
-  * [a. Function blocks, class/struct definitions, namespaces](#a-function-blocks-classstruct-definitions-namespaces)
-  * [b. Other code blocks](#b-other-code-blocks)
-  * [c. Blocks in switch's case labels](#c-blocks-in-switchs-case-labels)
-  * [d. If-else statements](#d-if-else-statements)
-  * [e. Single statement if blocks](#e-single-statement-if-blocks)
-  * [f. Acceptable conditions to omit braces](#f-acceptable-conditions-to-omit-braces)
-  * [g. Brace enclosed initializers](#g-brace-enclosed-initializers)
-* [2. Indentation](#2-indentation)
-* [3. File encoding and line endings](#3-file-encoding-and-line-endings)
-* [4. Initialization lists](#4-initialization-lists)
-* [5. Enums](#5-enums)
-* [6. Names](#6-names)
-  * [a. Type names and namespaces](#a-type-names-and-namespaces)
-  * [b. Variable names](#b-variable-names)
-  * [c. Private member variable names](#c-private-member-variable-names)
-* [7. Header inclusion order](#7-header-inclusion-order)
-* [8. Include guard](#8-include-guard)
-* [9. Misc](#9-misc)
-* [10. Git commit message](#10-git-commit-message)
-* [11. Not covered above](#11-not-covered-above)
-
---
-
-## 1. New lines & curly braces
-
-### a. Function blocks, class/struct definitions, namespaces
+All new code must follow the following coding guidelines.  
+If you make changes in a file that still uses another coding style, make sure that you follow these guidelines for your changes instead.  
+**Note:** I will now take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style.

+### 1. Curly braces ###
+#### a. Function blocks, class/struct definitions, namespaces ####
 ```c++
 int myFunction(int a)
 {
    //code
 }

-void myFunction() {} // empty body
-
-MyClass::MyClass(int *parent)
-    : m_parent {parent}
+myClass::myClass(int *parent)
+    : m_parent(parent)
 {
-    // initialize
+    //initialiaze
 }

-int MyClass::myMethod(int a)
+int myClass::myMethod(int a)
 {
    //code
 }

-class MyOtherClass
+class myOtherClass
 {
 public:
    //code
-
 protected:
    //code
-
 private:
    //code
 };

-namespace Name
+namespace id
 {
    //code
 }
-
-// Lambdas
-[](int arg1, int arg2) -> bool { return arg1 < arg2; }
-
-[this](int arg)
-{
-    this->acc += arg;
-}
 ```

-### b. Other code blocks
-
+#### 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 +55,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,122 +75,69 @@ default:
 }
 ```

-### d. If-else statements
-
-The `else if`/`else` must be on their own lines:
-
+### 2. If blocks ###
+#### a. Multiple tests ####
 ```c++
-if (condition)
-{
+if (condition) {
    //code
 }
-else if (condition)
-{
+else if (condition) {
    //code
 }
-else
-{
+else {
    //code
 }
 ```
+The `else if`/`else` must be on their own lines.

-### e. Single statement if blocks
-
-Most single statement if blocks should look like this:
-
+#### b. Single statement if blocks ####
+**Most** single statement if blocks should look like this:
 ```c++
 if (condition)
    a = a + b;
 ```

-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.
-
+One acceptable exception to this **can be** `return`, `break` or `continue` statements, provided that the test condition isn't very long. However you can choose to use the first rule instead.
 ```c++
-if (a > 0) return;
+a = myFunction();
+b = a * 1500;

-while (p)
-{
-    // ...
-    if (!b) continue;
-}
+if (b > 0) return;
+c = 100 / b;
 ```

-### f. Acceptable conditions to omit braces
+#### c. Using curly braces for single statement if blocks ####

-When the conditional statement in `if`/`else` has only one line and its body occupy only one line,
-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.
+However, there are cases where curly braces for single statement if blocks **should** be used.
+* If some branch needs braces then all others should use them. Unless you have multiple `else if` in a row and the one needing the braces is only for a very small sub-block of code.
+* Another exception would be when we have nested if blocks or generally multiple levels of code that affect code readability.

-```c++
-if (a < b)  // conditional statement
-    do(a);  // body
-
-if (a < b)
-    do(a);
-else if (a > b)
-    do(b);
-else
-    do(c);
-
-if (a < b)
-{
-    do(a);
-}
-else if (a > b)
-{
-    // curly braces required here, then all branches should also add them
-    do(b);
-    do(d);
-}
-else
-{
-    do(c);
-}
-```
-
-### g. Brace enclosed initializers
-
-Unlike single-line functions, you must not insert spaces between the brackets and concluded expressions. \
-But you must insert a space between the variable name and initializer.
-
-```c++
-Class obj {}; // empty
-Class obj {expr};
-Class obj {expr1, /*...,*/ exprN};
-QVariantMap map {{"key1", 5}, {"key2", 10}};
-```
-
-## 2. Indentation
+Generally it will depend on the particular piece of code and would be determined on how readable that piece of code is. **If in doubt** always use braces if one of the above exceptions applies.

+### 3. Indentation###
 4 spaces.

-## 3. File encoding and line endings
+### 4. File encoding and line endings.###

-UTF-8 and Unix-like line ending (LF). Unless some platform specific files need other encodings/line endings.
-
-## 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.
+UTF-8 and Unix-like line ending (LF). Unless some platform speficic files need other encodings/line endings.

+### 5. Initialization lists.###
+Initialization lists should be vertical. This will allow for more easily readable diffs. The inilization colon should be indented and in its own line along with first argument. The rest of the arguments should be indented too and have the comma prepended.
 ```c++
 myClass::myClass(int a, int b, int c, int d)
-    : m_a {a}
-    , m_b {b}
-    , m_c {c}
-    , m_d {d}
+    : priv_a(a)
+    , priv_b(b)
+    , priv_c(c)
+    , priv_d(d)
 {
    //code
 }
 ```

-## 5. Enums
-
+### 6. Enums.###
 Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
-
 ```c++
-enum Days
+enum days
 {
    Monday,
    Tuesday,
@@ -260,135 +149,7 @@ enum Days
 };
 ```

-## 6. Names
-
-All names should be camelCased.
-
-### a. Type names and namespaces
-
-Type names and namespaces start with Upper case letter (except POD types).
-
-```c++
-class ClassName {};
-
-struct StructName {};
-
-enum EnumName {};
-
-typedef QList<ClassName> SomeList;
-
-namespace NamespaceName
-{
-}
-```
-
-### b. Variable names
-
-Variable names start with lower case letter.
-
-```c++
-int myVar;
-```
-
-### c. Private member variable names
-
-Private member variable names start with lower case letter and should have ```m_``` prefix.
-
-```c++
-class MyClass
-{
-    int m_myVar;
-}
-```
-
-## 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.
-
-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
-
-// Module header
-#include "examplewidget.h"
-
-// exceptions, headers containing version number
-#include <boost/version.hpp>
-#include <libtorrent/version.hpp>
-#include <QtGlobal>
-
-// C++ Standard Library headers
-#include <cstdio>
-
-#ifdef Q_OS_WIN  // conditional
-#include <cmath>
-#endif
-
-// System headers
-#ifdef Q_OS_WIN
-#include <Windows.h>
-#endif
-
-// Boost library headers
-#include <boost/circular_buffer.hpp>
-
-// Libtorrent headers
-#include <libtorrent/session.hpp>
-
-// Qt headers
-#include <QString>
-#include <QUrl>
-
-#ifdef Q_OS_MACOS  // conditional
-#include <QFont>
-#endif
-
-// conditional that contains headers from several different header groups
-#if LIBTORRENT_VERSION_NUM >= 10100
-#include <memory>
-#include <QElapsedTimer>
-#endif
-
-// qBittorrent's own headers
-#include "base/bittorrent/infohash.h"
-#include "anothermodule.h"
-#include "ui_examplewidget.h"
-```
-
-## 8. Include guard
-
-`#pragma once` must be used instead of a "classic include guard":
-
-```c++
-// examplewidget.h
-
-#pragma once
-
-#include <QWidget>
-
-class ExampleWidget : public QWidget
-{
-    // (some code omitted)
-};
-
-```
-
-## 9. Misc
+### 7. Misc.###

 * Line breaks for long lines with operation:

@@ -398,66 +159,12 @@ class ExampleWidget : public QWidget
  + "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:
+* Space around operations eg `a = b + c` or `a=b+c`:

+Before and after the assignment there should be a space. One exception could be: for loops.
 ```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 (int a=0; a<b; ++b) {
 }
-    }
-
-    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
-    ```
-
-  * 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;
-    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
 ```

 * private/public/protected must not be indented
@@ -466,18 +173,5 @@ class ExampleWidget : public QWidget

 * Method definitions aren't allowed in header files

-## 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
-4. Do not end the subject line with a period
-5. Use the imperative mood in the subject line (it's like you're ordering the program to do something (e.g. "Don't create temporary substrings")
-6. Wrap the body at 72 characters
-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. \
-*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.*
+###8. Not covered above###
+If something isn't covered above, just follow the same style the file you are editing has. If that particular detail isn't present in the file you are editing, then use whatever the rest of the project uses.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,211 +0,0 @@
-# How to contribute to qBittorrent
-
-There are three main ways to contribute to the project.
-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)**
-
-# Bug reporting etiquette
-
-*   Issues, pull requests, and comments must always be in **English.**
-
-*   This project is supported by volunteers, do not expect "customer support"-style interaction.
-
-*   **Be patient.** The development team is small and resource limited. Developers and contributors take from their free time to analyze the problem and fix the issue. :clock3:
-
-*   Harsh words or threats won't help your situation. What's worse, your complain will (very likely) be **ignored.** :fearful:
-
-# Submitting an issue/bug report
-
-This section guides you through submitting an issue/bug report for qBittorrent.
-
-Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports.
-
-Make sure to follow these rules carefully when submitting a bug report. Failure to do so will result in the issue being closed.
-
-## What is an actual bug report?
-
-Developers and contributors are not supposed to deal with issues for which little to no investigation to find the actual cause of a purported issue was made by the reporter.
-
-Positive contributions are those which are reported with efforts to find the actual cause of an issue, or at the very least efforts were made to narrow it as much as possible.
-
-Requiring people to investigate as much as possible before opening an issue will more than likely avoid burdening the project with invalid issues or issues unrelated to qBittorrent.
-
-The following are _not_ bug reports. **Check the [wiki][wiki-url], [forum][forum-url] or other places for help and support for issues like these**:
-
-   Explanation of qBittorrent options (see [wiki][wiki-url]).
-   Help with WebUI setup.
-   Help with embedded tracker setup.
-   Help about BitTorrent in general.
-   Issues with specific search plugins.
-   Asking for specific builds of qBittorrent other than the current one. You can install older releases at your own risk or for regression testing purposes. Previous Windows and macOS builds are available [here][builds-url].
-    -   If you want older Linux builds, you will have to compile them yourself from the corresponding commits, or ask someone on the [forum][forum-url] to do it for you.
-   Possibly others. Read on and use common sense.
-
-The issue tracker is for provable issues only: You will have to make the case that the issue is really with qBittorrent and not something else on your side.
-
-To make a case means to provide detailed steps so that anybody can reproduce the issue.
-Be sure to rule out that the issue is not caused by something specific on your side.
-
-Issue reports for bugs that apparently aren't easily reproducible or that you can't figure out what triggers it even though you tried are OK.
-
-Any issue opened without effort to provide the required details for developers, contributors or anybody else to reproduce the problem will be closed as invalid.
-For example:
-   Crash reports with just a stack trace.
-   Speculated performance issues that do not come with actual profiling data + analysis supporting the claim.
-
-## Before submitting a bug report
-
-   **Do some basic troubleshooting (examples)**:
-    -   Restart qBittorrent.
-    -   Restart your PC.
-    -   Update your OS (e.g. Windows updates).
-    -   Update your network card drivers.
-    -   Fully reinstall qBittorrent.
-    -   etc...
-   Make sure the problem is not caused by anti-virus or other program messing with your files.
-   Check if you can reproduce the problem in the latest version of qBittorrent.
-   **Check [forum][forum-url] and [wiki][wiki-url].** You might be able to find the cause of the problem and fix things yourself.
-   **Check if the issue exists already in the issue tracker.**
-    -   If it does and the issue is still open, add a comment to the existing issue instead of opening a new one.
-    -   If you find a Closed issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
-   If the issue is with the search functionality:
-    -   **Make sure you have [`python`][python-url] installed correctly (remember the search functionality requires a working python installation).**
-    -   Make sure it is in fact a problem with the search functionality itself, and not a problem with the plugins. If something does not work properly with the search functionality, the first step is to rule out search plugin-related issues.
-        -   For search plugin issues, report on the respective search plugin support page, or at [qbittorrent/search-plugins][search-plugins-url].
-
-## Steps to ensure a good bug report
-
-**Follow these guidelines** in order to provide as much useful information as possible right away. Not all of them are applicable to all issues, but you are expected to follow most of these steps (use common sense).
-Otherwise, we've noticed that a lot of your time (and the developers') gets thrown away on exchanging back and forth to get this information.
-
-*   Use a **clear and descriptive title** for the issue to identify the problem.
-
-*   Post only **one specific issue per submission.**
-
-*   **Fill out the issue template properly.**
-
-   **Make sure you are using qBittorrent on a supported platform.** Do not submit issues which can only be reproduced on beta/unsupported releases of supported operating systems (e.g. Windows 10 Insider, Ubuntu 12.04 LTS, etc).
-These are unstable/unsupported platforms, and in all likelihood, whatever the issue is, it is not related to qBittorrent.
-
-*   **Specify the OS you're using, its version and architecture.**
-    *   Examples: Windows 8.1 32-bit, Linux Mint 17.1 64-bit, Windows 10 Fall creators Update 64-bit, etc.
-
-
-*   **Report only if you run into the issue with an official stable release, a beta release, or with the most recent upstream changes (in this last case specify the specific commit you are on).** (beta testing is encouraged :smile:). We do not provide support for bugs on unofficial Windows builds.
-
-*   **Specify the version of qBittorrent** you are using, as well as its **architecture** (x86 or x64) and its **libraries' versions** (Help -> About -> Libraries).
-
-*   Specify **how you installed**:
-    -   Linux: either from the PPA, your distribution's repositories, or compiled from source, or even possibly third-party repositories.
-    -   Windows: either from the installer, or compiled from source, or even possibly third-party repositories.
-    -   macOS: either from the installer, or compiled from source, or even possibly third-party repositories.
-
-
-*   **Describe the exact steps which reproduce the problem in as many details as possible.**
-    -   For example, start by explaining how you started qBittorrent, e.g. was it via the terminal? Desktop icon? Did you start it as root or normal user?
-    -   **When listing steps, don't just say what you did, but explain how you did it.**
-        -   For example, if you added a torrent for download, did you do so via a `.torrent` file or via a magnet link? If it was with a torrent file did you do so by dragging the torrent file from the file manager to the transfer list, or did you use the "Add Torrent File" in the Top Bar?
-    -   Describe the behavior you observed after following the steps and point out what exactly is the problem with that behavior; this is what we'll be looking for after executing the steps.
-
-
-*   **Explain which behavior you expected to see instead** and why.
-
-*   Use **screenshots/animated GIFs to help describe the issue** whenever appropriate [(How?)][attachments-howto-url].
-
-*   If the problem wasn't triggered by a specific action, describe what you were doing before the problem happened.
-
-*   **If you are reporting that qBittorrent crashes**, include the stack trace in the report; include it in a code block, a file attachment, or put it in a gist and provide link to that gist.
-
-*   **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`
-    -   Windows: `%LocalAppData%\qBittorrent\logs`
-    -   macOS: `~/Library/Application Support/qBittorrent/qBittorrent.log`
-
-
-*   **Do NOT post comments like "+1" or "me too!"** without providing new relevant info on the issue. Using the built-in reactions is OK though. Remember that you can use the "subscribe" button to receive notifications of that report without having to comment first.
-
-*   If there seems to be an **issue with specific torrent files/magnet links**:
-    -   Don't post private `.torrent` files/magnet links, or ones that point to copyrighted content. If you are willing, offer to email a link or the `.torrent` file itself to whoever developer is debugging it and requests it.
-    -   Make sure you can't reproduce the problem with another client, to rule out the possibility that the issue is with the `.torrent` file/magnet link itself.
-
-
-*   A screenshot, transcription or file upload of any of **qBittorrent's preferences that differ from the defaults.** Please include everything different from the defaults whether or not it seems relevant to your issue.
-
-*   **Attachment rules**:
-    -   Short logs and error messages can be pasted as quotes/code whenever small enough; otherwise make a gist with the contents and post the link to the gist.
-    -   Avoid linking/attaching impractical file formats such as PDFs/Word documents with images. If you want to post an image, just post the image.
-
-### Provide more context by answering these questions (if applicable):
-
-   Can you **reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens (e.g. only happens with extremely large torrents/only happens after qBittorrent is open for more than 2 days/etc...)
-
-   Did the problem start happening recently (e.g. after updating to a new version of qBittorrent) or was this always a problem?
-
-   If the problem started happening recently, can you reproduce the problem in an older version of qBittorrent?
-
-   Are you saving files locally (in a disk in your machine), or are you saving them remotely (e.g. network drives)?
-
-   Are you using qBittorrent with multiple monitors? If so, can you reproduce the problem when you use a single monitor?
-
-Good read: [How to Report Bugs Effectively][howto-report-bugs-url]
-
-# Suggesting enhancements/feature requests
-
-This section guides you through submitting an enhancement suggestion for qBittorrent, including completely new features and minor improvements to existing functionality.
-
-Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions.
-
-## Before submitting an enhancement/feature request
-
-*   Check the [wiki][wiki-url] and [forum][forum-url] for tips — you might discover that the enhancement is already available.
-*   Most importantly, check if you're using the latest version of qBittorrent and if you can get the desired behavior by changing qBittorrent's settings.
-*   Check in the [releases][releases-url] page or on the [forum][forum-url], see if there's already a alpha/beta version with that enhancement.
-*   Perform a cursory search to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
-
-## Steps to ensure a good enhancement/feature suggestion
-
-   Specify which version of qBittorrent you're using.
-   Specify the name and version of the OS you're using.
-   Provide a step-by-step description of the suggested enhancement in as many details as possible.
-   Describe the current behavior and explain which behavior you expected to see instead and why.
-   Include screenshots and animated GIFs which help you demonstrate the steps or point out the part of qBittorrent which the suggestion is related to.
-   If this enhancement exists in other BitTorrent clients, list those clients.
-
-# Opening a pull request
-
-*   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).
-
-[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-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
-[wiki-url]: https://github.com/qbittorrent/qBittorrent/wiki
--- a/22
+++ b/22
@@ -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,15 +10,13 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -32,7 +29,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 Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
@@ -320,9 +317,10 @@ the "copyright" line and a pointer to where the full notice is found.
    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.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+

 Also add information on how to contact you by electronic and paper mail.

@@ -352,5 +350,5 @@ necessary.  Here is a sample; alter the names:
 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
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
--- a/2098
+++ b/2098
--- a/75
+++ b/75
@@ -1,49 +1,58 @@
-qBittorrent - A BitTorrent client in C++ / Qt
+qBittorrent - A BitTorrent client in C++ / Qt4
 ------------------------------------------

-1) Install these dependencies:
-
-  - Boost >= 1.65
-
-  - 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.1.1
-
-  - Qt 5.15.2 - 5.x || 6.2.0 - 6.x
-
-  - zlib >= 1.2.11
-
-  - pkg-config *
-      * Compile-time only on *nix systems
-
-  - 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
+1) Compile and install qBittorrent with Qt4 Graphical Interface

  $ ./configure
  $ make && make install
  $ qbittorrent

-  will install and execute qBittorrent.
+  will install and execute qBittorrent hopefully without any problems.

-2b) Compile and install qBittorrent without Qt graphical interface
+  Dependencies:
+    - Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)
+
+    - pkg-config executable
+
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.15.0)
+        -> http://www.libtorrent.net
+        Be careful: another library (the one used by rTorrent) uses a similar name.
+
+    - libboost 1.34.x (libboost-filesystem°) + libasio
+      or
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem°)
+      
+    °libboost-filesystem is not needed if libtorrent-rasterbar >= v0.16.x is used
+
+    - python >= 2.3 (needed by search engine)
+        * Run time only dependency
+
+    - geoip-database (optional)
+        * If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
+        * Run time only dependency
+
+2) Compile and install qBittorrent without Qt4 Graphical interface

  $ ./configure --disable-gui
  $ make && make install
-  $ qbittorrent-nox
+  $ qbittorrent
+
+  will install and execute qBittorrent hopefully without any problems.
+
+  Dependencies:
+    - Qt >= 4.4.0 (libqt-devel, libqtcore, libqtnetwork)
+
+    - pkg-config executable
+
+    - libtorrent-rasterbar by Arvid Norberg (>= v0.15.0)
+        -> http://www.libtorrent.net
+        Be careful: another library (the one used by rTorrent) uses a similar name.
+
+    - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization

-  will install and execute qBittorrent.

 DOCUMENTATION:
-Please note that there is a "Compilation" section at http://wiki.qbittorrent.org.
+Please note that there is a documentation with a "compiling howto" at http://wiki.qbittorrent.org.

 ------------------------------------------
-sledgehammer999 <sledgehammer999@qbittorrent.org>
+Christophe Dumez <chris@qbittorrent.org>
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
 qBittorrent - A BitTorrent client in Qt
 ------------------------------------------

-[![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)
+[![Build Status](https://travis-ci.org/qbittorrent/qBittorrent.png?branch=master)](https://travis-ci.org/qbittorrent/qBittorrent)
 ********************************
 ###Description:
 qBittorrent is a bittorrent client programmed in C++ / Qt that uses
@@ -13,7 +11,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
+http://maxmind.com/

 ### Installation:
 For installation, follow the instructions from INSTALL file, but simple:
@@ -26,27 +25,18 @@ qbittorrent

 will install and execute qBittorrent hopefully without any problem.

-### Public key:
-Starting from v3.3.4 all source tarballs and binaries are signed.<br />
-The key currently used is 4096R/[5B7CC9A2](https://pgp.mit.edu/pks/lookup?op=get&search=0x6E4A2D025B7CC9A2) with fingerprint `D8F3DA77AAC6741053599C136E4A2D025B7CC9A2`.<br />
-You can also download it from [here](https://github.com/qbittorrent/qBittorrent/raw/master/5B7CC9A2.asc).<br />
-**PREVIOUSLY** the following key was used to sign the v3.3.4 source tarballs and v3.3.4 Windows installer **only**: 4096R/[520EC6F6](https://pgp.mit.edu/pks/lookup?op=get&search=0xA1ACCAE4520EC6F6) with fingerprint `F4A5FD201B117B1C2AB590E2A1ACCAE4520EC6F6`.<br />
-
-### Misc:
 For more information please visit:
-https://www.qbittorrent.org
+http://www.qbittorrent.org

 or our wiki here:
 http://wiki.qbittorrent.org

-Use the forum for troubleshooting before reporting bugs:
-http://forum.qbittorrent.org
-
 Please report any bug (or feature request) to:
 http://bugs.qbittorrent.org

-Official IRC channel:
-[#qbittorrent on irc.libera.chat](ircs://irc.libera.chat:6697/qbittorrent)
+You can also meet me (sledgehammer_999) on IRC:
+`#qbittorrent on irc.freenode.net`

 ------------------------------------------
-sledgehammer999 \<sledgehammer999@qbittorrent.org\>
+sledgehammer999 <sledgehammer999@qbittorrent.org>
+
--- a/README.os2
+++ b/README.os2
@@ -0,0 +1,74 @@
+qBittorrent - A BitTorrent client in Qt4
+------------------------------------------
+
+This is the eComStation (OS/2) qBittorrent part of the readme. See also README for more general information.
+
+
+Building qBittorrent
+********************
+
+
+Requirements
+============
+
+- gcc based build env (recommended gcc v4.4.2 or greater)
+  
+- Qt4 for eCS (OS/2) dev package (see http://svn.netlabs.org/qt4 for more information)
+
+- libtorrent-rasterbar for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
+
+- boost for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
+
+
+How to build
+============
+
+First you need to create the conf.pri file in the same dir as this readme.os2 is.
+the conf.pri file has the following content:
+
+##### conf.pri content beginn #####
+BINDIR = ./bin
+INCDIR = ./include
+LIBDIR = ./lib
+DATADIR = ./share
+
+CONFIG += staticlib
+INCLUDEPATH += x:/trees/libtorrent/trunk/include
+LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
+        -Lx:/trees/boost/trunk/stage/lib \
+        -Lx:/trees/openssl \
+	-Lx:/extras/lib
+##### conf.pri content end #####
+
+Of course all the above path references have to be adjusted to your build env.
+
+Now you can either do a normal build or a shadow build. A shadow build has the
+advantage that no created files are in the same dir as the sources are.
+
+For a normal build do the following:
+
+Simply type:
+$ qmake
+
+Followed by:
+$ make
+
+For a shadow build do the following:
+given your sources are in x:\trees\qbittorrent\trunk create a 
+x:\trees\qbittorrent\build directory
+
+Now switch to the created directory and type:
+$ qmake ..\trunk
+
+Followed by:
+$ make
+
+If all works fine you should get a working qbittorrent executable.
+
+If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC:
+#netlabs on irc.freenode.net
+
+------------------------------------------
+Silvan Scherrer <silvan.scherrer@aroa.ch>
+
+
--- a/1
+++ b/1
@@ -1 +1,2 @@
 See https://blueprints.launchpad.net/qbittorrent/
+
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 aclocal -I m4
 autoconf
--- a/build-aux/compile
+++ b/build-aux/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.

-scriptversion=2018-03-07.03; # UTC
+scriptversion=2012-10-14.11; # UTC

-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2018-03-07.03; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -255,8 +255,7 @@ EOF
    echo "compile $scriptversion"
    exit $?
    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
-  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
    func_cl_wrapper "$@"      # Doesn't return...
    ;;
 esac
@@ -340,9 +339,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile

-scriptversion=2018-03-11.20; # UTC
+scriptversion=2013-12-25.23; # UTC

 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,18 +271,15 @@ do
    fi
    dst=$dst_arg

-    # If destination is a directory, append the input filename.
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
    if test -d "$dst"; then
      if test "$is_target_a_directory" = never; then
        echo "$0: $dst_arg: Is a directory" >&2
        exit 1
      fi
      dstdir=$dst
-      dstbase=`basename "$src"`
-      case $dst in
-	*/) dst=$dst$dstbase;;
-	*)  dst=$dst/$dstbase;;
-      esac
+      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
      dstdir=`dirname "$dst"`
@@ -291,11 +288,6 @@ do
    fi
  fi

-  case $dstdir in
-    */) dstdirslash=$dstdir;;
-    *)  dstdirslash=$dstdir/;;
-  esac
-
  obsolete_mkdir_used=false

  if test $dstdir_status != 0; then
@@ -332,43 +324,34 @@ do
            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
            ;;
          *)
-            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
-            # here however when possible just to lower collision chance.
            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0

-            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-            # Because "mkdir -p" follows existing symlinks and we likely work
-            # directly in world-writeable /tmp, make sure that the '$tmpdir'
-            # directory is successfully created first before we actually test
-            # 'mkdir -p' feature.
            if (umask $mkdir_umask &&
-                $mkdirprog $mkdir_mode "$tmpdir" &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
            then
              if test -z "$dir_arg" || {
                   # Check for POSIX incompatibilities with -m.
                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
                   # other-writable bit of parent directory when it shouldn't.
                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   test_tmpdir="$tmpdir/a"
-                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
                   case $ls_ld_tmpdir in
                     d????-?r-*) different_mode=700;;
                     d????-?--*) different_mode=755;;
                     *) false;;
                   esac &&
-                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
                   }
                 }
              then posix_mkdir=:
              fi
-              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+              rmdir "$tmpdir/d" "$tmpdir"
            else
              # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
            fi
            trap '' 0;;
        esac;;
@@ -444,8 +427,8 @@ do
  else

    # Make a couple of temp file names in the proper directory.
-    dsttmp=${dstdirslash}_inst.$$_
-    rmtmp=${dstdirslash}_rm.$$_
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_

    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@@ -510,9 +493,9 @@ do
 done

 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/build-aux/missing
+++ b/build-aux/missing
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.

-scriptversion=2018-03-07.03; # UTC
+scriptversion=2013-10-28.13; # UTC

-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.

 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2018-03-07.03; # UTC
 # GNU General Public License for more details.

 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@ else
  exit $st
 fi

-perl_URL=https://www.perl.org/
-flex_URL=https://github.com/westes/flex
-gnu_software_URL=https://www.gnu.org/software
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software

 program_details ()
 {
@@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
 exit $st

 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/build_dist.sh
+++ b/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"
--- a/cmake/Modules/FeatureOptionsSetup.cmake
+++ b/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()
--- a/cmake/Modules/FindSystemd.cmake
+++ b/cmake/Modules/FindSystemd.cmake
@@ -1,26 +0,0 @@
-#######
-# Find systemd service dir
-# sets variables
-# SYSTEMD_FOUND
-# SYSTEMD_SERVICES_INSTALL_DIR
-
-find_package(PkgConfig QUIET REQUIRED)
-
-if (NOT SYSTEMD_FOUND)
-    pkg_check_modules(SYSTEMD "systemd")
-endif()
-
-if (SYSTEMD_FOUND AND "${SYSTEMD_SERVICES_INSTALL_DIR}" STREQUAL "")
-    execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE}
-        --variable=systemdsystemunitdir systemd
-        OUTPUT_VARIABLE SYSTEMD_SERVICES_INSTALL_DIR)
-    string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_SERVICES_INSTALL_DIR
-        "${SYSTEMD_SERVICES_INSTALL_DIR}")
-elseif (NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR)
-    message (FATAL_ERROR "Variable SYSTEMD_SERVICES_INSTALL_DIR is\
-        defined, but we can't find systemd using pkg-config")
-endif()
-
-if (SYSTEMD_FOUND)
-    message(STATUS "systemd services install dir: ${SYSTEMD_SERVICES_INSTALL_DIR}")
-endif()
--- a/cmake/Modules/MacroQbtCommonConfig.cmake
+++ b/cmake/Modules/MacroQbtCommonConfig.cmake
@@ -1,102 +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 "Darwin")
-        target_compile_definitions(qbt_common_cfg INTERFACE
-            _DARWIN_FEATURE_64_BIT_INODE
-        )
-    endif()
-
-    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()
-
-    if (LibtorrentRasterbar_VERSION VERSION_GREATER_EQUAL ${minLibtorrentVersion})
-        target_compile_definitions(qbt_common_cfg INTERFACE QBT_USES_LIBTORRENT2)
-    endif()
-endmacro(qbt_common_config)
--- a/codingStyleQtCreator.xml
+++ b/codingStyleQtCreator.xml
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorCodeStyle>
-<!-- Written by QtCreator 3.2.82, 2014-11-26T02:08:28. -->
-<qtcreator>
- <data>
-  <variable>CodeStyleData</variable>
-  <valuemap type="QVariantMap">
-   <value type="bool" key="AlignAssignments">true</value>
-   <value type="bool" key="AutoSpacesForTabs">false</value>
-   <value type="bool" key="BindStarToIdentifier">false</value>
-   <value type="bool" key="BindStarToLeftSpecifier">true</value>
-   <value type="bool" key="BindStarToRightSpecifier">false</value>
-   <value type="bool" key="BindStarToTypeName">true</value>
-   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">false</value>
-   <value type="bool" key="IndentAccessSpecifiers">false</value>
-   <value type="bool" key="IndentBlockBody">true</value>
-   <value type="bool" key="IndentBlockBraces">false</value>
-   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
-   <value type="bool" key="IndentClassBraces">false</value>
-   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
-   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
-   <value type="bool" key="IndentEnumBraces">false</value>
-   <value type="bool" key="IndentFunctionBody">true</value>
-   <value type="bool" key="IndentFunctionBraces">false</value>
-   <value type="bool" key="IndentNamespaceBody">true</value>
-   <value type="bool" key="IndentNamespaceBraces">false</value>
-   <value type="int" key="IndentSize">4</value>
-   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
-   <value type="bool" key="IndentSwitchLabels">false</value>
-   <value type="int" key="PaddingMode">1</value>
-   <value type="bool" key="SpacesForTabs">true</value>
-   <value type="int" key="TabSize">4</value>
-  </valuemap>
- </data>
- <data>
-  <variable>DisplayName</variable>
-  <value type="QString">qBittorrent</value>
- </data>
-</qtcreator>
--- a/conf.pri.in
+++ b/conf.pri.in
@@ -5,19 +5,9 @@ BINDIR = @EXPAND_BINDIR@
 DATADIR = @EXPAND_DATADIR@
 MANPREFIX = @EXPAND_MANDIR@

-QMAKE_CC = @QBT_CC@
-QMAKE_CXX = @QBT_CXX@
 QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
-
-EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@
-EXTERNAL_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS
-# added /usr/local/include due to Qt 5.7.0 bug on macOS
-macx: EXTERNAL_INCLUDES += "/usr/local/include"
-INCLUDEPATH += $$EXTERNAL_INCLUDES
-
-EXTERNAL_LIBS = @LDFLAGS@ @LIBS@
-EXTERNAL_LIBS -= $$QMAKE_DEFAULT_LIBDIRS
-LIBS += $$EXTERNAL_LIBS
+INCLUDEPATH += @QBT_CONF_INCLUDES@
+LIBS += @LDFLAGS@ @LIBS@

 CONFIG += @QBT_ADD_CONFIG@
 CONFIG -= @QBT_REMOVE_CONFIG@
--- a/conf.pri.windows
+++ b/conf.pri.windows
@@ -1,58 +0,0 @@
-# Adapt these paths
-# Point these to the include folders
-INCLUDEPATH += $$quote(C:/qBittorrent/boost)
-INCLUDEPATH += $$quote(C:/qBittorrent/libtorrent/include)
-INCLUDEPATH += $$quote(C:/qBittorrent/zlib/include)
-INCLUDEPATH += $$quote(C:/qBittorrent/openssl/include)
-# Point these to the lib folders
-LIBS += $$quote(-LC:/qBittorrent/boost/stage/lib)
-LIBS += $$quote(-LC:/qBittorrent/libtorrent/lib)
-LIBS += $$quote(-LC:/qBittorrent/zlib/lib)
-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
-}
-else {
-    LIBS += boost_system-vc140-mt.lib
-}
-
-# ...or if you use MinGW
-#LIBS += libcrypto libssl libz
-#CONFIG(debug, debug|release) {
-#    LIBS += libtorrent-rasterbar \
-#            libboost_system-mt
-#}
-#else {
-#    LIBS += libtorrent-rasterbar \
-#            libboost_system-mt
-#}
-
-# Disable to use Boost auto-linking
-DEFINES += BOOST_ALL_NO_LIB
-# Use one of the following options
-DEFINES += BOOST_SYSTEM_STATIC_LINK
-#DEFINES += BOOST_SYSTEM_DYN_LINK
-# Enable if encountered build error with boost version <= 1.59
-#DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES
-
-# Enable if libtorrent was built with this flag defined
-#DEFINES += TORRENT_NO_DEPRECATE
-# Enable if linking dynamically against libtorrent
-#DEFINES += TORRENT_LINKING_SHARED
-
-# Enable this if compiling with libtorrent 2.x
-#DEFINES += QBT_USES_LIBTORRENT2
-
-# Enable stack trace support
-CONFIG += stacktrace
-
-win32-msvc* {
-    QMAKE_CXXFLAGS += "/guard:cf"
-    QMAKE_LFLAGS += "/guard:cf"
-    QMAKE_LFLAGS_RELEASE += "/OPT:REF /OPT:ICF"
-}
--- a/6048
+++ b/6048
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,6 @@
-AC_INIT([qbittorrent], [v4.4.1], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v3.2.0alpha], [bugs.qbittorrent.org], [], [http://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
@@ -10,24 +8,46 @@ AC_LANG(C++)
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE

-# use compiler from env variables if available
-QBT_CC="$CC"
-QBT_CXX="$CXX"
+

 # Define --wth-* and --enable-* arguments

+AC_ARG_WITH(qt5,
+            [AS_HELP_STRING([--with-qt5],
+                            [Compile using Qt5 (default=no)])],
+            [],
+            [with_qt5=no])
+
+AC_ARG_WITH(libtorrent-rasterbar0.16,
+            [AS_HELP_STRING([--with-libtorrent-rasterbar0.16],
+                            [Compile using libtorrent-rasterbar 0.16.x series (default=no)])],
+            [],
+            [with_libtorrent_rasterbar0_16=no])
+
+AC_ARG_WITH(geoip-database-embedded,
+            [AS_HELP_STRING([--with-geoip-database-embedded],
+                            [Embed the GeoIP database in the qBittorrent executable (please follow instructions in src/geoip/README) (default=no)])],
+            [],
+            [with_geoip_database_embedded=no])
+
+AC_ARG_WITH(qtsingleapplication,
+            [AS_HELP_STRING([--with-qtsingleapplication=@<:@system|shipped@:>@],
+                            [Use the shipped qtsingleapplication library or the system one (default=shipped)])],
+            [],
+            [with_qtsingleapplication=shipped])
+
+AC_ARG_WITH(qjson,
+            [AS_HELP_STRING([--with-qjson=@<:@system|shipped@:>@],
+                            [Use the shipped qjson library or the system one (default=shipped) (Qt4 only])],
+            [],
+            [with_qjson=shipped])
+
 AC_ARG_ENABLE(debug,
              [AS_HELP_STRING([--enable-debug],
                              [Enable debug build])],
              [],
              [enable_debug=no])

-AC_ARG_ENABLE(stacktrace,
-              [AS_HELP_STRING([--enable-stacktrace],
-                              [Enable stacktrace feature (default=auto)])],
-              [],
-              [enable_stacktrace=auto])
-
 AC_ARG_ENABLE(gui,
              [AS_HELP_STRING([--disable-gui],
                              [Disable the GUI for headless running. Disables QtDBus and the GeoIP Database.])],
@@ -53,32 +73,11 @@ AC_ARG_ENABLE(qt-dbus,
              [enable_qt_dbus=yes])

 # Detect OS
-AC_MSG_CHECKING([whether to enable specific tweaks for current host "$host_os"])
-case "$host_os" in
-    *darwin*)
-        AC_MSG_RESULT([yes])
-        enable_qt_dbus=no
-        ;;
-
-    *freebsd*)
-        AC_MSG_RESULT([yes])
-        LIBS="-lexecinfo $LIBS"
-        ;;
-
-    *haiku*)
-        AC_MSG_RESULT([yes])
-        LIBS="-lnetwork $LIBS"
-        ;;
-
-    *openbsd*)
-        AC_MSG_RESULT([yes])
-        LIBS="-lexecinfo $LIBS"
-        ;;
-
-    *)
-        AC_MSG_RESULT([no])
-        ;;
-esac
+AC_MSG_CHECKING([whether OS is FreeBSD])
+AS_IF([test "x$host_os" = "x*FreeBSD*"],
+      [AC_MSG_RESULT([yes])
+      LIBS="-lexecinfo $LIBS"],
+      [AC_MSG_RESULT([no])])

 # Require 0.23 pkg-config
 PKG_PROG_PKG_CONFIG([0.23])
@@ -99,23 +98,6 @@ AS_CASE(["x$enable_debug"],
        [AC_MSG_RESULT([$enable_debug])
        AC_MSG_ERROR([Unknown option "$enable_debug". Use either "yes" or "no".])])

-AC_MSG_CHECKING([whether to enable the stacktrace feature])
-AS_CASE(["x$enable_stacktrace"],
-        ["xno"],
-              [AC_MSG_RESULT([no])
-              QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG stacktrace"],
-        ["xyes"],
-               [AC_MSG_RESULT([yes])
-               QBT_ADD_CONFIG="$QBT_ADD_CONFIG stacktrace"],
-        ["xauto"],
-                [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <execinfo.h>]])],
-                [AC_MSG_RESULT([yes])
-                QBT_ADD_CONFIG="$QBT_ADD_CONFIG stacktrace"],
-                [AC_MSG_RESULT([no])
-                QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG stacktrace"])],
-        [AC_MSG_RESULT([$enable_stacktrace])
-        AC_MSG_ERROR([Unknown option "$enable_stacktrace". Use either "yes" or "no".])])
-
 AC_MSG_CHECKING([whether to enable the GUI])
 AS_CASE(["x$enable_gui"],
        ["xyes"],
@@ -125,6 +107,7 @@ AS_CASE(["x$enable_gui"],
        ["xno"],
              [AC_MSG_RESULT([no])
              enable_qt_dbus=[no]
+              enable_geoip_database=[no]
              QBT_ADD_CONFIG="$QBT_ADD_CONFIG nogui"],
        [AC_MSG_RESULT([$enable_gui])
        AC_MSG_ERROR([Unknown option "$enable_gui". Use either "yes" or "no".])])
@@ -151,13 +134,20 @@ AS_CASE(["x$enable_webui"],
        [AC_MSG_RESULT([$enable_webui])
        AC_MSG_ERROR([Unknown option "$enable_webui". Use either "yes" or "no".])])

-FIND_QT5()
+AC_MSG_CHECKING([whether Qt5 should be enabled])
+AS_CASE(["x$with_qt5"],
+        ["xno"],
+              [AC_MSG_RESULT([no])
+              FIND_QT4()],
+        ["xyes"],
+               [AC_MSG_RESULT([yes])
+               FIND_QT5()],
+        [AC_MSG_RESULT([$with_qt5])
+        AC_MSG_ERROR([Unknown option "$with_qt5". Use either "yes" or "no".])])
 AS_IF([test "x$QT_QMAKE" = "x"],
      [AC_MSG_ERROR([Could not find qmake])
      ])
-AS_IF([test "x$enable_gui" = "xyes"],
-      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.15.2])
-      ])
+
 AC_MSG_CHECKING([whether QtDBus should be enabled])
 AS_CASE(["x$enable_qt_dbus"],
        ["xyes"],
@@ -174,70 +164,84 @@ AS_CASE(["x$enable_qt_dbus"],
        AC_MSG_ERROR([Unknown option "$enable_qt_dbus". Use either "yes" or "no".])])


-AX_BOOST_BASE([1.65],
-              [AC_MSG_NOTICE([Boost CXXFLAGS: "$BOOST_CPPFLAGS"])
-               AC_MSG_NOTICE([Boost LDFLAGS: "$BOOST_LDFLAGS"])],
-              [AC_MSG_ERROR([Could not find Boost])])
-CXXFLAGS="$BOOST_CPPFLAGS $CXXFLAGS"
-LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
+AX_BOOST_BASE([1.35])
+# HAVE_BOOST is set to an empty value when Boost is found. I don't know
+# how to test for a set vs unset variable.
+AS_IF([test "x$BOOST_CPPFLAGS" = "x"],
+      [AC_MSG_ERROR([Could not find Boost])],
+      [AC_MSG_NOTICE([Boost CPPFLGAS: $BOOST_CPPFLAGS])
+      CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
+      LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])

-# add workaround for problematic boost version
-# taken from ax_boost_base.m4
-m4_define([DETECT_BOOST_VERSION_PROGRAM],
-    [AC_LANG_PROGRAM([[#include <boost/version.hpp>]],
-                     [[(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($1))]));]])])
-
-AC_COMPILE_IFELSE([DETECT_BOOST_VERSION_PROGRAM(106000)], [],
-    [QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"])
+AX_BOOST_SYSTEM()
+# HAVE_BOOST_SYSTEM is set to an empty value when Boost.System is found.
+# I don't know how to test for a set vs unset variable.
+AS_IF([test "x$BOOST_SYSTEM_LIB" = "x"],
+      [AC_MSG_ERROR([Could not find Boost.System])],
+      [AC_MSG_NOTICE([Boost.System LIB: $BOOST_SYSTEM_LIB])
+      LIBS="$BOOST_SYSTEM_LIB $LIBS"])

+AC_MSG_CHECKING([whether to compile using libtorrent-raser 0.16.x])
+AS_CASE(["x$with_libtorrent_rasterbar0_16"],
+        ["xno"],
+              [AC_MSG_RESULT([no])
              PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 2.0.4],
-                  [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS" QBT_ADD_DEFINES="$QBT_ADD_DEFINES QBT_USES_LIBTORRENT2"],
-                  [PKG_CHECK_MODULES(libtorrent,
-                                     [libtorrent-rasterbar >= 1.2.14 libtorrent-rasterbar < 2],
-                                     [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS"])])
+                               [libtorrent-rasterbar >= 1.0.0],
+                               [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
+                               LIBS="$libtorrent_LIBS $LIBS"])],
+        ["xyes"],
+               [AC_MSG_RESULT([yes])
+               PKG_CHECK_MODULES(libtorrent,
+                                [libtorrent-rasterbar >= 0.16.0],
+                                [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
+                                LIBS="$libtorrent_LIBS $LIBS"])],
+        [AC_MSG_RESULT([$with_libtorrent_rasterbar0_16])
+        AC_MSG_ERROR([Unknown option "$with_libtorrent_rasterbar0_16". Use either "yes" or "no".])])

-PKG_CHECK_MODULES(openssl,
-                  [openssl >= 1.1.1],
-                  [CXXFLAGS="$openssl_CFLAGS $CXXFLAGS"
-                  LIBS="$openssl_LIBS $LIBS"])
+AC_MSG_CHECKING([whether to embed the GeoIP database])
+AS_CASE(["x$with_geoip_database_embedded"],
+        ["xno"],
+              [AC_MSG_RESULT([no])
+              QBT_REMOVE_DEFINES="$QBT_REMOVE_DEFINES WITH_GEOIP_EMBEDDED"],
+        ["xyes"],
+               [AC_MSG_RESULT([yes])
+               QBT_ADD_DEFINES="$QBT_ADD_DEFINES WITH_GEOIP_EMBEDDED"],
+        [AC_MSG_RESULT([$with_geoip_database_embedded])
+        AC_MSG_ERROR([Unknown option "$with_geoip_database_embedded". Use either "yes" or "no".])])
+
+AC_MSG_CHECKING([which qtsingleapplication to use])
+AS_CASE(["x$with_qtsingleapplication"],
+        ["xshipped"],
+                   [AC_MSG_RESULT([shipped])
+                   QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG usesystemqtsingleapplication"],
+        ["xsystem"],
+                  [AC_MSG_RESULT([system])
+                  QBT_ADD_CONFIG="$QBT_ADD_CONFIG usesystemqtsingleapplication"],
+        [AC_MSG_RESULT([$with_qtsingleapplication])
+        AC_MSG_ERROR([Unknown option "$with_qtsingleapplication". Use either "system" or "shipped".])])
+
+AS_IF([test "x$with_qt5" = "xno"],
+      [AC_MSG_CHECKING([which qjson to use])
+      AS_CASE(["x$with_qjson"],
+              ["xshipped"],
+                         [AC_MSG_RESULT([shipped])
+                         QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG usesystemqjson"],
+              ["xsystem"],
+                         [AC_MSG_RESULT([system])
+                         PKG_CHECK_MODULES(qjson,
+                                          [QJson >= 0.8.1],
+                                          [CPPFLAGS="$qjson_CFLAGS $CPPFLAGS"
+                                          LIBS="$qjson_LIBS $LIBS"])
+                         QBT_ADD_CONFIG="$QBT_ADD_CONFIG usesystemqjson"],
+              [AC_MSG_RESULT([$with_qjson])
+              AC_MSG_ERROR([Unknown option "$with_qjson". Use either "system" or "shipped".])])
+     ])

 PKG_CHECK_MODULES(zlib,
-                 [zlib >= 1.2.11],
-                 [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS"
+                 [zlib],
+                 [CPPFLAGS="$zlib_CFLAGS $CPPFLAGS"
                 LIBS="$zlib_LIBS $LIBS"])

-# Check if already in >= C++17 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_RESULT([yes])
-                   QBT_CXX17_FOUND="yes"],
-                  [AC_MSG_RESULT([no])
-                   QBT_CXX17_FOUND="no"])
-
-# In case of no, check if the compiler can support at least C++17
-# 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()],
-                        [AC_MSG_RESULT([yes])
-                         AC_MSG_CHECKING([if C++17 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()],
-                                           [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.])],
-                                           [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_RESULT([no])
-                         AC_MSG_ERROR([A compiler supporting C++17 is required.])])
-      ])
-CXXFLAGS="$TMP_CXXFLAGS"
-
 # These are required because autoconf doesn't expand these **particular**
 # vars automatically. And qmake cannot autoexpand them.
 AX_DEFINE_DIR([EXPAND_PREFIX], [prefix])
@@ -247,37 +251,33 @@ AX_DEFINE_DIR([EXPAND_MANDIR], [mandir])

 # Original extract() function contributed by pmzqla
 # $*: Strings to parse
-# Set $QBT_CONF_DEFINES, $QBT_CONF_INCLUDES, $QBT_CONF_EXTRA_CFLAGS
+# Set $DEFINES, $INCLUDES, $OTHER
 extract() {
  if [[ -z "$*" ]]; then
    echo "Input string required"
    return 1
  fi

-  # BSD sed needs an actual newline character in the substitute command
-  new_line='
-'
-  # Convert " -" to "\n" if not between quotes and remove possible leading white spaces
-  string=$(echo " $*" | $SED -e "s: -:\\${new_line}:g" -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[[[:space:]]]*//')
+  # Convert " -" to "\n" if not between quotes
+  string=$(echo " $*" | $SED -e 's: -:\n:g' -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g")
  SAVEIFS=$IFS
  IFS=$(printf "\n\b")
  for i in $string; do
    case "$(echo "$i" | cut -c1)" in
      '') ;;
-      D) QBT_CONF_DEFINES="$QBT_CONF_DEFINES $(echo $i | cut -c2-)";;
-      I) QBT_CONF_INCLUDES="$QBT_CONF_INCLUDES $(echo $i | cut -c2-)";;
-      *) QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS -$i";;
+      D) QBT_CONF_DEFINES="$(echo $i | cut -c2-) $QBT_CONF_DEFINES";;
+      I) QBT_CONF_INCLUDES="$(echo $i | cut -c2-) $QBT_CONF_INCLUDES";;
+      *) QBT_CONF_EXTRA_CFLAGS="-$i $QBT_CONF_EXTRA_CFLAGS";;
    esac
  done
  IFS=$SAVEIFS
 }

-extract "$CFLAGS $CXXFLAGS"
+extract $CPPFLAGS
 QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
+QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS $CXXFLAGS"

 # Substitute the values of these vars in conf.pri.in
-AC_SUBST(QBT_CC)
-AC_SUBST(QBT_CXX)
 AC_SUBST(QBT_CONF_INCLUDES)
 AC_SUBST(QBT_CONF_EXTRA_CFLAGS)
 AC_SUBST(QBT_ADD_CONFIG)
@@ -285,22 +285,22 @@ 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_OUTPUT(dist/unix/systemd/qbittorrent-nox.service)])
+

-AC_CONFIG_FILES(["$QBT_CONFIG_FILES"])
-AC_OUTPUT

 AC_MSG_NOTICE([Running qmake to generate the makefile...])
-TOPDIR="$(cd "$(dirname "$0")" && pwd)"
-$QT_QMAKE -r "$TOPDIR/qbittorrent.pro" "QMAKE_LRELEASE=$QMAKE_LRELEASE"
-qmake_ret="$?"
+CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
+
+$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro
+
+ret="$?"

 AS_ECHO()
-AS_IF([test "x$qmake_ret" != "x0"],
-      [AC_MSG_ERROR([$QT_QMAKE failed to generate the makefile])])
-
-AC_MSG_NOTICE([Good, the configure finished.])
+AS_IF([test "x$ret" = "x0"],
+      [AC_MSG_NOTICE([Good, your configure finished.])],
+      [AC_MSG_ERROR([Failed running $QT_QMAKE to generate the makefile])])
 AS_ECHO()
+
--- a/dist/CMakeLists.txt
+++ b/dist/CMakeLists.txt
@@ -1,7 +0,0 @@
-if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    add_subdirectory(mac)
-elseif (UNIX AND (NOT APPLE))
-    add_subdirectory(unix)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_subdirectory(windows)
-endif()
--- a/dist/mac/CMakeLists.txt
+++ b/dist/mac/CMakeLists.txt
@@ -1 +0,0 @@
-# empty
--- a/dist/mac/Info.plist
+++ b/dist/mac/Info.plist
@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>qBittorrent</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -25,10 +21,6 @@
 			<array>
 				<string>org.bittorrent.torrent</string>
 			</array>
-			<key>NSExportableTypes</key>
-			<array>
-				<string>org.bittorrent.torrent</string>
-			</array>
 			<key>LSIsAppleDefaultForType</key>
 			<true/>
 		</dict>
@@ -36,8 +28,6 @@
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>magnet</string>
@@ -55,19 +45,21 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.1</string>
+	<string>3.2.0</string>
+	<key>CFBundleSignature</key>
+	<string>qBit</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>qbittorrent</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.qbittorrent.qBittorrent</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>${MACOSX_DEPLOYMENT_TARGET}.0</string>
+	<string>org.qbittorrent</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSHighResolutionCapable</key>
+	<string>True</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2022 The qBittorrent project</string>
+	<string>Copyright © 2006-2015 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>
@@ -84,21 +76,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>
--- a/dist/mac/qBitTorrentDocument.icns
+++ b/dist/mac/qBitTorrentDocument.icns
--- a/dist/mac/qbittorrent_mac.icns
+++ b/dist/mac/qbittorrent_mac.icns
--- a/dist/qt-translations/qt_ar.qm
+++ b/dist/qt-translations/qt_ar.qm
--- a/dist/qt-translations/qt_bg.qm
+++ b/dist/qt-translations/qt_bg.qm
--- a/dist/qt-translations/qt_ca.qm
+++ b/dist/qt-translations/qt_ca.qm
--- a/dist/qt-translations/qt_cs.qm
+++ b/dist/qt-translations/qt_cs.qm
--- a/dist/qt-translations/qt_da.qm
+++ b/dist/qt-translations/qt_da.qm
--- a/dist/qt-translations/qt_de.qm
+++ b/dist/qt-translations/qt_de.qm
--- a/dist/qt-translations/qt_es.qm
+++ b/dist/qt-translations/qt_es.qm
--- a/dist/qt-translations/qt_eu.qm
+++ b/dist/qt-translations/qt_eu.qm
--- a/dist/qt-translations/qt_fa.qm
+++ b/dist/qt-translations/qt_fa.qm
--- a/dist/qt-translations/qt_fi.qm
+++ b/dist/qt-translations/qt_fi.qm
--- a/dist/qt-translations/qt_fr.qm
+++ b/dist/qt-translations/qt_fr.qm
--- a/dist/qt-translations/qt_gl.qm
+++ b/dist/qt-translations/qt_gl.qm
--- a/dist/qt-translations/qt_he.qm
+++ b/dist/qt-translations/qt_he.qm
--- a/dist/qt-translations/qt_hu.qm
+++ b/dist/qt-translations/qt_hu.qm
--- a/dist/qt-translations/qt_it.qm
+++ b/dist/qt-translations/qt_it.qm
--- a/dist/qt-translations/qt_ja.qm
+++ b/dist/qt-translations/qt_ja.qm
--- a/dist/qt-translations/qt_ko.qm
+++ b/dist/qt-translations/qt_ko.qm
--- a/dist/qt-translations/qt_lt.qm
+++ b/dist/qt-translations/qt_lt.qm
--- a/dist/qt-translations/qt_nl.qm
+++ b/dist/qt-translations/qt_nl.qm
--- a/dist/qt-translations/qt_pl.qm
+++ b/dist/qt-translations/qt_pl.qm
--- a/dist/qt-translations/qt_pt.qm
+++ b/dist/qt-translations/qt_pt.qm
--- a/dist/qt-translations/qt_pt_BR.qm
+++ b/dist/qt-translations/qt_pt_BR.qm
--- a/dist/qt-translations/qt_ru.qm
+++ b/dist/qt-translations/qt_ru.qm
--- a/dist/qt-translations/qt_sk.qm
+++ b/dist/qt-translations/qt_sk.qm
--- a/dist/qt-translations/qt_sl.qm
+++ b/dist/qt-translations/qt_sl.qm
--- a/dist/qt-translations/qt_sv.qm
+++ b/dist/qt-translations/qt_sv.qm
--- a/dist/qt-translations/qt_tr.qm
+++ b/dist/qt-translations/qt_tr.qm
--- a/dist/qt-translations/qt_uk.qm
+++ b/dist/qt-translations/qt_uk.qm
--- a/dist/qt-translations/qt_zh_CN.qm
+++ b/dist/qt-translations/qt_zh_CN.qm
--- a/dist/qt-translations/qt_zh_TW.qm
+++ b/dist/qt-translations/qt_zh_TW.qm
--- a/dist/qt-translations/qtbase_ar.qm
+++ b/dist/qt-translations/qtbase_ar.qm
--- a/dist/qt-translations/qtbase_bg.qm
+++ b/dist/qt-translations/qtbase_bg.qm
--- a/dist/qt-translations/qtbase_ca.qm
+++ b/dist/qt-translations/qtbase_ca.qm
--- a/dist/qt-translations/qtbase_cs.qm
+++ b/dist/qt-translations/qtbase_cs.qm
--- a/dist/qt-translations/qtbase_da.qm
+++ b/dist/qt-translations/qtbase_da.qm
--- a/dist/qt-translations/qtbase_de.qm
+++ b/dist/qt-translations/qtbase_de.qm
--- a/dist/qt-translations/qtbase_es.qm
+++ b/dist/qt-translations/qtbase_es.qm
--- a/dist/qt-translations/qtbase_fi.qm
+++ b/dist/qt-translations/qtbase_fi.qm
--- a/dist/qt-translations/qtbase_fr.qm
+++ b/dist/qt-translations/qtbase_fr.qm
--- a/dist/qt-translations/qtbase_gd.qm
+++ b/dist/qt-translations/qtbase_gd.qm
--- a/dist/qt-translations/qtbase_he.qm
+++ b/dist/qt-translations/qtbase_he.qm
--- a/dist/qt-translations/qtbase_hu.qm
+++ b/dist/qt-translations/qtbase_hu.qm
--- a/dist/qt-translations/qtbase_it.qm
+++ b/dist/qt-translations/qtbase_it.qm
--- a/dist/qt-translations/qtbase_ja.qm
+++ b/dist/qt-translations/qtbase_ja.qm
--- a/dist/qt-translations/qtbase_ko.qm
+++ b/dist/qt-translations/qtbase_ko.qm
--- a/dist/qt-translations/qtbase_lv.qm
+++ b/dist/qt-translations/qtbase_lv.qm
--- a/dist/qt-translations/qtbase_pl.qm
+++ b/dist/qt-translations/qtbase_pl.qm
--- a/dist/qt-translations/qtbase_ru.qm
+++ b/dist/qt-translations/qtbase_ru.qm
--- a/dist/qt-translations/qtbase_sk.qm
+++ b/dist/qt-translations/qtbase_sk.qm
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sledgehammer999	52f8f9beb4	Bump to 3.2.0	2015-05-10 04:20:19 +03:00
sledgehammer999	3f110dabed	Update Transifex config file.	2015-05-10 04:20:06 +03:00
				`@@ -1 +0,0 @@`
				`custom: "https://www.qbittorrent.org/donate.php"`
				`@@ -1 +1,2 @@`
				`See https://blueprints.launchpad.net/qbittorrent/`