Bump to 4.4.0beta2

Use spinbox special value to represent "Use any available port"

.appveyor.yml

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE.md

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

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/PULL_REQUEST_TEMPLATE/pull_request.md

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

.github/SUPPORT.md

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

.github/workflows/ci.yaml

@@ -4,20 +4,13 @@ name: GitHub Actions CI
 # Cache is not used for Ubuntu builds, because it already has all dependencies except
 # the appropriate libtorrent version, which only takes 3-5 minutes to build from source anyway
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    types: [edited, opened, reopened, synchronize]
-    branches: [ master ]
+on: [pull_request, push]
 
 env:
-  # Qt: 5.15.1
-  # libtorrent: RC_1_2 HEAD, 1.2.11
-  VCPKG_COMMIT: 133051b793486ef14e67e9d1f48c9cfe64dc127e
+  VCPKG_COMMIT: 8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb
   VCPKG_DEST_MACOS: /Users/runner/qbt_tools/vcpkg
   VCPKG_DEST_WIN: C:\qbt_tools\vcpkg
-  LIBTORRENT_VERSION_TAG: v1.2.11
+  LIBTORRENT_VERSION_TAG: v1.2.14
 
 jobs:
 
@@ -26,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04]
+        os: [ubuntu-20.04]
         qbt_gui: ["GUI=ON", "GUI=OFF"]
       fail-fast: false
 
@@ -46,8 +39,15 @@ jobs:
         sudo apt install \
           build-essential cmake git ninja-build pkg-config \
           libssl-dev libgeoip-dev zlib1g-dev \
-          libboost-dev libboost-chrono-dev libboost-random-dev libboost-system-dev \
-          libqt5svg5-dev qtbase5-dev qttools5-dev
+          libboost-dev libboost-chrono-dev libboost-random-dev libboost-system-dev
+      # sudo apt install libqt5svg5-dev qtbase5-dev qttools5-dev # the Qt version in the standard repositories is too old...
+
+    # this will be installed under /opt/qt515. CMake will still find it automatically without additional hints
+    # to speed up the process, only the required components are installed rather than the full qt515-meta-full metapackage
+    - name: install Qt 5.15.2 from an external PPA
+      run: |
+        sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-focal
+        sudo apt install qt515base qt515svg qt515tools
 
     - name: install libtorrent from source
       run: |
@@ -69,12 +69,16 @@ jobs:
           --graphviz=build/target_graph.dot
         cmake --build build
 
+    - name: install qBittorrent
+      run: sudo cmake --install build --prefix /usr/local
+
     - name: upload artifact as zip
       uses: actions/upload-artifact@v2
       with:
-        name: qBittorrent-CI-Ubuntu_${{ matrix.os }}-${{ matrix.qbt_gui }}
+        name: qBittorrent-CI_${{ matrix.os }}-x64_${{ matrix.qbt_gui }}
         path: |
           build/compile_commands.json
+          build/install_manifest.txt
           build/target_graph.dot
           build/qbittorrent
           build/qbittorrent-nox
@@ -94,13 +98,13 @@ jobs:
     - name: checkout repository
       uses: actions/checkout@v2
 
-    # - ninja is needed for building qBittorrent (because it's preferrable, not a hard requirement)
+    # - ninja is needed for building qBittorrent (because it's preferable, not a hard requirement)
     - name: install additional required packages with chocolatey
       run: |
         choco install ninja
 
     - name: setup vcpkg (cached, if possible)
-      uses: lukka/run-vcpkg@v4
+      uses: lukka/run-vcpkg@v7
       with:
         vcpkgDirectory: ${{ env.VCPKG_DEST_WIN }}
         vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
@@ -125,6 +129,9 @@ jobs:
           "qt5-svg:x64-windows-static-release",
           "qt5-tools:x64-windows-static-release",
           "qt5-winextras:x64-windows-static-release"
