Bump to 4.1.0

.appveyor.yml

@@ -3,7 +3,7 @@ version: '{branch}-{build}'
 # Do not build on tags (GitHub only)
 skip_tags: true
 
-image: Visual Studio 2022
+image: Visual Studio 2017
 
 branches:
   except:  # blacklist
@@ -13,8 +13,8 @@ environment:
   REPO_DIR: &REPO_DIR c:\qbittorrent
   CACHE_DIR: &CACHE_DIR c:\qbt_cache
 
-  QBT_VER_URL: https://builds.shiki.hu/appveyor/version_64
-  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries_64.7z
+  QBT_VER_URL: https://builds.shiki.hu/appveyor/version
+  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries.7z
 
 # project directory
 clone_folder: *REPO_DIR
@@ -37,65 +37,22 @@ install:
       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_32.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
+  - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+  - SET PATH=%PATH%;c:\qbt\qt5_32\bin;%CACHE_DIR%\jom;
   # setup project
-  - COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"
+  - COPY /Y "%CACHE_DIR%\winconf.pri" "%REPO_DIR%"
+  - COPY /Y "%CACHE_DIR%\winconf-msvc.pri" "%REPO_DIR%"
   # workarounds
-  - MKDIR "c:\qbt"
   - MKLINK /J "c:\qbt\base" "%CACHE_DIR%\base"
 
 build_script:
   - cd "%REPO_DIR%"
-  # lupdate chokes when it parses headers from system inludes, especially Boost
-  # it also chokes with the sources from src/app/qtlocalpeer (formerly qtsingleapplication)
-  # Workaround: temporarily rename them to run lupdate with the .pro file
-  - RENAME conf.pri conf.pri.temp
-  - RENAME src\app\qtlocalpeer qtlocalpeer.temp
-  - lupdate qbittorrent.pro
-  - RENAME conf.pri.temp conf.pri
-  - RENAME src\app\qtlocalpeer.temp qtlocalpeer
   - 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\libcrypto-1_1-x64.pdb" upload
-  - COPY "%CACHE_DIR%\base\bin\libssl-1_1-x64.dll" upload
-  - COPY "%CACHE_DIR%\base\bin\libssl-1_1-x64.pdb" upload
-  - COPY "%CACHE_DIR%\base\bin\torrent-rasterbar.dll" upload
-  - COPY "%CACHE_DIR%\base\bin\torrent-rasterbar.pdb" 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

.clang-tidy

@@ -1,82 +0,0 @@
-Checks: >
-  bugprone-*,
-  cert-*,
-  concurrency-*,
-  cppcoreguidelines-*,
-  misc-*,
-  modernize-*,
-  performance-*,
-  portability-*,
-  readability-*,
-  -# not applicable at all,
-  -bugprone-easily-swappable-parameters,
-  -bugprone-implicit-widening-of-multiplication-result,
-  -bugprone-macro-parentheses,
-  -cppcoreguidelines-avoid-c-arrays,
-  -cppcoreguidelines-avoid-magic-numbers,
-  -cppcoreguidelines-avoid-non-const-global-variables,
-  -cppcoreguidelines-macro-usage,
-  -cppcoreguidelines-non-private-member-variables-in-classes,
-  -cppcoreguidelines-owning-memory,
-  -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-  -cppcoreguidelines-pro-bounds-constant-array-index,
-  -cppcoreguidelines-pro-bounds-pointer-arithmetic,
-  -cppcoreguidelines-pro-type-const-cast,
-  -cppcoreguidelines-pro-type-reinterpret-cast,
-  -cppcoreguidelines-pro-type-union-access,
-  -cppcoreguidelines-pro-type-vararg,
-  -cppcoreguidelines-special-member-functions,
-  -cppcoreguidelines-virtual-class-destructor,
-  -misc-no-recursion,
-  -misc-non-private-member-variables-in-classes,
-  -misc-unused-parameters,
-  -modernize-avoid-c-arrays,
-  -modernize-pass-by-value,
-  -modernize-use-auto,
-  -modernize-use-nodiscard,
-  -modernize-use-trailing-return-type,
-  -modernize-use-using,
-  -readability-function-cognitive-complexity,
-  -readability-function-size,
-  -readability-identifier-length,
-  -readability-implicit-bool-conversion,
-  -readability-isolate-declaration,
-  -readability-magic-numbers,
-  -readability-named-parameter,
-  -readability-redundant-access-specifiers,
-  -readability-simplify-boolean-expr,
-  -readability-uppercase-literal-suffix,
-  -# only sometimes useful,
-  -bugprone-narrowing-conversions,
-  -cert-dcl58-cpp,
-  -cert-err33-c,
-  -cert-err58-cpp,
-  -clang-analyzer-core.CallAndMessage,
-  -clang-analyzer-cplusplus.NewDelete,
-  -clang-analyzer-cplusplus.NewDeleteLeaks,
-  -concurrency-mt-unsafe,
-  -cppcoreguidelines-init-variables,
-  -cppcoreguidelines-narrowing-conversions,
-  -cppcoreguidelines-prefer-member-initializer,
-  -cppcoreguidelines-pro-type-static-cast-downcast,
-  -misc-definitions-in-headers,
-  -modernize-concat-nested-namespaces,
-  -modernize-loop-convert,
-  -modernize-raw-string-literal,
-  -modernize-unary-static-assert,
-  -performance-no-automatic-move,
-  -readability-convert-member-functions-to-static,
-  -readability-else-after-return,
-  -readability-redundant-declaration,
-  -# obsoleted,
-  -cert-dcl21-cpp
-
-CheckOptions:
-  - { key: cppcoreguidelines-explicit-virtual-functions.IgnoreDestructors, value: true }
-  - { key: modernize-use-override.IgnoreDestructors, value: true }
-  - { key: performance-for-range-copy.AllowedTypes, value: "QJsonValue" }
-  - { key: performance-for-range-copy.WarnOnAllAutoCopies, value: true }
-  - { key: readability-braces-around-statements.ShortStatementLines, value: 3 }
-
-HeaderFilterRegex: ".+/src/.*\\.h"
-WarningsAsErrors: "*"

.gitattributes

@@ -1,7 +1,7 @@
 core.eol=lf
 * text eol=lf
