Bump to 4.3.7

Backport changes to v4.3.x branch

.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
@@ -42,7 +42,7 @@ install:
 
 before_build:
   # setup env
-  - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+  - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\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%"

.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@5 zlib
-      brew link --force qt@5 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.12
-
-      cmake \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_CXX_STANDARD=17 \
-        -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.2
-      git submodule update --init --recursive
-
-      cmake \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_CXX_STANDARD=17 \
-        -Ddeprecated-functions=OFF \
-        -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

Changelog

@@ -1,3 +1,23 @@
+Tue Aug 03 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.7
+    - BUGFIX: Don't forget to start Watched folders timer (glassez)
+    - BUGFIX: Don't close tags menu when toggling items (tgregerson)
+    - BUGFIX: Don't overwrite tracker message (glassez)
+    - BUGFIX: Bump file pool size (#14966) (An0n)
+    - BUGFIX: Properly create "clean path" for watched folder (glassez)
+    - WEBUI: Disconnect comment links (Daniel Aleksandersen)
+    - WINDOWS: NSIS: Update Danish translation (scootergrisen)
+
+Sat Jun 26 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.6
+    - FEATURE: New languages: Mongolian, Persian, Thai
+    - BUGFIX: Provide correct error description in "upload mode" (glassez)
+    - BUGFIX: Allow adding torrents with relative save path (glassez)
+    - BUGFIX: Fix main window turns blank after restoring from tray (#15031) (Chocobo1)
+    - BUGFIX: Remove the lockfile on exit (#14997) (brvphoenix)
+    - BUGFIX: Improve "Watched folders" feature (glassez)
+    - BUGFIX: Keep sub-sorting order (#15074) (Dmitry Khlestkov)
+    - BUGFIX: Properly add torrent with new tags (glassez)
+    - WINDOWS: NSIS: Update Japanese, Turkish, Hungarian, Swedish translation (maboroshin, Burak Yavuz, xkrstudio, nonew-star)
+
 Sun May 02 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.5
     - BUGFIX: Move cursor to the end when autofilling URL/hash in "Download from URLs" dialog (Chocobo1)
     - BUGFIX: Sort invalid QDateTime values after valid values (Chocobo1)

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)

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.70 for qbittorrent v4.3.5.
+# Generated by GNU Autoconf 2.70 for qbittorrent v4.3.7.
 #
 # Report bugs to <bugs.qbittorrent.org>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='qbittorrent'
 PACKAGE_TARNAME='qbittorrent'
-PACKAGE_VERSION='v4.3.5'
-PACKAGE_STRING='qbittorrent v4.3.5'
+PACKAGE_VERSION='v4.3.7'
+PACKAGE_STRING='qbittorrent v4.3.7'
 PACKAGE_BUGREPORT='bugs.qbittorrent.org'
 PACKAGE_URL='https://www.qbittorrent.org/'
 
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures qbittorrent v4.3.5 to adapt to many kinds of systems.
+\`configure' configures qbittorrent v4.3.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1401,7 +1401,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of qbittorrent v4.3.5:";;
+     short | recursive ) echo "Configuration of qbittorrent v4.3.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1538,7 +1538,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-qbittorrent configure v4.3.5
+qbittorrent configure v4.3.7
 generated by GNU Autoconf 2.70
 
 Copyright (C) 2020 Free Software Foundation, Inc.
@@ -1700,7 +1700,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by qbittorrent $as_me v4.3.5, which was
+It was created by qbittorrent $as_me v4.3.7, which was
 generated by GNU Autoconf 2.70.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4848,7 +4848,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='qbittorrent'
- VERSION='v4.3.5'
+ VERSION='v4.3.7'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -7401,7 +7401,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by qbittorrent $as_me v4.3.5, which was
+This file was extended by qbittorrent $as_me v4.3.7, which was
 generated by GNU Autoconf 2.70.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7461,7 +7461,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-qbittorrent config.status v4.3.5
+qbittorrent config.status v4.3.7
 configured by $0, generated by GNU Autoconf 2.70,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v4.3.5], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.3.7], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 : ${CFLAGS=""}

dist/mac/Info.plist

@@ -55,7 +55,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.3.5</string>
+	<string>4.3.7</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>