+        ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe upgrade `
+            --overlay-triplets=${{ github.workspace }}/triplets_overlay `
+            --no-dry-run
         foreach($package in $packages)
         {
           ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe install $package `
@@ -151,7 +158,7 @@ jobs:
     - name: upload artifact as zip
       uses: actions/upload-artifact@v2
       with:
-        name: qBittorrent-CI-Windows_x64-static-release
+        name: qBittorrent-CI_Windows-x64
         path: |
           build/compile_commands.json
           build/target_graph.dot
@@ -177,7 +184,7 @@ jobs:
     - name: checkout repository
       uses: actions/checkout@v2
 
-    # - ninja is needed for building qBittorrent (because it's preferrable, not a hard requirement)
+    # - ninja is needed for building qBittorrent (because it's preferable, not a hard requirement)
     # - automake is needed for the installation the vcpkg installation of fontconfig, a dependency of qt5-base
     - name: install additional required packages with homebrew
       shell: bash
@@ -185,7 +192,7 @@ jobs:
         brew install automake ninja
 
     - name: setup vcpkg (cached, if possible)
-      uses: lukka/run-vcpkg@v4
+      uses: lukka/run-vcpkg@v7
       with:
         vcpkgDirectory: ${{ env.VCPKG_DEST_MACOS }}
         vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
@@ -200,10 +207,10 @@ jobs:
           -Value "set(VCPKG_BUILD_TYPE release)","set(VCPKG_OSX_DEPLOYMENT_TARGET 10.15)"
 
     # NOTE: Avoids a libtorrent ABI issue. See https://github.com/arvidn/libtorrent/issues/4965
-    - name: force AppleClang to compile libtorrent with C++14
+    - name: force AppleClang to compile libtorrent with the same C++ standard as qBittorrent
       run: |
         (Get-Content -path ${{ env.RUNVCPKG_VCPKG_ROOT }}/ports/libtorrent/portfile.cmake).Replace( `
-          '${FEATURE_OPTIONS}', '${FEATURE_OPTIONS} -DCMAKE_CXX_STANDARD=14') `
+          '${FEATURE_OPTIONS}', '${FEATURE_OPTIONS} -DCMAKE_CXX_STANDARD=17') `
           | Set-Content -Path ${{ env.RUNVCPKG_VCPKG_ROOT }}/ports/libtorrent/portfile.cmake
 
     - name: install dependencies via vcpkg
@@ -215,6 +222,9 @@ jobs:
           "qt5-svg:x64-osx-release",
           "qt5-tools:x64-osx-release",
           "qt5-macextras:x64-osx-release"