-*.icns binary
-*.ico binary
-*.png binary
-*.qm binary
 *.zip binary
+*.png binary
+*.ico binary
+*.qm binary
+*.icns binary

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE.md

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -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 (currently only on **[Windows](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_windows.yaml?query=branch%3Amaster+event%3Apush)**) builds.
-        - Check the **[frequent/common issues list](https://github.com/qbittorrent/qBittorrent/projects/2)** and perform a **[search of the issue tracker (including closed ones)](https://github.com/qbittorrent/qBittorrent/issues)** to avoid posting a duplicate.
-        - Make sure this is not a support request or question, both of which are better suited for either the **[discussions section](https://github.com/qbittorrent/qBittorrent/discussions)**, **[forum](https://qbforums.shiki.hu/)**, or **[subreddit](https://www.reddit.com/r/qBittorrent/)**.
-        - Verify that the **[wiki](https://github.com/qbittorrent/qBittorrent/wiki)** did not contain a suitable solution either.
-        - If relevant to issue/when asked, the qBittorrent preferences file, qBittorrent.log & watched_folders.json (if using "Watched Folders" feature) must be provided.
-          See **[Where does qBittorrent save its settings?](https://github.com/qbittorrent/qBittorrent/wiki/Frequently-Asked-Questions#Where_does_qBittorrent_save_its_settings)**
-
-  - type: textarea
-    attributes:
-      label: qBittorrent & operating system versions
-      description: |
-        Qt and libtorrent-rasterbar versions are required when: 1. You are using linux. 2. You are not using an official build downloaded from our website.
-
-        Example of preferred formatting:
-        qBittorrent: 4.3.7 x64
-        Operating system: Windows 10 Pro 21H1/2009 x64
-        Qt: 5.15.2
-        libtorrent-rasterbar: 1.2.14
-      placeholder: |
-        qBittorrent:
-        Operating system:
-        Qt:
-        libtorrent-rasterbar:
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: What is the problem?
-      description: Please add the "crash report" (if encountered) or give a clear and concise description of problem.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Steps to reproduce
-      description: Please provide reliable steps to reproduce the problem.
-      placeholder: |
-        1. First step
-        2. Second step
-        3. and so on...
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add screenshots etc. (Anything that will provide more context about the problem)
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Log(s) & preferences file(s)
-      description: |
-        Add these files: qBittorrent preferences file, qBittorrent.log & watched_folders.json (if using "Watched Folders" feature).
-        See **[Where does qBittorrent save its settings?](https://github.com/qbittorrent/qBittorrent/wiki/Frequently-Asked-Questions#Where_does_qBittorrent_save_its_settings)**
-        #### Note: It's the user's responsibility to redact any sensitive information
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -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"

.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

.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
--->

.github/SUPPORT.md

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

.github/workflows/ci_file_health.yaml

@@ -1,25 +0,0 @@
-name: CI - File health
-
-on: [pull_request, push]
-
-permissions: {}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: ${{ github.head_ref != '' }}
-
-jobs:
-  ci:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Install tools
-        uses: actions/setup-python@v4
-        with:
-          python-version: "*"
-
-      - name: Check files
-        uses: pre-commit/action@v3.0.0

.github/workflows/ci_macos.yaml

@@ -1,148 +0,0 @@
-name: CI - macOS
-
-on: [pull_request, push]
-
-permissions:
-  actions: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: ${{ github.head_ref != '' }}
-
-jobs:
-  ci:
-    name: Build
-    runs-on: macos-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        libt_version: ["2.0.9", "1.2.19"]
-        qbt_gui: ["GUI=ON", "GUI=OFF"]
-        qt_version: ["5.15.2", "6.5.0"]
-        exclude:
-          - libt_version: "1.2.19"
-            qt_version: "6.5.0"
-
-    env:
-      boost_path: "${{ github.workspace }}/../boost"
-      openssl_root: /usr/local/opt/openssl@1.1
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Install dependencies
-        run: |
-          export \
-            HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 \
-            HOMEBREW_NO_INSTALL_CLEANUP=1
-          brew update > /dev/null
-          brew install \
-            cmake ninja \
-            openssl@1.1 zlib
-
-      - name: Setup ccache
-        uses: Chocobo1/setup-ccache-action@v1
-        with:
-          update_packager_index: false
-
-      - name: Install boost
-        run: |
-          curl \
-            -L \
-            -o "${{ runner.temp }}/boost.tar.bz2" \
-            "https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.bz2"
-          tar -xf "${{ runner.temp }}/boost.tar.bz2" -C "${{ github.workspace }}/.."
-          mv "${{ github.workspace }}/.."/boost_* "${{ env.boost_path }}"
-
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: ${{ matrix.qt_version }}
-          archives: qtbase qtdeclarative qtsvg qttools
-          # Not sure why Qt made a hard dependency on qtdeclarative, try removing it when Qt > 6.4.0
-
-      - 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" \
-            -DBUILD_SHARED_LIBS=OFF \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_CXX_STANDARD=17 \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DBOOST_ROOT="${{ env.boost_path }}" \
-            -Ddeprecated-functions=OFF \
-            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}"
-          cmake --build build
-          sudo cmake --install build
-
-      - name: Build qBittorrent (Qt5)
-        if: startsWith(matrix.qt_version, 5)
-        run: |
-          CXXFLAGS="$CXXFLAGS -Werror -Wno-error=deprecated-declarations" \
-          LDFLAGS="$LDFLAGS -gz" \
-          cmake \
-            -B build \
-            -G "Ninja" \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DBOOST_ROOT="${{ env.boost_path }}" \
-            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
-            -DTESTING=ON \
-            -DVERBOSE_CONFIGURE=ON \
-            -D${{ matrix.qbt_gui }}
-          cmake --build build --target qbt_update_translations
-          cmake --build build
-          cmake --build build --target check
-
-      - name: Build qBittorrent (Qt6)
-        if: startsWith(matrix.qt_version, 6)
-        run: |
-          CXXFLAGS="$CXXFLAGS -Wno-gnu-zero-variadic-macro-arguments -Werror -Wno-error=deprecated-declarations" \
-          LDFLAGS="$LDFLAGS -gz" \
-          cmake \
-            -B build \
-            -G "Ninja" \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DBOOST_ROOT="${{ env.boost_path }}" \
-            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
-            -DQT6=ON \
-            -DTESTING=ON \
-            -DVERBOSE_CONFIGURE=ON \
-            -D${{ matrix.qbt_gui }}
-          cmake --build build --target qbt_update_translations
-          cmake --build build
-          cmake --build build --target check
-
-      - name: Prepare build artifacts
-        run: |
-          # create .dmg
-          appName="qbittorrent"
-          if [ "${{ matrix.qbt_gui }}" = "GUI=OFF" ]; then
-            appName="qbittorrent-nox"
-          fi
-          pushd build
-          macdeployqt "$appName.app" -dmg -no-strip
-          popd
-          # prepare upload folder
-          mkdir upload
-          cp "build/$appName.dmg" 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@v3
-        with:
-          name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
-          path: upload

.github/workflows/ci_ubuntu.yaml

@@ -1,160 +0,0 @@
-name: CI - Ubuntu
-
-on: [pull_request, push]
-
-permissions:
-  actions: write
-  security-events: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: ${{ github.head_ref != '' }}
-
-jobs:
-  ci:
-    name: Build
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        libt_version: ["2.0.9", "1.2.19"]
-        qbt_gui: ["GUI=ON", "GUI=OFF"]
-        qt_version: ["5.15.2", "6.2.0"]
-        exclude:
-          - libt_version: "1.2.19"
-            qt_version: "6.2.0"
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install \
-            build-essential cmake ninja-build pkg-config \
-            libboost-dev libssl-dev libxkbcommon-x11-dev zlib1g-dev
-
-      - name: Setup ccache
-        uses: Chocobo1/setup-ccache-action@v1
-        with:
-          update_packager_index: false
-          ccache_options: |
-            max_size=2G
-
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: ${{ matrix.qt_version }}
-          archives: icu qtbase qtsvg qttools
-
-      - 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" \
-            -DBUILD_SHARED_LIBS=OFF \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -Ddeprecated-functions=OFF
-          cmake --build build
-          sudo cmake --install build
-
-      # to avoid scanning 3rdparty codebases, initialize it just before building qbt
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') && startsWith(matrix.qt_version, 6)
-        with:
-          config-file: ./.github/workflows/helper/codeql/cpp.yaml
-          languages: cpp
-
-      - name: Build qBittorrent (Qt5)
-        if: startsWith(matrix.qt_version, 5)
-        run: |
-          CXXFLAGS="$CXXFLAGS -Werror -Wno-error=deprecated-declarations" \
-          LDFLAGS="$LDFLAGS -gz" \
-          cmake \
-            -B build \
-            -G "Ninja" \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DCMAKE_INSTALL_PREFIX="/usr" \
-            -DTESTING=ON \
-            -DVERBOSE_CONFIGURE=ON \
-            -D${{ matrix.qbt_gui }}
-          cmake --build build --target qbt_update_translations
-          cmake --build build
-          cmake --build build --target check
-          DESTDIR="qbittorrent" cmake --install build
-
-      - name: Build qBittorrent (Qt6)
-        if: startsWith(matrix.qt_version, 6)
-        run: |
-          CXXFLAGS="$CXXFLAGS -Werror" \
-          LDFLAGS="$LDFLAGS -gz" \
-          cmake \
-            -B build \
-            -G "Ninja" \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DCMAKE_INSTALL_PREFIX="/usr" \
-            -DQT6=ON \
-            -DTESTING=ON \
-            -DVERBOSE_CONFIGURE=ON \
-            -D${{ matrix.qbt_gui }}
-          cmake --build build --target qbt_update_translations
-          cmake --build build
-          cmake --build build --target check
-          DESTDIR="qbittorrent" cmake --install build
-
-      - name: Run CodeQL analysis
-        uses: github/codeql-action/analyze@v2
-        if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') && startsWith(matrix.qt_version, 6)
-
-      - 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: 'AppImage: Prepare env'
-        run: |
-          sudo apt install libfuse2
-          wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
-          wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
-          wget https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage
-          chmod +x linuxdeploy-x86_64.AppImage
-          chmod +x linuxdeploy-plugin-qt-x86_64.AppImage
-          chmod +x linuxdeploy-plugin-appimage-x86_64.AppImage
-
-      - name: 'AppImage: Prepare nox'
-        if: matrix.qbt_gui == 'GUI=OFF'
-        run: |
-          mkdir -p qbittorrent/usr/share/icons/hicolor/scalable/apps/
-          mkdir -p qbittorrent/usr/share/applications/
-          cp dist/unix/menuicons/scalable/apps/qbittorrent.svg qbittorrent/usr/share/icons/hicolor/scalable/apps/qbittorrent.svg
-          cp .github/workflows/helper/appimage/org.qbittorrent.qBittorrent.desktop qbittorrent/usr/share/applications/org.qbittorrent.qBittorrent.desktop
-
-      - name: 'AppImage: Package'
-        run: |
-          ./linuxdeploy-x86_64.AppImage --appdir=qbittorrent --plugin qt
-          rm qbittorrent/apprun-hooks/*
-          cp .github/workflows/helper/appimage/export_vars.sh qbittorrent/apprun-hooks/export_vars.sh
-          NO_APPSTREAM=1 \
-          OUTPUT=upload/qbittorrent-CI_Ubuntu_x86_64.AppImage \
-          ./linuxdeploy-x86_64.AppImage --appdir=qbittorrent --output appimage
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: qBittorrent-CI_Ubuntu-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
-          path: upload

.github/workflows/ci_webui.yaml

@@ -1,48 +0,0 @@
-name: CI - WebUI
-
-on: [pull_request, push]
-
-permissions:
-  security-events: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: ${{ github.head_ref != '' }}
-
-jobs:
-  ci:
-    name: Check
-    runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        working-directory: src/webui/www
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Setup nodejs
-        uses: actions/setup-node@v3
-        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
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          config-file: ./.github/workflows/helper/codeql/js.yaml
-          languages: javascript
-
-      - name: Run CodeQL analysis
-        uses: github/codeql-action/analyze@v2

.github/workflows/ci_windows.yaml

@@ -1,168 +0,0 @@
-name: CI - Windows
-
-on: [pull_request, push]
-
-permissions:
-  actions: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: ${{ github.head_ref != '' }}
-
-jobs:
-  ci:
-    name: Build
-    runs-on: windows-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        libt_version: ["2.0.9", "1.2.19"]
-
-    env:
-      boost_path: "${{ github.workspace }}/../boost"
-      libtorrent_path: "${{ github.workspace }}/libtorrent"
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - 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@v10
-        with:
-          vcpkgDirectory: C:/vcpkg
-          doNotUpdateVcpkg: true  # the preinstalled vcpkg is updated regularly
-
-      - 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.82.0/source/boost_1_82_0.7z" `
-            -d "${{ runner.temp }}" `
-            -o "boost.7z"
-          7z x "${{ runner.temp }}/boost.7z" -o"${{ github.workspace }}/.."
-          move "${{ github.workspace }}/../boost_*" "${{ env.boost_path }}"
-
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: "6.5.0"
-          archives: qtbase qtsvg qttools
-
-      - 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_FLAGS=/guard:cf `
-            -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: |
-          cmake `
-            -B build `
-            -G "Ninja" `
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            -DCMAKE_CXX_FLAGS="/WX" `
-            -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 `
-            -DQT6=ON `
-            -DTESTING=ON `
-            -DVCPKG_TARGET_TRIPLET=x64-windows-static-release `
-            -DVERBOSE_CONFIGURE=ON `
-            --graphviz=build/target_graph.dot
-          cmake --build build --target qbt_update_translations
-          cmake --build build
-          cmake --build build --target check
-
-      - 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.Qt6_DIR }}/bin/Qt6Core.dll" upload
-          copy "${{ env.Qt6_DIR }}/bin/Qt6Gui.dll" upload
-          copy "${{ env.Qt6_DIR }}/bin/Qt6Network.dll" upload
-          copy "${{ env.Qt6_DIR }}/bin/Qt6Sql.dll" upload
-          copy "${{ env.Qt6_DIR }}/bin/Qt6Svg.dll" upload
-          copy "${{ env.Qt6_DIR }}/bin/Qt6Widgets.dll" upload
-          copy "${{ env.Qt6_DIR }}/bin/Qt6Xml.dll" upload
-          mkdir upload/plugins/iconengines
-          copy "${{ env.Qt6_DIR }}/plugins/iconengines/qsvgicon.dll" upload/plugins/iconengines
-          mkdir upload/plugins/imageformats
-          copy "${{ env.Qt6_DIR }}/plugins/imageformats/qico.dll" upload/plugins/imageformats
-          copy "${{ env.Qt6_DIR }}/plugins/imageformats/qsvg.dll" upload/plugins/imageformats
-          mkdir upload/plugins/platforms
-          copy "${{ env.Qt6_DIR }}/plugins/platforms/qwindows.dll" upload/plugins/platforms
-          mkdir upload/plugins/sqldrivers
-          copy "${{ env.Qt6_DIR }}/plugins/sqldrivers/qsqlite.dll" upload/plugins/sqldrivers
-          mkdir upload/plugins/styles
-          copy "${{ env.Qt6_DIR }}/plugins/styles/qwindowsvistastyle.dll" upload/plugins/styles
-          mkdir upload/plugins/tls
-          copy "${{ env.Qt6_DIR }}/plugins/tls/qschannelbackend.dll" upload/plugins/tls
-          # 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@v3
-        with:
-          name: qBittorrent-CI_Windows-x64_libtorrent-${{ matrix.libt_version }}
-          path: upload

.github/workflows/coverity-scan.yaml

@@ -1,79 +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.
-
-permissions: {}
-
-jobs:
-  coverity_scan:
-    name: Scan
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install \
-            build-essential cmake ninja-build pkg-config \
-            libboost-dev libssl-dev zlib1g-dev
-
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: "6.5.0"
-          archives: icu qtbase qtsvg qttools
-
-      - name: Install libtorrent
-        run: |
-          git clone \
-            --branch "v2.0.9" \
-            --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 \
-            -DQT6=ON \
-            -DVERBOSE_CONFIGURE=ON
-          export PATH="$(pwd)/coverity_tool/bin:$PATH"
-          cov-build --dir cov-int cmake --build build
-
-      - name: Submit the result to Coverity Scan
-        run: |
-          tar caf qbittorrent.xz cov-int
-          curl \
-            --form token="${{ secrets.COVERITY_SCAN_TOKEN }}" \
-            --form email=sledgehammer999@qbittorrent.org \
-            --form file=@qbittorrent.xz \
-            --form version="$(git rev-parse --short HEAD)" \
-            --form description="master" \
-            https://scan.coverity.com/builds?project=qbittorrent%2FqBittorrent

.github/workflows/helper/appimage/export_vars.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# this file is called from AppRun so 'root_dir' will point to where AppRun is
-root_dir="$(readlink -f "$(dirname "$0")")"
-
-# Insert the default values because after the test we prepend our path
-# and it will create problems with DEs (eg KDE) that don't set the variable
-# and rely on the default paths
-if [ -z "${XDG_DATA_DIRS}" ]; then
-    XDG_DATA_DIRS="/usr/local/share/:/usr/share/"
-fi
-
-export XDG_DATA_DIRS="${root_dir}/usr/share:${XDG_DATA_DIRS}"

.github/workflows/helper/appimage/org.qbittorrent.qBittorrent.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=qBittorrent
-Exec=qbittorrent-nox %U
-Icon=qbittorrent
-Type=Application
-Categories=Network

.github/workflows/helper/codeql/cpp.yaml

@@ -1,14 +0,0 @@
-name: "CodeQL config for C++"
-
-queries:
-  - uses: security-and-quality
-
-query-filters:
-  - exclude:
-      id: cpp/commented-out-code
-  - exclude:
-      id: cpp/include-non-header
-  - exclude:
-      id: cpp/loop-variable-changed
-  - exclude:
-      id: cpp/useless-expression

.github/workflows/helper/codeql/js.yaml

@@ -1,11 +0,0 @@
-name: "CodeQL config for Javascript"
-
-paths-ignore:
-  - "**/lib/*"
-
-queries:
-  - uses: security-and-quality
-
-query-filters:
-  - exclude:
-      id: js/superfluous-trailing-arguments

.github/workflows/helper/pre-commit/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())

.github/workflows/stale_bot.yaml

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

.gitignore

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

.pre-commit-config.yaml

@@ -1,62 +0,0 @@
-repos:
-  - repo: local
-    hooks:
-      - id: check-translation-tag
-        name: Check newline characters in <translation> tag
-        entry: .github/workflows/helper/pre-commit/check_translation_tag.py
-        language: script
-        exclude: |
-          (?x)^(
-            src/lang/.*
-          )$
-        types_or:
-          - ts
-
-  - repo: https://github.com/pre-commit/pre-commit-hooks.git
-    rev: v4.4.0
-    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/css/lib/.* |
-          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/css/lib/.* |
-          src/webui/www/private/scripts/lib/.*
-        )$
-      exclude_types:
-        - svg
-        - ts
-
-    - id: trailing-whitespace
-      name: Check trailing whitespaces
-      exclude: |
-        (?x)^(
-          src/webui/www/private/css/lib/.* |
-          src/webui/www/private/scripts/lib/.*
-        )$
-      exclude_types:
-        - ts

.travis.yml

@@ -0,0 +1,203 @@
+language: cpp
+
+os:
+  - linux
+  - osx
+osx_image: xcode7.3
+
+env:
+  matrix:
+    # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
+    #- lt_branch=dist gui=true
+    #- lt_branch=dist gui=false
+    - lt_branch=RC_1_0 gui=true build_system=cmake
+    - lt_branch=RC_1_0 gui=false build_system=cmake
+    - lt_branch=RC_1_0 gui=true build_system=qmake
+    - lt_branch=RC_1_0 gui=false build_system=qmake
+  global:
+    - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
+    - coverity_branch: coverity_scan
+
+matrix:
+  allow_failures:
+    - env: lt_branch=RC_1_0 gui=true build_system=cmake
+    - env: lt_branch=RC_1_0 gui=false build_system=cmake
+
+branches:
+  except:
+    - search_encoding_windows
+    - v2_9_x
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change
+
+cache:
+  ccache: true
+  directories:
+    - $HOME/hombebrew_cache
+
+# opt-in Ubuntu Trusty
+dist: trusty
+# container-based builds
+sudo: false
+
+addons:
+  coverity_scan:
+    project:
+      name: "qbittorrent/qBittorrent"
+      description: "Build submitted via Travis CI"
+    build_command_prepend: "./bootstrap.sh && ./configure $qbtconf"
+    build_command: make
+    branch_pattern: $coverity_branch
+    notification_email: sledgehammer999@qbittorrent.org
+  apt:
+    sources:
+      # sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
+      - ubuntu-toolchain-r-test
+      #- boost-latest
+      - sourceline: 'ppa:qbittorrent-team/qbittorrent-stable'
+      - sourceline: 'ppa:beineri/opt-qt551-trusty'
+      - sourceline: 'ppa:adrozdoff/cmake'
+    packages:
+      # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
+      - [autoconf, automake, colormake]
+      - [cmake, ninja-build]
+      - libssl-dev
+      - [libboost-dev, libboost-system-dev]
+      - libtorrent-rasterbar-dev
+      - [qt55base, qt55svg, qt55tools]
+      - [gcc-6, g++-6]
+
+before_install:
+  # only allow specific build for coverity scan, others will stop
+  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true -a "$build_system" = "qmake" ]; then exit ; fi
+
+  - shopt -s expand_aliases
+  - alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system)
+  - qbt_path="$HOME/qbt_install"
+  - |
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH=/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH"
+    else
+      qbtconf="$qbtconf --prefix="$qbt_path""
+    fi
+
+  # options for specific branches
+  - if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; fi
+  - |
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      # setup virtual display for after_success target
+      if [ "$gui" = true ]; then export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi ;
+
+      # Qt 5
+      PATH=/opt/qt55/bin:${PATH}
+
+      if [ "$build_system" = "cmake" ]; then
+          COMPILER_VERSION=6
+          export CXX="${CXX}-${COMPILER_VERSION}" CC="${CC}-${COMPILER_VERSION}"
+      fi
+    fi
+
+  # print settings
+  - echo $lt_branch
+  - echo $gui
+  - echo $build_system
+  - echo $ltconf
+  - echo $qbtconf
+
+install:
+  #- |
+    #if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      # build libtorrent from source
+      #if [ "$lt_branch" != "dist" ]; then
+        #cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch
+        #cd libtorrent && ./autotool.sh && ./configure $ltconf && make install
+      #fi
+    #fi
+  - |
+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      # dependencies
+      brew update > /dev/null
+      brew outdated "pkg-config" || brew upgrade "pkg-config"
+      brew install colormake ccache zlib qt
+      PATH="/usr/local/opt/ccache/libexec:$PATH"
+      brew link --force zlib qt
+
+      wget https://builds.shiki.hu/homebrew/version
+      if ! cmp --quiet "version" "$HOME/hombebrew_cache/version" ; then
+        echo "Cached files are different from server. Downloading new ones."
+        # First delete old files
+        rm -r "$HOME/hombebrew_cache"
+        mkdir "$HOME/hombebrew_cache"
+        cp "version" $HOME/hombebrew_cache
+        cd "$HOME/hombebrew_cache"
+        wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar.rb
+        wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.1.7+git20180422.3ede0b9c20+patched-configure.el_capitan.bottle.tar.gz
+      fi
+
+      # Copy custom libtorrent bottle to homebrew's cache so it can find and install it
+      # Also install our custom libtorrent formula by passing the local path to it
+      # These 2 files are restored from Travis' cache.
+      cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.1.7+git20180422.3ede0b9c20+patched-configure.el_capitan.bottle.tar.gz" "$(brew --cache)"
+      brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb"
+
+      if [ "$build_system" = "cmake" ]; then
+        brew outdated cmake || brew upgrade cmake
+        brew install ninja
+
+        ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
+        ln -s /usr/local/opt/qt/plugins /usr/local/plugins
+      fi
+
+      MY_CMAKE_OPENSSL_HINT="-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/"
+    fi
+  - |
+    if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
+      export use_ccache=true
+      ccache -V && ccache --show-stats && ccache --zero-stats
+    fi
+
+script:
+  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # skip usual build when running coverity scan
+  - |
+    cd "$TRAVIS_BUILD_DIR"
+    if [ "$build_system" = "cmake" ]; then
+      mkdir build
+      cd build
+      cmake -DGUI=${gui} -DCMAKE_INSTALL_PREFIX="$qbt_path" "$MY_CMAKE_OPENSSL_HINT" \
+        -G "Ninja" -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE ..
+      BUILD_TOOL="ninja"
+    fi
+    if [ "$build_system" = "qmake" ]; then
+      if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+        # For some reason for RC_1_1 we need to also specify the OpenSSL compiler/linker flags
+        # Homebrew doesn't symlink OpenSSL for security reasons
+        ./bootstrap.sh && ./configure $qbtconf CXXFLAGS="$(PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --cflags openssl)" LDFLAGS="$(PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --libs openssl)"
+        sed -i "" -e "s/^\(CC.*&&\).*$/\1 $CC/" src/Makefile  # workaround for Qt & ccache: https://bugreports.qt.io/browse/QTBUG-31034
+        sed -i "" -e "s/^\(CXX.*&&\).*$/\1 $CXX/" src/Makefile
+        sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs -Wno-inconsistent-missing-override/' src/Makefile
+      else
+        ./bootstrap.sh && ./configure $qbtconf
+      fi
+      BUILD_TOOL="make"
+    fi
+  - $BUILD_TOOL && $BUILD_TOOL install
+
+after_success:
+  - if [ "$gui" = true ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd "$qbt_path/bin" ; fi
+  - |
+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      if [ "$build_system" = "qmake" ]; then
+        macdeployqt "$TRAVIS_BUILD_DIR/src/$qbt_exe.app"
+        cd "$TRAVIS_BUILD_DIR/src/$qbt_exe.app/Contents/MacOS"
+      else
+        cd "$qbt_path/$qbt_exe.app/Contents/MacOS"
+      fi
+    fi
+  - ./$qbt_exe --version
+
+after_script:
+  - if [ "$use_ccache" = true ]; then ccache --show-stats ; fi

.tx/config

@@ -1,24 +1,19 @@
 [main]
 host = https://www.transifex.com
 
-[o:sledgehammer999:p:qbittorrent:r:qbittorrent_master]
-file_filter  = src/lang/qbittorrent_<lang>.ts
-source_file  = src/lang/qbittorrent_en.ts
-source_lang  = en
-type         = QT
+[qbittorrent.qbittorrent_master]
+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
-lang_map     = pt: pt_PT, zh: zh_CN
+mode = developer
 
-[o:sledgehammer999:p:qbittorrent:r:qbittorrent_webui]
-file_filter  = src/webui/www/translations/webui_<lang>.ts
-source_file  = src/webui/www/translations/webui_en.ts
-source_lang  = en
-type         = QT
-minimum_perc = 23
-lang_map     = pt: pt_PT, zh: zh_CN
 
-[o:sledgehammer999:p:qbittorrent:r:qbittorrentdesktop_master]
-source_file  = dist/unix/org.qbittorrent.qBittorrent.desktop
-source_lang  = en
-type         = DESKTOP
+[qbittorrent.qbittorrentdesktop_master]
+source_file = src/icons/qBittorrent.desktop
+source_lang = en
+type = DESKTOP
 minimum_perc = 23
+mode = developer

AUTHORS

@@ -17,24 +17,24 @@ 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
 
-* files src/webui/www/private/css/lib/vanillaSelectBox.css src/webui/www/private/scripts/lib/vanillaSelectBox.js
-  copyright: Philippe Meyer <pmg.meyer@gmail.com>
-  license: MIT
+* file src/stacktrace_win.h
+  copyright: Quassel Project
+  license: GPLv2/3
 
 Images Authors:
-* files: src/icons/qbittorrent-tray.svg
+* 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+
 
@@ -42,53 +42,56 @@ Images Authors:
   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/flags/*.svg
-  copyright: lipis/flag-icons
-  license: MIT
-  url: https://github.com/lipis/flag-icons/
+* files: src/icons/*.png
+  copyright: Gnome Icon Theme
+  license: GPLv2
+  url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
 
-* file: src/webui/www/private/images/tabs.gif
+* files: src/oxygen/*.png
+  copyright: Oxygen Icon Theme (KDE)
+  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/skin/*.png
+  files: src/menuicons/YYxYY/*.png
+  copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
+  license: GPLv2
+
+* file: src/icons/skin/tabs.gif
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
-* file: src/icons/qbittorrent-tray-dark.svg src/icons/qbittorrent-tray-light.svg
+* file: src/icons/skin/qbittorrent_mono*
   copyright: Daniel Eguren <deguren@gmail.com>
-  modified by: Nowshed H. Imran <nowshed.imran@gmail.com> (@now-im)
   license: LGPL
 
-* folder: src/icons/
-  files: application-rss+xml.svg, application-x-mswinurl.svg, connected.svg, disconnected.svg, checked-completed.svg, configure.svg,
-         edit-copy.svg, edit-rename.svg, folder-documents.svg, folder-new.svg, folder-remote.svg, go-bottom.svg, go-down.svg, go-top.svg,
-         go-up.svg, hash.svg, inode-directory.svg, insert-link.svg, kt-magnet.svg, media-playback-pause.svg, media-playback-start.svg,
-         media-seek-forward.svg, network-connect.svg, object-locked.svg, queued.svg, ratio.svg, reannounce.svg, slow_off.svg, slow.svg,
-         speedometer.svg, system-log-out.svg, tags.svg, task-complete.svg, task-reject.svg, tracker-error.svg, tracker-warning.svg,
-         trackerless.svg, trackers.svg, view-categories.svg
-  copyright: Nowshed H. Imran <nowshed.imran@gmail.com> (@now-im) modified from La-Capitaine icon theme (https://github.com/keeferrourke/la-capitaine-icon-theme)
-  license: GPLv3+
+* file: src/search_engine/engines/btjunkie.png
+  copyright: Downloaded from btjunkie.org
 
-* folder: src/icons/
-  files: application-exit.svg, collapse.svg, dialog-warning.svg, edit-find-user.svg, edit-find.svg, filter-all.svg, firewalled.svg,
-         help-about.svg, help-contents.svg, ip-blocked.svg, list-remove.svg, loading.svg, mail-folder-inbox.svg, name.svg, network-server.svg,
-         office-chart-line.svg, plugins.svg, preferences-desktop.svg, preferences-other.svg, preferences-system-network.svg, security-high.svg,
-         security-low.svg, set-location.svg, torrent-creator.svg, user-group-delete.svg, user-group-new.svg, view-preview.svg, view-refresh.svg,
-         view-statistics.svg, wallet-open.svg, webuiapplication-exit.svg, collapse.svg, dialog-warning.svg, edit-find-user.svg, edit-find.svg,
-         filter-all.svg, firewalled.svg, help-about.svg, help-contents.svg, ip-blocked.svg, list-remove.svg, loading.svg, mail-folder-inbox.svg,
-         name.svg, network-server.svg, office-chart-line.svg, plugins.svg, preferences-desktop.svg, preferences-other.svg,
-         preferences-system-network.svg, security-high.svg, security-low.svg, set-location.svg, torrent-creator.svg, user-group-delete.svg,
-         user-group-new.svg, view-preview.svg, view-refresh.svg, view-statistics.svg, wallet-open.svg, webui.svg
-  copyright: Nowshed H. Imran <nowshed.imran@gmail.com> (@now-im) modified from Ionicons icon theme (https://github.com/ionic-team/ionicons)
-  license: MIT
+* file: src/search_engine/engines/isohunt.png
+  copyright: Downloaded from isohunt.com
 
-* folder: src/icons/
-  files: force-recheck.svg
-  copyright: Nowshed H. Imran <nowshed.imran@gmail.com> (@now-im) modified from Font-Awesome icon theme (https://github.com/FortAwesome/Font-Awesome)
-  license: CC BY 4.0 License
+* file: src/search_engine/engines/mininova.png
+  copyright: Downloaded from mininova.org
 
-* folder: src/icons/
-  files: downloading.svg, edit-clear.svg, error.svg, filter-active.svg, filter-inactive.svg, filter-stalled.svg, kt-set-max-download-speed.svg,
-         kt-set-max-upload-speed.svg, list-add.svg, preferences-web-browser-cookies.svg, stalledDL.svg, stalledUP.svg
-  copyright: Nowshed H. Imran <nowshed.imran@gmail.com> (@now-im)
-  license: BSD 2-Clause License
+* file: src/search_engine/engines/piratebay.png
+  copyright: Downloaded from thepiratebay.org
+
+* file: src/search_engine/engines/torrentreactor.png
+  copyright: Downloaded from torrentreactor.net
+
+* 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
@@ -116,7 +119,7 @@ Translations authors:
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net), Stephanos Antaris (santaris@csd.auth.gr), sledgehammer999(hammered999@gmail.com) and Γιάννης Ανθυμίδης Evropi(Transifex)
   - Hebrew: David Deutsch (d.deffo@gmail.com)
-  - Hungarian: Majoros Péter
+  - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
   - Italian: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)
   - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)

CMakeLists.txt

@@ -1,65 +1,56 @@
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # Policies <= CMP0097 default to NEW
-
-project(qBittorrent
-    DESCRIPTION "The qBittorrent BitTorrent client"
-    HOMEPAGE_URL "https://www.qbittorrent.org/"
-    LANGUAGES CXX
-)
-
-# version requirements - older versions may work, but you are on your own
-set(minBoostVersion 1.71)
-set(minQt5Version 5.15.2)
-set(minQt6Version 6.2)
-set(minOpenSSLVersion 1.1.1)
-set(minLibtorrent1Version 1.2.19)
-set(minLibtorrentVersion 2.0.9)
-set(minZlibVersion 1.2.11)
-
-include(CheckCXXSourceCompiles) # TODO: migrate to CheckSourceCompiles in CMake >= 3.19
-include(GNUInstallDirs)
+cmake_minimum_required(VERSION 3.5)
+cmake_policy(VERSION 3.5)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
-include(FeatureSummary)
-include(FeatureOptionsSetup)
+include(FunctionReadVersion)
 
-# features, list is loosely sorted by user's interests
-feature_option(GUI "Build GUI application" ON)
-feature_option(WEBUI "Enable built-in HTTP server for remote control" ON)
-feature_option(QT6 "Build with Qt 6 instead of Qt 5" OFF)
-feature_option(STACKTRACE "Enable stacktrace support" ON)
-feature_option(TESTING "Build internal testing suite" OFF)
-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)
+read_version("${CMAKE_CURRENT_SOURCE_DIR}/version.pri" VER_MAJOR VER_MINOR VER_BUGFIX VER_BUILD VER_STATUS)
+# message(STATUS "Project version is: ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD} (${VER_STATUS})")
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    feature_option_dependent(DBUS
-        "Enable support for notifications and power-management features via D-Bus on Linux"
-        ON "GUI" OFF
-    )
-    feature_option_dependent(SYSTEMD
-        "Install systemd service file. Target directory is overridable with `SYSTEMD_SERVICES_INSTALL_DIR` variable"
-        OFF "NOT GUI" OFF
-    )
-elseif (MSVC)
-    feature_option(MSVC_RUNTIME_DYNAMIC "Use MSVC dynamic runtime library (-MD) instead of static (-MT)" ON)
+project(qBittorrent VERSION ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD})
+
+set(PROJECT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}")
+
+if (NOT VER_BUILD EQUAL 0)
+    set(PROJECT_VERSION "${PROJECT_VERSION}.${VER_BUILD}")
 endif()
 
-if (VERBOSE_CONFIGURE)
-    feature_summary(WHAT ALL)
-else()
-    feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES)
-endif()
+set(PROJECT_VERSION "${PROJECT_VERSION}${VER_STATUS}")
 
-# go check the packages
-include(CheckPackages)
-# configure for specific platform
-include(CommonConfig)
+add_definitions(-DQBT_VERSION_MAJOR=${VER_MAJOR})
+add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
+add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
+add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
+
+add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
+add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
+
+if (UNIX AND NOT APPLE)
+    include(GNUInstallDirs)
+endif (UNIX AND NOT APPLE)
+
+if(WIN32)
+    include(winconf)
+endif(WIN32)
+
+# we need options here, because they are used not only in "src" subdir, but in the "dist" dir too
+include(CMakeDependentOption)
+
+option(SYSTEM_QTSINGLEAPPLICATION
+    "Use the system qtsingleapplication library or shipped one otherwise")
+
+option(GUI "Allows to disable GUI for headless running. Disables QtDBus and the GeoIP Database" ON)
+
+option(WEBUI "Allows to disable the WebUI." ON)
+
+option(STACKTRACE "Enable stacktrace feature" ON)
+
+if (UNIX)
+    cmake_dependent_option(SYSTEMD "Install the systemd service file (headless only)" OFF
+        "NOT GUI" OFF)
+    cmake_dependent_option(DBUS "Enable use of QtDBus (GUI only)" ON "GUI" OFF)
+endif(UNIX)
 
-# Generate version header
-configure_file("src/base/version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/base/version.h" @ONLY)
 
 add_subdirectory(src)
 add_subdirectory(dist)
-
-if (TESTING)
-    add_subdirectory(test)
-endif()

CONTRIBUTING.md

@@ -6,14 +6,22 @@ Read the respective section to find out more.
 ### Table Of Contents
 
 *   **[Bug reporting etiquette](#bug-reporting-etiquette)**
+
+
 *   **[Submitting an issue/bug report](#submitting-an-issuebug-report)**
     *   [What is an actual bug report?](#what-is-an-actual-bug-report)
     *   [Before submitting a bug report](#before-submitting-a-bug-report)
     *   [Steps to ensure a good bug report](#steps-to-ensure-a-good-bug-report)
+
+
 *   **[Suggesting enhancements/feature requests](#suggesting-enhancementsfeature-requests)**
     *   [Before submitting an enhancement/feature request](#before-submitting-an-enhancementfeature-request)
     *   [Steps to ensure a good enhancement/feature suggestion](#steps-to-ensure-a-good-enhancementfeature-suggestion)
+
+
 *   **[Opening a pull request](#opening-a-pull-request)**
+    *   [Must read](#must-read)
+    *   [Good to know](#good-to-know)
 
 # Bug reporting etiquette
 
@@ -23,7 +31,7 @@ Read the respective section to find out more.
 
 *   **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. Your complaint will (very likely) be **ignored.** :fearful:
+*   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
 
@@ -39,7 +47,7 @@ Developers and contributors are not supposed to deal with issues for which littl
 
 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 avoids burdening the project with invalid issues or issues unrelated to qBittorrent.
+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**:
 
@@ -130,7 +138,7 @@ These are unstable/unsupported platforms, and in all likelihood, whatever the is
 *   **For performance-related issues**, include as much profiling data as you can (resource usage graphs, etc).
 
 *   Paste the **qBittorrent log** (or put the contents of the log in a gist and provide a link to the gist). The log can be viewed in the GUI (View -> Log -> tick all boxes). If you can't do that, the file is at:
-    -   Linux: `~/.local/share/qBittorrent/logs/qBittorrent.log`
+    -   Linux: `~/.local/share/data/qBittorrent/logs/qBittorrent.log`
     -   Windows: `%LocalAppData%\qBittorrent\logs`
     -   macOS: `~/Library/Application Support/qBittorrent/qBittorrent.log`
 
@@ -186,26 +194,28 @@ Following these guidelines helps maintainers and the community understand your s
 
 # 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).
+### Must read
+*   Read our [**coding guidelines**][coding-guidelines-url]. There are some scripts to help you: [uncrustify script][uncrustify-script-url], [astyle script][astyle-script-url], [(related thread)][coding-guidelines-thread-url].
+*   Keep the title **short** and provide a **clear** description about what your pull request does.
+*   Provide **screenshots** for UI related changes.
+*   Keep your git commit history **clean** and **precise.** Refer to the section about "Git commit messages" in the [**coding guidelines**][coding-guidelines-url].
+*   If your commit fixes a reported issue (for example #4134), add the following message to the commit `Closes #4134.`. Example [here][commit-message-fix-issue-example-url].
 
+### Good to know
+*   **Search** pull request history! Others might have already implemented your idea and it is waiting to be merged (or got rejected already). Save your precious time by doing a search first.
+*   When resolving merge conflicts, do `git rebase <target_branch_name>`, don't do `git pull`. Then you can start fixing the conflicts. Here is a good explanation: [link][merging-vs-rebasing-url].
+
+[astyle-script-url]: https://gist.github.com/Chocobo1/539cee860d1eef0acfa6
 [attachments-howto-url]: https://help.github.com/articles/file-attachments-on-issues-and-pull-requests
-[builds-url]: https://sourceforge.net/projects/qbittorrent/files/
 [coding-guidelines-url]: https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md
-[coding-guidelines-git-commit-message-url]: https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md#10-git-commit-message
+[coding-guidelines-thread-url]: https://github.com/qbittorrent/qBittorrent/issues/2192
 [commit-message-fix-issue-example-url]: https://github.com/qbittorrent/qBittorrent/commit/c07cd440cd46345297debb47cb260f8688975f50
-[forum-url]: https://forum.qbittorrent.org/
+[forum-url]: http://forum.qbittorrent.org/
 [howto-report-bugs-url]: https://www.chiark.greenend.org.uk/~sgtatham/bugs.html
-[how-to-translate-url]: https://github.com/qbittorrent/qBittorrent/wiki/How-to-translate-qBittorrent
 [merging-vs-rebasing-url]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing
-[pull-request-list-url]: https://github.com/qbittorrent/qBittorrent/pulls
 [python-url]: https://www.python.org/
 [releases-url]: https://github.com/qbittorrent/qBittorrent/releases
 [search-plugins-url]: https://github.com/qbittorrent/search-plugins
+[uncrustify-script-url]: https://raw.githubusercontent.com/qbittorrent/qBittorrent/master/uncrustify.cfg
 [wiki-url]: https://github.com/qbittorrent/qBittorrent/wiki
+[builds-url]: https://sourceforge.net/projects/qbittorrent/files/