+        ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg upgrade `
+            --overlay-triplets=${{ github.workspace }}/triplets_overlay `
+            --no-dry-run
         foreach($package in $packages)
         {
           ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg install $package `
@@ -236,7 +246,7 @@ jobs:
     - name: upload artifact as zip
       uses: actions/upload-artifact@v2
       with:
-        name: qBittorrent-CI-macOS_x64-static-release_${{ matrix.qbt_gui }}
+        name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}
         path: |
           build/compile_commands.json
           build/target_graph.dot

.github/workflows/file_health.sh

@@ -12,6 +12,7 @@ regressions=0
 exclusions_nonutf8='(.*(7z|gif|ic(ns|o)|png|qm|zip))'
 exclusions_bom='src/base/unicodestrings.h'
 exclusions_tw='(*.ts)|src/webui/www/private/scripts/lib/mootools-1.2-more.js'
+exclusions_trailing_newline='configure'
 exclusions_no_lf='(*.ts)|(.*svg)|compile_commands.json|src/webui/www/private/scripts/lib/mootools-1.2-(core-yc.js|more.js)'
 
 echo -e "\n*** Detect files not encoded in UTF-8 ***\n"
@@ -50,6 +51,7 @@ echo -e "\n*** Detect too many trailing newlines ***\n"
 
 find . -path ./build -prune -false -o -path ./.git -prune -false -o -type f -exec file --mime {} \; | sort \
     | grep -e "charset=us-ascii" -e "charset=utf-8" | cut -d ":" -f 1 \
+    | grep -E -v -e "${exclusions_trailing_newline}" \
     | xargs -L1 -I my_input bash -c 'test "$(tail -q -c2 "my_input" | hexdump -C | grep "0a 0a")" && echo "my_input"' \
     | tee >(echo -e "--> Too many trailing newlines: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
     | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'

.github/workflows/file_health.yaml

@@ -1,11 +1,6 @@
 name: GitHub Actions file health check
 
-on:
-  push:
-    branches: [ '**' ]
-  pull_request:
-    types: [edited, opened, reopened, synchronize]
-    branches: [ '**' ]
+on: [pull_request, push]
 
 jobs:
   check_file_health:

.github/workflows/webui_ci.yaml

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

.gitignore

@@ -4,6 +4,7 @@ src/qbittorrent
 src/qbittorrent-nox
 src/release
 src/debug
+src/base/version.h
 CMakeLists.txt.user*
 qbittorrent.pro.user*
 conf.pri

.travis.yml

@@ -1,188 +0,0 @@
-language: cpp
-
-os:
-  - linux
-  - osx
-
-dist: focal
-osx_image: xcode12.2
-
-env:
-  matrix:
-    - libt_branch=RC_1_2 gui=true build_system=qmake
-    - libt_branch=RC_1_2 gui=false build_system=qmake
-    - libt_branch=RC_1_2 gui=true build_system=cmake
-    - libt_branch=RC_1_2 gui=false build_system=cmake
-  global:
-    - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
-    - coverity_branch: coverity_scan
-
-jobs:
-  include:
-  - env: libt_branch=RC_2_0 gui=true build_system=qmake
-    os: linux
-
-notifications:
-  email:
-    on_success: change
-    on_failure: change
-
-cache:
-  ccache: true
-  directories:
-    - $HOME/travis/deb
-    - $HOME/travis/brew
-
-addons:
-  coverity_scan:
-    project:
-      name: "qbittorrent/qBittorrent"
-      description: "Build submitted via Travis CI"
-    build_command_prepend: "./bootstrap.sh && ./configure $qmake_conf"
-    build_command: "make -j2"
-    branch_pattern: $coverity_branch
-    notification_email: sledgehammer999@qbittorrent.org
-  apt:
-    sources:
-      # sources list: https://github.com/travis-ci/apt-source-safelist/blob/master/ubuntu.json
-      - sourceline: 'deb https://apt.kitware.com/ubuntu/ focal main'
-        key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
-    packages:
-      # packages list: https://github.com/travis-ci/apt-package-safelist/blob/master/ubuntu-trusty
-      - [autoconf, automake, cmake, colormake]
-      - [libboost-dev, libboost-system-dev]
-      - libssl-dev
-      - [qtbase5-dev, libqt5svg5-dev, qttools5-dev]
-      - zlib1g-dev
-
-before_install:
-  # only allow specific build for coverity scan, others will stop
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$libt_branch" = "RC_1_2" -a "$gui" = "true" -a "$build_system" = "qmake" ]; then exit ; fi
-
-  - shopt -s expand_aliases
-  - alias make="colormake -j2" # Using nprocs/2 sometimes may fail (gcc is killed by system)
-  - qbt_path="$HOME/qbt_install"
-  - qmake_conf="$qmake_conf --prefix=$qbt_path"
-  - cmake_conf="$cmake_conf -DCMAKE_INSTALL_PREFIX=$qbt_path"
-
-  # options for specific branches
-  - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      # setup virtual display for after_success target
-      if [ "$gui" = "true" ]; then export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi ;
-      # CMake from Kitware is installed in /usr/bin
-      # TravisCI installs its own cmake to another location which ovverides other installations
-      # if they don't call the new binary directly
-      alias cmake="/usr/bin/cmake"
-
-      export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
-    fi
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedefs"
-
-      openssl_root_path="/usr/local/opt/openssl"
-      qmake_conf="$qmake_conf PKG_CONFIG_PATH=$openssl_root_path/lib/pkgconfig:$PKG_CONFIG_PATH"
-      cmake_conf="$cmake_conf -DOPENSSL_ROOT_DIR=$openssl_root_path"
-    fi
-  - |
-    if [ "$gui" = "false" ]; then
-      qmake_conf="$qmake_conf --disable-gui"
-      cmake_conf="$cmake_conf -DGUI=OFF"
-    fi
-
-  # print settings
-  - echo $libt_branch
-  - echo $gui
-  - echo $build_system
-  - echo $qmake_conf
-  - echo $cmake_conf
-
-install:
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      # dependencies
-      PATH="/usr/local/opt/ccache/libexec:$PATH"
-
-      brew update > /dev/null
-      brew upgrade cmake
-      brew install ccache colormake boost openssl qt zlib
-      brew link --force qt zlib
-
-      if [ "$build_system" = "cmake" ]; then
-        sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
-        sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins
-      fi
-    fi
-  - |
-    if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
-      export use_ccache=true
-      ccache -M 512M
-      ccache -V && ccache --show-stats && ccache --zero-stats
-    fi
-  - |
-    if [ "$libt_branch" = "RC_1_2" ]; then
-      pushd "$HOME"
-      git clone --single-branch --branch RC_1_2 https://github.com/arvidn/libtorrent.git
-      cd libtorrent
-      git checkout tags/v1.2.11
-
-      cmake \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_CXX_STANDARD=14 \
-        -Ddeprecated-functions=OFF \
-        -DOPENSSL_ROOT_DIR="$openssl_root_path" \
-        ./
-      make
-      sudo make install
-      popd
-    elif [ "$libt_branch" = "RC_2_0" ]; then
-      pushd "$HOME"
-      git clone --single-branch --branch RC_2_0 https://github.com/arvidn/libtorrent.git
-      cd libtorrent
-      git checkout tags/v2.0.1
-      git submodule update --init --recursive
-
-      cmake \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_CXX_STANDARD=14 \
-        -Ddeprecated-functions=ON \
-        -DOPENSSL_ROOT_DIR="$openssl_root_path" \
-        ./
-      make
-      sudo make install
-      popd
-    fi
-
-script:
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # skip usual build when running coverity scan
-  - |
-    cd "$TRAVIS_BUILD_DIR"
-    if [ "$build_system" = "qmake" ]; then
-      # scan only as lupdate is prone to hang
-      lupdate -extensions c,cpp,h,hpp,ui ./
-      ./bootstrap.sh
-      ./configure $qmake_conf CXXFLAGS="$CXXFLAGS"
-    else
-      mkdir build && cd build
-      cmake $cmake_conf ../
-    fi
-  - make
-  - make install
-
-after_success:
-  - if [ "$gui" = "true" ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd "$qbt_path/bin" ; fi
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      if [ "$build_system" = "qmake" ]; then
-        macdeployqt "$TRAVIS_BUILD_DIR/src/$qbt_exe.app"
-        cd "$TRAVIS_BUILD_DIR/src/$qbt_exe.app/Contents/MacOS"
-      else
-        cd "$qbt_path/$qbt_exe.app/Contents/MacOS"
-      fi
-    fi
-  - ./$qbt_exe --version
-
-after_script:
-  - if [ "$use_ccache" = true ]; then ccache --show-stats ; fi

AUTHORS

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

CMakeLists.txt

@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # Policies <= CMP0097 default t
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 
 project(qBittorrent
-    VERSION 4.3.2.0
     DESCRIPTION "The qBittorrent BitTorrent client"
     HOMEPAGE_URL "https://www.qbittorrent.org/"
     LANGUAGES CXX
@@ -13,9 +12,9 @@ project(qBittorrent
 set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
 # version requirements - older vesions may work, but you are on your own
 set(minBoostVersion 1.65)
-set(minQtVersion 5.9.5)
+set(minQtVersion 5.15.2)
 set(minOpenSSLVersion 1.1.1)
-set(minLibtorrentVersion 1.2.11)
+set(minLibtorrentVersion 1.2.14)
 set(minZlibVersion 1.2.11)
 
 # features (some are platform-specific)
@@ -51,8 +50,6 @@ elseif (MSVC)
     feature_option(MSVC_RUNTIME_DYNAMIC "Use MSVC dynamic runtime library (-MD) instead of static (-MT)" ON)
 endif()
 
-set(QBT_VER_STATUS "alpha1" CACHE STRING "Project status version. Should be empty for release builds.")
-
 include(GNUInstallDirs)
 add_subdirectory(src)
 add_subdirectory(dist)
@@ -62,3 +59,6 @@ if (VERBOSE_CONFIGURE)
 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)

COPYING

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

Changelog

@@ -1,46 +1,6 @@
-Sun Dec 27 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.2
-    - FEATURE: Allow to add root folder to torrent content (glassez)
-    - FEATURE: "HTTPS tracker validation" option is available on all platforms with latest libtorrent (Chocobo1)
-    - FEATURE: Option for supporting internationalized domain names (IDNs) (Chocobo1)
-    - BUGFIX: Fix broken sorting on some columns (Chocobo1)
-    - BUGFIX: Fix availability per file value (Chocobo1)
-    - BUGFIX: Fix status of torrents without metadata (sledgehammer999)
-    - BUGFIX: Don't try to remove folders for a torrent without metadata (sledgehammer999)
-    - BUGFIX: Lift upper limit of "Max concurrent HTTP announces" option (Chocobo1)
-    - BUGFIX: Add links to libtorrent documentation (Chocobo1)
-    - BUGFIX: Move "embedded tracker" options to qbt section (Chocobo1)
-    - BUGFIX: Properly handle "Append extension" option changing (glassez)
-    - BUGFIX: Correctly save paused torrent state (glassez)
-    - BUGFIX: Fix bug of "move storage job" can be performed multiple times (glassez)
-    - WEBUI: Add ability to use 'shift+delete' to delete torrents (Chocobo1)
-    - WEBUI: Allow to attach tags while adding torrents (Jesse Chan)
-    - WEBUI: Bump version to 2.6.2 (Jesse Chan)
-    - WEBUI: Remove unnecessary restriction on input length (Chocobo1)
-    - WINDOWS: NSIS: Update Russian translation (Andrei Stepanov)
-    - WINDOWS:  NSIS: Update Italian translation (Alessandro Simonelli)
-    - OTHER: Drop support for building with libtorrent < 1.2.11 (Vladimir Golovnev)
-
-Wed Nov 25 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.1
-    - FEATURE: Allow progress bar styling from custom themes (jagannatharjun)
-    - FEATURE: Allow adding torrents using "Paste" key sequence (Chocobo1)
-    - FEATURE: Add Latgalian translation (sledgehammer999)
-    - BUGFIX: Prevent resume data to be saved for removed torrent (glassez)
-    - BUGFIX: Clarify connection protocol choice label (FranciscoPombal)
-    - BUGFIX: Fix crash when clicked outside the table of torrent content view (jagannatharjun)
-    - BUGFIX: Don't resume "paused" torrents when put into "checking" state by libtorrent (glassez)
-    - BUGFIX: Fix torrent state calculation (glassez)
-    - BUGFIX: Align integer data to right in torrent content view (jagannatharjun)
-    - WEBUI: Place WebUI RSS description in sandboxed iframe (Sepro)
-    - WEBUI: Avoid settings being reset via WebAPI (Chocobo1)
-    - WEBUI: Fix toggling advanced option in WebUI (thalieht)
-    - WEBUI: Expose contentPath in WebAPI torrents/info (FranciscoPombal)
-    - WEBUI: Fix the issue that IPv6 address can't be banned (brvphoenix)
-    - RSS: Fix confusion in date format description (Thomas De Rocker)
-    - WINDOWS: Update dutch.nsi (Thomas De Rocker)
-    - LINUX: Update .desktop file translations (sledgehammer999)
-
-Thu Oct 22 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.0.1
-    - WINDOWS: NSIS: Update Italian translation (bovirus)
+Unreleased - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.4.0
+    - FEATURE: Add support for creating v2 torrents(requires libtorrent 2.0.x) (Chocobo1)
+    - FEATURE: Expose libtorrent hashing_threads settings (Anton Bershanskiy)
 
 Sun Oct 18 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.0
     - FEATURE: Many UI elements colors are themeable now (jagannatharjun)

INSTALL

@@ -5,13 +5,13 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   - Boost >= 1.65
 
-  - libtorrent-rasterbar >= 1.2.11 (by Arvid Norberg)
+  - libtorrent-rasterbar >= 1.2.14 (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.9.5
+  - Qt >= 5.15.2
 
   - zlib >= 1.2.11
 

README.md

@@ -1,7 +1,6 @@
 qBittorrent - A BitTorrent client in Qt
 ------------------------------------------
 
-[![TravisCI Status](https://travis-ci.org/qbittorrent/qBittorrent.svg?branch=master)](https://travis-ci.org/qbittorrent/qBittorrent)
 [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/qbittorrent/qBittorrent?branch=master&svg=true)](https://ci.appveyor.com/project/qbittorrent/qBittorrent)
 [![GitHub Actions CI Status](https://github.com/qbittorrent/qBittorrent/workflows/GitHub%20Actions%20CI/badge.svg)](https://github.com/qbittorrent/qBittorrent/actions)
 [![Coverity Status](https://scan.coverity.com/projects/5494/badge.svg)](https://scan.coverity.com/projects/5494)

build_dist.sh

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

cmake/Modules/MacroQbtCommonConfig.cmake

@@ -7,48 +7,17 @@ macro(qbt_common_config)
     # treat value specified by the CXX_STANDARD target property as a requirement by default
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-    # these definitions are only needed for calls to
-    # lt::generate_fingerprint and for the qbittorrent.rc file on Windows
-    add_library(qbt_version_definitions INTERFACE)
-
-    target_compile_definitions(qbt_version_definitions INTERFACE
-        QBT_VERSION_MAJOR=${qBittorrent_VERSION_MAJOR}
-        QBT_VERSION_MINOR=${qBittorrent_VERSION_MINOR}
-        QBT_VERSION_BUGFIX=${qBittorrent_VERSION_PATCH}
-        QBT_VERSION_BUILD=${qBittorrent_VERSION_TWEAK}
-    )
-
     add_library(qbt_common_cfg INTERFACE)
 
-    # Full C++ 14 support is required
+    # 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_14
-        cxx_aggregate_default_initializers
-        cxx_attribute_deprecated
-        cxx_binary_literals
-        cxx_contextual_conversions
-        cxx_decltype_auto
-        cxx_digit_separators
-        cxx_generic_lambdas
-        cxx_lambda_init_captures
-        cxx_relaxed_constexpr
-        cxx_return_type_deduction
-        cxx_variable_templates
+        cxx_std_17
     )
 
-    set(QBT_PROJECT_VERSION "${qBittorrent_VERSION_MAJOR}.${qBittorrent_VERSION_MINOR}.${qBittorrent_VERSION_PATCH}")
-    if (NOT ${qBittorrent_VERSION_TWEAK} EQUAL 0)
-        set(QBT_PROJECT_VERSION "${QBT_PROJECT_VERSION}.${qBittorrent_VERSION_TWEAK}")
-    endif()
-
-    set(QBT_FULL_VERSION "${QBT_PROJECT_VERSION}${QBT_VER_STATUS}")
-
     target_compile_definitions(qbt_common_cfg INTERFACE
-        QBT_VERSION="v${QBT_FULL_VERSION}"
-        QBT_VERSION_2="${QBT_FULL_VERSION}"
-        QT_DEPRECATED_WARNINGS
+        QT_DISABLE_DEPRECATED_BEFORE=0x050f02
         QT_NO_CAST_TO_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_USE_QSTRINGBUILDER
@@ -68,7 +37,7 @@ macro(qbt_common_config)
         )
     endif()
 
-    if ((CXX_COMPILER_ID STREQUAL "GNU") OR (CXX_COMPILER_ID STREQUAL "Clang") OR (CXX_COMPILER_ID STREQUAL "AppleClang"))
+    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
@@ -90,6 +59,12 @@ macro(qbt_common_config)
         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()
@@ -101,8 +76,14 @@ macro(qbt_common_config)
     endif()
 
     if (MSVC)
-        target_compile_options(qbt_common_cfg INTERFACE /guard:cf)
-        target_link_options(qbt_common_cfg INTERFACE /guard:cf
+        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>

configure.ac

@@ -1,4 +1,5 @@
-AC_INIT([qbittorrent], [v4.3.2], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+
+AC_INIT([qbittorrent], [v4.4.0alpha], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 : ${CFLAGS=""}
@@ -141,7 +142,7 @@ AS_IF([test "x$QT_QMAKE" = "x"],
       [AC_MSG_ERROR([Could not find qmake])
       ])
 AS_IF([test "x$enable_gui" = "xyes"],
-      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.5.1])
+      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.15.2])
       ])
 AC_MSG_CHECKING([whether QtDBus should be enabled])
 AS_CASE(["x$enable_qt_dbus"],
@@ -175,12 +176,8 @@ m4_define([DETECT_BOOST_VERSION_PROGRAM],
 AC_COMPILE_IFELSE([DETECT_BOOST_VERSION_PROGRAM(106000)], [],
     [QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"])
 
-AX_BOOST_SYSTEM()
-AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
-LIBS="$BOOST_SYSTEM_LIB $LIBS"
-
 PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 1.2.11],
+                  [libtorrent-rasterbar >= 1.2.14],
                   [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS"
                   LIBS="$libtorrent_LIBS $LIBS"])
 
@@ -194,34 +191,34 @@ PKG_CHECK_MODULES(zlib,
                  [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS"
                  LIBS="$zlib_LIBS $LIBS"])
 
-# Check if already in >= C++14 mode because of the flags returned by one of the above packages
+# Check if already in >= C++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++14 or later mode])
-AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+AC_MSG_CHECKING([if compiler defaults to C++17 or later mode])
+AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
                   [AC_MSG_RESULT([yes])
-                   QBT_CXX14_FOUND="yes"],
+                   QBT_CXX17_FOUND="yes"],
                   [AC_MSG_RESULT([no])
-                   QBT_CXX14_FOUND="no"])
+                   QBT_CXX17_FOUND="no"])
 
-# In case of no, check if the compiler can support at least C++14
+# In case of no, check if the compiler can support at least C++17
 # and if yes, enable it leaving a warning to the user
-AS_IF([test "x$QBT_CXX14_FOUND" = "xno"],
-      [AC_MSG_CHECKING([if compiler supports C++14])
-       CXXFLAGS="-std=c++14"
-       AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+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++14 is disabled by the set compiler flags])
+                         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++14 $TMP_CXXFLAGS"
-                         AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+                         CXXFLAGS="-std=c++17 $TMP_CXXFLAGS"
+                         AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
                                            [AC_MSG_RESULT([no])
-                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++14"
-                                            AC_MSG_WARN([C++14 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])],
+                                            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++14 but the user or a dependency has explicitly enabled a lower mode.])])],
+                                            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++14 is required.])])
+                         AC_MSG_ERROR([A compiler supporting C++17 is required.])])
       ])
 CXXFLAGS="$TMP_CXXFLAGS"
 
@@ -272,9 +269,13 @@ AC_SUBST(QBT_REMOVE_CONFIG)
 AC_SUBST(QBT_ADD_DEFINES)
 AC_SUBST(QBT_REMOVE_DEFINES)
 
-AC_OUTPUT(conf.pri)
+QBT_CONFIG_FILES="conf.pri"
+
 AS_IF([test "x$enable_systemd" = "xyes"],
-      [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)])
+      [QBT_CONFIG_FILES="$QBT_CONFIG_FILES 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)"

dist/mac/Info.plist

@@ -47,7 +47,7 @@
 		</dict>
 	</array>
 	<key>CFBundleName</key>
-	<string>@EXECUTABLE@</string>
+	<string>qBittorrent</string>
 	<key>CFBundleIconFile</key>
 	<string>qbittorrent_mac.icns</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -55,9 +55,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.3.2</string>
+	<string>4.4.0</string>
 	<key>CFBundleExecutable</key>
-	<string>@EXECUTABLE@</string>
+	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.qbittorrent.qBittorrent</string>
 	<key>LSMinimumSystemVersion</key>
@@ -67,7 +67,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2020 The qBittorrent project</string>
+	<string>Copyright © 2006-2021 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>