Bump to 4.2.5

Qt 5.9.5 doesn't seem to recognize it, this patch fixes it.
Fix up: d8401c76f5.
Related: #12601.

.appveyor.yml

@@ -45,13 +45,14 @@ before_build:
   - 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%\winconf.pri" "%REPO_DIR%"
-  - COPY /Y "%CACHE_DIR%\winconf-msvc.pri" "%REPO_DIR%"
+  - COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"
   # workarounds
   - MKLINK /J "c:\qbt\base" "%CACHE_DIR%\base"
 
 build_script:
   - cd "%REPO_DIR%"
+  # scan only as lupdate is prone to hang
+  - lupdate -extensions c,cpp,h,hpp,ui .
   - qmake qbittorrent.pro && cd src && qmake src.pro
   - jom -j2 -f Makefile.Release
 

.github/ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@
 ### qBittorrent version and Operating System
 (type here)
 
-### If on linux, libtorrent and Qt version
+### If on linux, libtorrent-rasterbar and Qt version
 (type here)
 
 ### What is the problem

.gitignore

@@ -4,6 +4,7 @@ src/qbittorrent
 src/qbittorrent-nox
 src/release
 src/debug
+CMakeLists.txt.user*
 qbittorrent.pro.user*
 conf.pri
 Makefile*
@@ -22,6 +23,7 @@ qrc_*.cpp
 ui_*.h
 *.moc
 src/lang/qbittorrent_*.qm
+src/webui/www/translations/webui_*.qm
 .DS_Store
 .qmake.stash
 src/qbittorrent.app
@@ -34,3 +36,10 @@ 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

.tx/config

@@ -10,10 +10,18 @@ type = QT
 minimum_perc = 23
 mode = developer
 
-
 [qbittorrent.qbittorrentdesktop_master]
-source_file = src/icons/qBittorrent.desktop
+source_file = dist/unix/org.qbittorrent.qBittorrent.desktop
 source_lang = en
 type = DESKTOP
 minimum_perc = 23
 mode = developer
+
+[qbittorrent.qbittorrent_webui]
+file_filter = src/webui/www/translations/webui_<lang>.ts
+lang_map = pt: pt_PT
+source_file = src/webui/www/translations/webui_en.ts
+source_lang = en
+type = QT
+minimum_perc = 23
+mode = developer

CMakeLists.txt

@@ -1,5 +1,10 @@
-cmake_minimum_required(VERSION 3.5)
-cmake_policy(VERSION 3.5)
+cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
+
+message(AUTHOR_WARNING "If the build fails, please try the autotools/qmake method.")
+
+if(POLICY CMP0074)
+    cmake_policy(SET CMP0074 NEW)
+endif()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 include(FunctionReadVersion)
@@ -25,32 +30,31 @@ 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)
+include(GNUInstallDirs)
+include(FeatureSummary)
+
+# version requirements
+set(requiredBoostVersion 1.40)
+set(requiredQtVersion 5.9.0)
+set(requiredOpensslVersion 1.0)
+set(requiredLibtorrentVersion 1.1.10)
 
 if(WIN32)
     include(winconf)
 endif(WIN32)
 
-# we need options here, 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)
+# we need options here, at the top level, because they are used not only in "src" subdir, but in the "dist" dir too
+include(CompileFeature)
 
+optional_compile_definitions(COUNTRIES_RESOLUTION FEATURE DESCRIPTION "Enable resolving peers IP addresses to countries"
+    DEFAULT ON DISABLED DISABLE_COUNTRIES_RESOLUTION)
+optional_compile_definitions(STACKTRACE FEATURE DESCRIPTION "Enable stacktraces"
+    DEFAULT ON ENABLED STACKTRACE)
+optional_compile_definitions(WEBUI FEATURE DESCRIPTION "Enables built-in HTTP server for headless use"
+    DEFAULT ON DISABLED DISABLE_WEBUI)
 
 add_subdirectory(src)
 add_subdirectory(dist)
+
+feature_summary(DESCRIPTION "\nConfiguration results:" WHAT ALL)

CODING_GUIDELINES.md

@@ -6,6 +6,31 @@ For programming languages other than C++ (e.g. JavaScript) used in this reposito
 **Note 2:** You can use the `uncrustify` program/tool to clean up any source file. Use it with the `uncrustify.cfg` configuration file found in the root folder.  
 **Note 3:** There is also a style for QtCreator but it doesn't cover all cases. In QtCreator `Tools->Options...->C++->Code Style->Import...` and choose the `codingStyleQtCreator.xml` file found in the root folder.  
 
+### Table Of Contents
+
+* [1. New lines & curly braces](#1-new-lines--curly-braces)
+  * [a. Function blocks, class/struct definitions, namespaces](#a-function-blocks-classstruct-definitions-namespaces)
+  * [b. Other code blocks](#b-other-code-blocks)
+  * [c. Blocks in switch's case labels](#c-blocks-in-switchs-case-labels)
+  * [d. If-else statements](#d-if-else-statements)
+  * [e. Single statement if blocks](#e-single-statement-if-blocks)
+  * [f. Acceptable conditions to omit braces](#f-acceptable-conditions-to-omit-braces)
+  * [g. Brace enclosed initializers](#g-brace-enclosed-initializers)
+* [2. Indentation](#2-indentation)
+* [3. File encoding and line endings](#3-file-encoding-and-line-endings)
+* [4. Initialization lists](#4-initialization-lists)
+* [5. Enums](#5-enums)
+* [6. Names](#6-names)
+  * [a. Type names and namespaces](#a-type-names-and-namespaces)
+  * [b. Variable names](#b-variable-names)
+  * [c. Private member variable names](#c-private-member-variable-names)
+* [7. Header inclusion order](#7-header-inclusion-order)
+* [8. Include guard](#8-include-guard)
+* [9. Misc](#9-misc)
+* [10. Git commit message](#10-git-commit-message)
+* [11. Not covered above](#11-not-covered-above)
+---
+
 ### 1. New lines & curly braces ###
 
 #### a. Function blocks, class/struct definitions, namespaces ####
@@ -165,11 +190,11 @@ QVariantMap map {{"key1", 5}, {"key2", 10}};
 ### 2. Indentation ###
 4 spaces.
 
-### 3. File encoding and line endings. ###
+### 3. File encoding and line endings ###
 
 UTF-8 and Unix-like line ending (LF). Unless some platform specific files need other encodings/line endings.
 
-### 4. Initialization lists. ###
+### 4. Initialization lists ###
 Initialization lists should be vertical. This will allow for more easily readable diffs. The initialization colon should be indented and in its own line along with first argument. The rest of the arguments should be indented too and have the comma prepended.
 ```c++
 myClass::myClass(int a, int b, int c, int d)
@@ -182,7 +207,7 @@ myClass::myClass(int a, int b, int c, int d)
 }
 ```
 
-### 5. Enums. ###
+### 5. Enums ###
 Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
 ```c++
 enum Days
@@ -197,7 +222,7 @@ enum Days
 };
 ```
 
-### 6. Names. ###
+### 6. Names ###
 All names should be camelCased.
 
 #### a. Type names and namespaces ####
@@ -231,7 +256,7 @@ class MyClass
 }
 ```
 
-### 7. Header inclusion order. ###
+### 7. Header inclusion order ###
 The headers should be placed in the following group order:
   1. Module header (in .cpp)
   2. C++ Standard Library headers
@@ -239,11 +264,11 @@ The headers should be placed in the following group order:
   4. Boost library headers
   5. Libtorrent headers
   6. Qt headers
-  7. qBittorrent own headers, starting from *base* headers.
+  7. qBittorrent's own headers, starting from the *base* headers.
 
 The headers should be ordered alphabetically within each group.  
 If there are conditionals for the same header group, then put them at the bottom of the respective group.  
-If there are conditionals for the different header groups, then put them above of the "qBittorrent own headers" group.
+If there are conditionals that contain headers from several different header groups, then put them above the "qBittorrent's own headers" group.
 
 One exception is the header containing the library version (for example, QtGlobal), this particular header isn't constrained by the aforementioned order.
 
@@ -281,23 +306,23 @@ Example:
 #include <QString>
 #include <QUrl>
 
-#ifdef Q_OS_MAC  // conditional
+#ifdef Q_OS_MACOS  // conditional
 #include <QFont>
 #endif
 
-// conditional for the different header groups
+// conditional that contains headers from several different header groups
 #if LIBTORRENT_VERSION_NUM >= 10100
 #include <memory>
 #include <QElapsedTimer>
 #endif
 
-// qBittorrent own headers
+// qBittorrent's own headers
 #include "base/bittorrent/infohash.h"
 #include "anothermodule.h"
 #include "ui_examplewidget.h"
 ```
 
-### 8. Include guard. ###
+### 8. Include guard ###
 `#pragma once` should be used instead of "include guard" in new code:
 ```c++
 // examplewidget.h
@@ -313,7 +338,7 @@ class ExampleWidget : public QWidget
 
 ```
 
-### 9. Misc. ###
+### 9. Misc ###
 
 * Line breaks for long lines with operation:
 

INSTALL

@@ -1,54 +1,43 @@
-qBittorrent - A BitTorrent client in C++ / Qt4
+qBittorrent - A BitTorrent client in C++ / Qt
 ------------------------------------------
 
-1) Compile and install qBittorrent with Qt4 Graphical Interface
+1) Install these dependencies:
+
+  - Boost >= 1.40
+
+  - libtorrent-rasterbar >= 1.1.10 (by Arvid Norberg)
+      * https://www.libtorrent.org/
+      * Be careful: another library (the one used by rTorrent) uses a similar name
+
+  - OpenSSL >= 1.0
+
+  - Qt >= 5.9.0
+
+  - zlib >= 1.2.5.2
+
+  - pkg-config (compile-time only)
+
+  - Python >= 3.3.0 (optional, runtime only)
+      * Required by the internal search engine
+
+2a) Compile and install qBittorrent with Qt graphical interface
 
   $ ./configure
   $ make && make install
   $ qbittorrent
 
-  will install and execute qBittorrent hopefully without any problems.
+  will install and execute qBittorrent.
 
-  Dependencies:
-    - Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)
-
-    - pkg-config executable
-
-    - libtorrent-rasterbar by Arvid Norberg (>= 1.0.6)
-        -> http://www.libtorrent.net
-        Be careful: another library (the one used by rTorrent) uses a similar name.
-
-    - libboost >= 1.35.x (libboost-system)
-
-    - python >= 2.3 (needed by search engine)
-        * Run time only dependency
-
-    - geoip-database (optional)
-        * If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
-        * Run time only dependency
-
-2) Compile and install qBittorrent without Qt4 Graphical interface
+2b) Compile and install qBittorrent without Qt graphical interface
 
   $ ./configure --disable-gui
   $ make && make install
-  $ qbittorrent
-
-  will install and execute qBittorrent hopefully without any problems.
-
-  Dependencies:
-    - Qt >= 4.4.0 (libqt-devel, libqtcore, libqtnetwork)
-
-    - pkg-config executable
-
-    - libtorrent-rasterbar by Arvid Norberg (>= v1.0.6)
-        -> http://www.libtorrent.net
-        Be careful: another library (the one used by rTorrent) uses a similar name.
-
-    - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
+  $ qbittorrent-nox
 
+  will install and execute qBittorrent.
 
 DOCUMENTATION:
-Please note that there is a documentation with a "compiling howto" at http://wiki.qbittorrent.org.
+Please note that there is a "Compilation" section at http://wiki.qbittorrent.org.
 
 ------------------------------------------
-Christophe Dumez <chris@qbittorrent.org>
+sledgehammer999 <sledgehammer999@qbittorrent.org>

README.md

@@ -13,8 +13,7 @@ It aims to be a good alternative to all other bittorrent clients
 out there. qBittorrent is fast, stable and provides unicode
 support as well as many features.
 
-This product includes GeoLite data created by MaxMind, available from
-https://www.maxmind.com/
+The free [IP to Country Lite database](https://db-ip.com/db/download/ip-to-country-lite) by [DB-IP](https://db-ip.com/) is used for resolving the countries of peers. The database is licensed under the [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/).
 
 ### Installation:
 For installation, follow the instructions from INSTALL file, but simple:

build-aux/compile

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

build-aux/install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2018-03-11.20; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,15 +271,18 @@ do
     fi
     dst=$dst_arg
 
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
+    # If destination is a directory, append the input filename.
     if test -d "$dst"; then
       if test "$is_target_a_directory" = never; then
         echo "$0: $dst_arg: Is a directory" >&2
         exit 1
       fi
       dstdir=$dst
-      dst=$dstdir/`basename "$src"`
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
       dstdir_status=0
     else
       dstdir=`dirname "$dst"`
@@ -288,6 +291,11 @@ do
     fi
   fi
 
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
   obsolete_mkdir_used=false
 
   if test $dstdir_status != 0; then
@@ -324,34 +332,43 @@ do
             # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
             ;;
           *)
+            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
+            # here however when possible just to lower collision chance.
             tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            # Because "mkdir -p" follows existing symlinks and we likely work
+            # directly in world-writeable /tmp, make sure that the '$tmpdir'
+            # directory is successfully created first before we actually test
+            # 'mkdir -p' feature.
             if (umask $mkdir_umask &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
             then
               if test -z "$dir_arg" || {
                    # Check for POSIX incompatibilities with -m.
                    # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
                    # other-writable bit of parent directory when it shouldn't.
                    # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
                    case $ls_ld_tmpdir in
                      d????-?r-*) different_mode=700;;
                      d????-?--*) different_mode=755;;
                      *) false;;
                    esac &&
-                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
                      test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
                    }
                  }
               then posix_mkdir=:
               fi
-              rmdir "$tmpdir/d" "$tmpdir"
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
             else
               # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
             fi
             trap '' 0;;
         esac;;
@@ -427,8 +444,8 @@ do
   else
 
     # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@@ -493,9 +510,9 @@ do
 done
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

build-aux/missing

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2013-10-28.13; # UTC
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@ else
   exit $st
 fi
 
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
 
 program_details ()
 {
@@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
 exit $st
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

cmake/Modules/CompileFeature.cmake

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

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -38,8 +38,9 @@ else()
         # libtorrent is very picky about those. Let's take a set of defaults and
         # hope that they apply. If not, you the user are on your own.
         set(LibtorrentRasterbar_DEFINITIONS
+            -DTORRENT_USE_LIBCRYPTO
+            # TODO: remove the following define as it is not used since OpenSSL >= 1.1
             -DTORRENT_USE_OPENSSL
-            -DTORRENT_DISABLE_GEO_IP
             -DBOOST_ASIO_ENABLE_CANCELIO
             -DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64)
     endif()
@@ -47,7 +48,7 @@ else()
     if(NOT LibtorrentRasterbar_USE_STATIC_LIBS)
         list(APPEND LibtorrentRasterbar_DEFINITIONS
             -DTORRENT_LINKING_SHARED
-            -DBOOST_SYSTEM_DYN_LINK -DBOOST_CHRONO_DYN_LINK)
+            -DBOOST_SYSTEM_DYN_LINK)
     endif()
 endif()
 
@@ -99,6 +100,7 @@ list(FIND LibtorrentRasterbar_DEFINITIONS -DTORRENT_USE_OPENSSL LibtorrentRaster
 if(LibtorrentRasterbar_ENCRYPTION_INDEX GREATER -1)
     find_package(OpenSSL REQUIRED)
     set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto)
+    list(APPEND LibtorrentRasterbar_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
     set(LibtorrentRasterbar_OPENSSL_ENABLED ON)
 endif()
 
@@ -113,10 +115,10 @@ mark_as_advanced(LibtorrentRasterbar_INCLUDE_DIR LibtorrentRasterbar_LIBRARY
     LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES
     LibtorrentRasterbar_ENCRYPTION_INDEX)
 
-if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::LibTorrent)
-    add_library(LibtorrentRasterbar::LibTorrent UNKNOWN IMPORTED)
+if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::torrent-rasterbar)
+    add_library(LibtorrentRasterbar::torrent-rasterbar UNKNOWN IMPORTED)
 
-    set_target_properties(LibtorrentRasterbar::LibTorrent PROPERTIES
+    set_target_properties(LibtorrentRasterbar::torrent-rasterbar PROPERTIES
         IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
         IMPORTED_LOCATION "${LibtorrentRasterbar_LIBRARY}"
         INTERFACE_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"

cmake/Modules/FindQtSingleApplication.cmake

@@ -1,94 +0,0 @@
-# - Try to find the QtSingleApplication includes and library
-# which defines
-#
-# QTSINGLEAPPLICATION_FOUND - system has QtSingleApplication
-# QTSINGLEAPPLICATION_INCLUDE_DIR - where to find header QtSingleApplication
-# QTSINGLEAPPLICATION_LIBRARIES - the libraries to link against to use QtSingleApplication
-# QTSINGLEAPPLICATION_LIBRARY - where to find the QtSingleApplication library (not for general use)
-
-# copyright (c) 2013 TI_Eugene ti.eugene@gmail.com
-#
-# Redistribution and use is allowed according to the terms of the FreeBSD license.
-
-SET(QTSINGLEAPPLICATION_FOUND FALSE)
-
-IF(QT4_FOUND)
-    message(STATUS "Looking for Qt4 single application library")
-    FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication
-                # standard locations
-                /usr/include
-                /usr/include/QtSolutions
-                # qt4 location except mac's frameworks
-                "${QT_INCLUDE_DIR}/QtSolutions"
-                # mac's frameworks
-                ${FRAMEWORK_INCLUDE_DIR}/QtSolutions
-    )
-
-    SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES}
-        QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
-    FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
-        NAMES ${QTSINGLEAPPLICATION_NAMES}
-        PATHS ${QT_LIBRARY_DIR}
-    )
-ELSEIF(Qt5Core_FOUND)
-    message(STATUS "Looking for Qt5 single application library")
-    FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
-        FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication ${TOP_INCLUDE_PATH}/QtSolutions)
-
-        IF(QTSINGLEAPPLICATION_INCLUDE_DIR)
-            BREAK()
-        ENDIF()
-    ENDFOREACH()
-
-    SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES}
-        Qt5Solutions_SingleApplication-2.6 libQt5Solutions_SingleApplication-2.6
-        QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
-    GET_TARGET_PROPERTY(_QT5_CORELIBRARY Qt5::Core LOCATION)
-    GET_FILENAME_COMPONENT(_QT5_CORELIBRARYPATH ${_QT5_CORELIBRARY} PATH)
-
-    FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
-        NAMES ${QTSINGLEAPPLICATION_NAMES}
-        PATHS ${_QT5_CORELIBRARYPATH}
-    )
-ENDIF()
-
-IF (QTSINGLEAPPLICATION_LIBRARY AND QTSINGLEAPPLICATION_INCLUDE_DIR)
-
-    SET(QTSINGLEAPPLICATION_LIBRARIES ${QTSINGLEAPPLICATION_LIBRARY})
-    SET(QTSINGLEAPPLICATION_FOUND TRUE)
-
-    IF (CYGWIN)
-        IF(BUILD_SHARED_LIBS)
-        # No need to define QTSINGLEAPPLICATION_USE_DLL here, because it's default for Cygwin.
-        ELSE(BUILD_SHARED_LIBS)
-        SET (QTSINGLEAPPLICATION_DEFINITIONS -DQTSINGLEAPPLICATION_STATIC)
-        ENDIF(BUILD_SHARED_LIBS)
-    ENDIF (CYGWIN)
-
-ENDIF (QTSINGLEAPPLICATION_LIBRARY AND QTSINGLEAPPLICATION_INCLUDE_DIR)
-
-IF (QTSINGLEAPPLICATION_FOUND)
-  IF (NOT QtSingleApplication_FIND_QUIETLY)
-    MESSAGE(STATUS "Found QtSingleApplication: ${QTSINGLEAPPLICATION_LIBRARY}")
-    MESSAGE(STATUS "         includes: ${QTSINGLEAPPLICATION_INCLUDE_DIR}")
-  ENDIF (NOT QtSingleApplication_FIND_QUIETLY)
-ELSE (QTSINGLEAPPLICATION_FOUND)
-  IF (QtSingleApplication_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find QtSingleApplication library")
-  ENDIF (QtSingleApplication_FIND_REQUIRED)
-ENDIF (QTSINGLEAPPLICATION_FOUND)
-
-MARK_AS_ADVANCED(QTSINGLEAPPLICATION_INCLUDE_DIR QTSINGLEAPPLICATION_LIBRARY)
-
-if(NOT TARGET QtSingleApplication::QtSingleApplication)
-    add_library(QtSingleApplication::QtSingleApplication UNKNOWN IMPORTED)
-    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}"
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}"
-    )
-    if(EXISTS "${QTSINGLEAPPLICATION_LIBRARY}")
-    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-        IMPORTED_LOCATION "${QTSINGLEAPPLICATION_LIBRARY}")
-    endif()
-endif(NOT TARGET QtSingleApplication::QtSingleApplication)

cmake/Modules/MacroConfigureMSVCRuntime.cmake

@@ -1,38 +1,36 @@
 macro(configure_msvc_runtime)
-    if(MSVC)
-        # Default to statically-linked runtime.
-        if("${MSVC_RUNTIME}" STREQUAL "")
-            set(MSVC_RUNTIME "static")
-        endif()
-        # Set compiler options.
-        set(variables
-            CMAKE_C_FLAGS_DEBUG
-            CMAKE_C_FLAGS_MINSIZEREL
-            CMAKE_C_FLAGS_RELEASE
-            CMAKE_C_FLAGS_RELWITHDEBINFO
-            CMAKE_CXX_FLAGS_DEBUG
-            CMAKE_CXX_FLAGS_MINSIZEREL
-            CMAKE_CXX_FLAGS_RELEASE
-            CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    # Default to statically-linked runtime.
+    if("${MSVC_RUNTIME}" STREQUAL "")
+        set(MSVC_RUNTIME "static")
+    endif()
+    # Set compiler options.
+    set(variables
+        CMAKE_C_FLAGS_DEBUG
+        CMAKE_C_FLAGS_MINSIZEREL
+        CMAKE_C_FLAGS_RELEASE
+        CMAKE_C_FLAGS_RELWITHDEBINFO
+        CMAKE_CXX_FLAGS_DEBUG
+        CMAKE_CXX_FLAGS_MINSIZEREL
+        CMAKE_CXX_FLAGS_RELEASE
+        CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    )
+    if(${MSVC_RUNTIME} STREQUAL "static")
+        message(STATUS
+            "MSVC -> forcing use of statically-linked runtime."
         )
-        if(${MSVC_RUNTIME} STREQUAL "static")
-            message(STATUS
-                "MSVC -> forcing use of statically-linked runtime."
-            )
-            foreach(variable ${variables})
-                if(${variable} MATCHES "/MD")
-                    string(REGEX REPLACE "/MD" "/MT" ${variable} "${${variable}}")
-                endif()
-            endforeach()
-        else()
-            message(STATUS
-                "MSVC -> forcing use of dynamically-linked runtime."
-            )
-            foreach(variable ${variables})
-                if(${variable} MATCHES "/MT")
-                    string(REGEX REPLACE "/MT" "/MD" ${variable} "${${variable}}")
-                endif()
-            endforeach()
-        endif()
+        foreach(variable ${variables})
+            if(${variable} MATCHES "/MD")
+                string(REGEX REPLACE "/MD" "/MT" ${variable} "${${variable}}")
+            endif()
+        endforeach()
+    else()
+        message(STATUS
+            "MSVC -> forcing use of dynamically-linked runtime."
+        )
+        foreach(variable ${variables})
+            if(${variable} MATCHES "/MT")
+                string(REGEX REPLACE "/MT" "/MD" ${variable} "${${variable}}")
+            endif()
+        endforeach()
     endif()
 endmacro()

cmake/Modules/MacroGlibcDetect.cmake

@@ -1,49 +0,0 @@
- ###############################################################
- #
- # Copyright 2011 Red Hat, Inc.
- #
- # Licensed under the Apache License, Version 2.0 (the "License"); you
- # may not use this file except in compliance with the License.  You may
- # obtain a copy of the License at
- #
- #    http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
- #
- ###############################################################
-
-MACRO (GLIBC_DETECT _VERSION)
-
-# there are multiple ways to detect glibc, but given nmi's
-# cons'd up paths I will trust only gcc.  I guess I could also use
-# ldd --version to detect.
-
-    set(_GLIB_SOURCE_DETECT "
-#include <limits.h>
-#include <stdio.h>
-int main()
-{
-  printf(\"%d%d\",__GLIBC__, __GLIBC_MINOR__);
-  return 0;
-}
-")
-
-file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/build/cmake/glibc.cpp "${_GLIB_SOURCE_DETECT}\n")
-
-try_run(POST26_GLIBC_DETECTED
-        POST26_GLIBC_COMPILE
-        ${CMAKE_CURRENT_BINARY_DIR}/build/cmake
-        ${CMAKE_CURRENT_BINARY_DIR}/build/cmake/glibc.cpp
-        RUN_OUTPUT_VARIABLE GLIBC_VERSION )
-
-if (GLIBC_VERSION AND POST26_GLIBC_COMPILE )
-    set(${_VERSION} ${GLIBC_VERSION})
-else()
-    message(STATUS "NOTE: Could not detect GLIBC_VERSION from compiler")
-endif()
-
-ENDMACRO (GLIBC_DETECT)

cmake/Modules/MacroQbtCompilerSettings.cmake

@@ -10,23 +10,22 @@ macro(qbt_set_compiler_options)
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
         #-Wshadow -Wconversion ?
         set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra"
-            "-Wfloat-equal -Wcast-qual -Wcast-align"
-            "-Wsign-conversion -Winvalid-pch -Werror=return-type -Wno-long-long"
-#			-fstack-protector-all
-            "-Werror -Wno-error=deprecated-declarations"
+            "-Wcast-qual -Wcast-align"
+            "-Winvalid-pch -Wno-long-long"
+            #"-fstack-protector-all"
+            #"-Werror -Wno-error=deprecated-declarations"
         )
-        set (_GCC_COMMON_CXX_FLAGS  "-fexceptions -frtti"
+        set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti"
             "-Woverloaded-virtual -Wold-style-cast"
-            "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align"
-            "-Werror=overloaded-virtual"
-    # 		"-Weffc++"
-            "-Werror -Wno-error=cpp"
+            "-Wnon-virtual-dtor"
+            #"-Weffc++"
+            #"-Werror -Wno-error=cpp"
             # we should modify code to make these ones obsolete
-            "-Wno-error=sign-conversion -Wno-error=float-equal"
+            #"-Wno-error=sign-conversion -Wno-error=float-equal"
         )
 
+        # GCC 4.8 has problems with std::array and its initialization
         if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
-            # GCC 4.8 has problems with std::array and its initialization
             list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=missing-field-initializers")
         endif()
 
@@ -40,29 +39,18 @@ macro(qbt_set_compiler_options)
         endif (_PEDANTIC_IS_SUPPORTED)
 
         if (CMAKE_SYSTEM_NAME MATCHES Linux)
-            # if Glibc version is 2.20 or higher, set -D_DEFAULT_SOURCE
-            include(MacroGlibcDetect)
-            message(STATUS "Detecting Glibc version...")
-            glibc_detect(GLIBC_VERSION)
-            if(${GLIBC_VERSION})
-                if(GLIBC_VERSION LESS "220")
-                    message(STATUS "Glibc version is ${GLIBC_VERSION}")
-                else(GLIBC_VERSION LESS "220")
-                    message(STATUS "Glibc version is ${GLIBC_VERSION}, adding -D_DEFAULT_SOURCE")
-                    add_definitions(-D_DEFAULT_SOURCE)
-                endif(GLIBC_VERSION LESS "220")
-            endif(${GLIBC_VERSION})
-        endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+            add_definitions(-D_DEFAULT_SOURCE)
+        endif()
 
+        # Clang 5.0 still doesn't support -Wstrict-null-sentinel
         if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-            # Clang 5.0 still doesn't support -Wstrict-null-sentinel
             check_cxx_compiler_flag(-Wstrict-null-sentinel _STRICT_NULL_SENTINEL_IS_SUPPORTED)
             if (_STRICT_NULL_SENTINEL_IS_SUPPORTED)
                 list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
             endif (_STRICT_NULL_SENTINEL_IS_SUPPORTED)
 
             # Code should be improved to render this not needed
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=unused-function -Wno-error=inconsistent-missing-override")
+            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=unused-function")
         else ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
             # GCC supports it
             list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
@@ -73,31 +61,14 @@ macro(qbt_set_compiler_options)
 
         string(APPEND CMAKE_C_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING}")
         string(APPEND CMAKE_CXX_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING} ${_GCC_COMMON_CXX_FLAGS_STRING}")
-
-        set(QBT_ADDITONAL_FLAGS "${_GCC_COMMON_C_AND_CXX_FLAGS_STRING}" CACHE STRING
-            "Additional qBittorent compile flags" FORCE)
-        set(QBT_ADDITONAL_CXX_FLAGS "${_GCC_COMMON_CXX_FLAGS_STRING}" CACHE STRING
-            "Additional qBittorent C++ compile flags" FORCE)
-
-        # check whether we can enable -Og optimization for debug build
-        # also let's enable -march=native for debug builds
-        check_cxx_compiler_flag(-Og _DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-
-        if (_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-            string(APPEND CMAKE_C_FLAGS_DEBUG " -Og -g3 -march=native -pipe" )
-            string(APPEND CMAKE_CXX_FLAGS_DEBUG " -Og -g3 -march=native -pipe" )
-        else(_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-            string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g3 -march=native -pipe" )
-            string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g3 -march=native -pipe" )
-        endif (_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
     endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-        set(QBT_ADDITONAL_FLAGS "-wd4290 -wd4275 -wd4251 /W4" CACHE STRING "Additional qBittorent compile flags")
-        string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITONAL_FLAGS}")
-        string(APPEND CMAKE_CXX_FLAGS " ${QBT_ADDITONAL_FLAGS}")
+        set(QBT_ADDITONAL_FLAGS "/wd4251 /wd4275 /wd4290  /W4" CACHE STRING "Additional qBittorent compile flags")
     endif ()
 
+    string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITONAL_FLAGS}")
+    string(APPEND CMAKE_CXX_FLAGS " ${QBT_ADDITONAL_FLAGS}")
+
 # endif (NOT QBT_ADDITONAL_FLAGS)
 endmacro(qbt_set_compiler_options)
-

cmake/Modules/QbtTargetSources.cmake

@@ -1,16 +1,17 @@
-# a helper function which appends source to the main qBt target
-# sources file names are relative to the the ${qBittorrent_SOURCE_DIR}
+# a helper function which appends source to the target
+# sources file names are relative to the the target source dir
 
-function (qbt_target_sources)
-    set (_sources_rel "")
-    foreach (_source IN ITEMS ${ARGN})
-        if (IS_ABSOLUTE "${_source}")
-            set(source_abs "${_source}")
+function (qbt_target_sources _target _scope)
+    get_target_property(targetSourceDir ${_target} SOURCE_DIR)
+    set(sourcesRelative "")
+    foreach(source IN ITEMS ${ARGN})
+        if(IS_ABSOLUTE "${source}")
+            set(sourceAbsolutePath "${source}")
         else()
-            get_filename_component(_source_abs "${_source}" ABSOLUTE)
+            get_filename_component(sourceAbsolutePath "${source}" ABSOLUTE)
         endif()
-        file (RELATIVE_PATH _source_rel "${qbt_executable_SOURCE_DIR}" "${_source_abs}")
-        list (APPEND _sources_rel "${_source_rel}")
+        file(RELATIVE_PATH sourceRelativePath "${targetSourceDir}" "${sourceAbsolutePath}")
+        list(APPEND sourcesRelative "${sourceRelativePath}")
     endforeach()
-    target_sources (qBittorrent PRIVATE "${_sources_rel}")
-endfunction (qbt_target_sources)
+    target_sources(${_target} ${_scope} "${sourcesRelative}")
+endfunction(qbt_target_sources)

cmake/Modules/QbtTranslations.cmake

@@ -0,0 +1,48 @@
+# macros to handle translation files
+
+# qbt_add_translations(<target> QRC_FILE <filename> TS_FILES <filenames>)
+# handles out of source builds for Qt resource files that include translations
+# The function generates translations out of the supplied list of .ts files in the build directory,
+# copies the .qrc file there, calls qt5_add_resources() adds its output to the target sources list.
+function(qbt_add_translations _target)
+    set(oneValueArgs QRC_FILE)
+    set(multiValueArgs TS_FILES)
+    cmake_parse_arguments(QBT_TR "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    get_target_property(_binaryDir ${_target} BINARY_DIR)
+
+    if (NOT QBT_TR_QRC_FILE)
+        message(FATAL_ERROR "QRC file is empty")
+    endif()
+    if (NOT QBT_TR_TS_FILES)
+        message(FATAL_ERROR "TS_FILES files are empty")
+    endif()
+
+    if(IS_ABSOLUTE "${QBT_TR_QRC_FILE}")
+        file(RELATIVE_PATH _qrcToTs "${CMAKE_CURRENT_SOURCE_DIR}" "${QBT_TR_QRC_FILE}")
+    else()
+        set(_qrcToTs "${QBT_TR_QRC_FILE}")
+    endif()
+
+    get_filename_component(_qrcToTsDir "${_qrcToTs}" DIRECTORY)
+
+    get_filename_component(_qmFilesBinaryDir "${CMAKE_CURRENT_BINARY_DIR}/${_qrcToTsDir}" ABSOLUTE)
+    # to make qt5_add_translation() work as we need
+    set_source_files_properties(${QBT_TR_TS_FILES} PROPERTIES OUTPUT_LOCATION "${_qmFilesBinaryDir}")
+    qt5_add_translation(_qmFiles ${QBT_TR_TS_FILES})
+
+    set(_qrc_dest_dir "${_binaryDir}/${_qrcToTsDir}")
+    set(_qrc_dest_file "${_binaryDir}/${QBT_TR_QRC_FILE}")
+
+    message(STATUS "copying ${QBT_TR_QRC_FILE} to ${_qrc_dest_dir}")
+    file(COPY ${QBT_TR_QRC_FILE} DESTINATION ${_qrc_dest_dir})
+
+    set_source_files_properties("${_qrc_dest_file}" PROPERTIES
+        GENERATED True
+        OBJECT_DEPENDS "${_qmFiles}")
+
+    # With AUTORCC enabled rcc is ran by cmake before language files are generated,
+    # and thus we call rcc explicitly
+    qt5_add_resources(_resources "${_qrc_dest_file}")
+    target_sources(${_target} PRIVATE "${_resources}")
+endfunction()

cmake/Modules/winconf-mingw.cmake

@@ -1,14 +1,11 @@
-if (STACKTRACE_WIN)
-    if ("${WINXXBITS}" NOT STREQUAL "Win64")
-        add_compile_options(-fno-omit-frame-pointer)
-    endif ("${WINXXBITS}" NOT STREQUAL "Win64")
-    link_libraries(libdbghelp  -Wl,--export-all-symbols)
-endif (STACKTRACE_WIN)
-
 if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
     link_libraries(-Wl,--dynamicbase)
-endif()
+endif ()
+
+list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
+    -D_FILE_OFFSET_BITS=64
+    -D__USE_W32_SOCKETS)
+
+# libraries from winconf.pri
+link_libraries(advapi32 iphlpapi ole32 shell32 user32 wsock32 ws2_32)
 
-# LIBS += libadvapi32 libshell32 libuser32
-# LIBS += libcrypto.dll libssl.dll libwsock32 libws2_32 libz libiconv.dll
-# LIBS += libpowrprof

cmake/Modules/winconf-msvc.cmake

@@ -1,21 +1,7 @@
-if (STACKTRACE_WIN)
-    if ("${WINXXBITS}" STREQUAL "Win64")
-        add_compile_options(-Zi)
-    else ("${WINXXBITS}" STREQUAL "Win64")
-        # i686 arch requires frame pointer preservation
-        add_compile_options(-Oy-)
-    endif ("${WINXXBITS}" STREQUAL "Win64")
-    link_libraries(dbghelp.lib)
-endif (STACKTRACE_WIN)
-
-# Enable Wide characters
-add_definitions(-DTORRENT_USE_WPATH)
-
-if (NOT QT5)
-    # Qt4 does not detect it itself
-    add_definitions(-DQ_COMPILER_INITIALIZER_LISTS)
-endif (NOT QT5)
-
 include(MacroConfigureMSVCRuntime)
 set(MSVC_RUNTIME "dynamic")
 configure_msvc_runtime()
+
+# libraries from winconf.pri
+link_libraries(advapi32 crypt32 Iphlpapi ole32 shell32 User32)
+

cmake/Modules/winconf.cmake

@@ -2,33 +2,51 @@
 
 list(APPEND CMAKE_LIBRARY_PATH "$ENV{LIB}")
 
-# We want to link with static version of
-# libtorrent
-set(LibtorrentRasterbar_USE_STATIC_LIBS True)
 set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
-    -DBOOST_ALL_NO_LIB -DBOOST_ASIO_HASH_MAP_BUCKETS=1021
-    -DBOOST_ASIO_SEPARATE_COMPILATION
+    -DBOOST_ASIO_DISABLE_CONNECTEX
     -DBOOST_EXCEPTION_DISABLE
-    -DBOOST_SYSTEM_STATIC_LINK=1
+    -DTORRENT_USE_LIBCRYPTO
+    # TODO: remove the following define as it is not used since OpenSSL >= 1.1
     -DTORRENT_USE_OPENSSL
-    -D__USE_W32_SOCKETS
-    -D_FILE_OFFSET_BITS=64)
+    # TODO: remove the following define as it is not used since libtorrent >= 1.2
+    -DTORRENT_DISABLE_RESOLVE_COUNTRIES
+)
 
-add_definitions(-DUNICODE
+set(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES system)
+
+# If you want to link with static version of libtorrent
+#set(LibtorrentRasterbar_USE_STATIC_LIBS True)
+#list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
+#    -DBOOST_SYSTEM_STATIC_LINK=1)
+
+# and boost
+#set(Boost_USE_STATIC_LIBS True)
+#set(Boost_USE_STATIC_RUNTIME True)
+
+add_definitions(
+    -DNTDDI_VERSION=0x06010000
+    -D_WIN32_WINNT=0x0601
+    -D_WIN32_IE=0x0601
+    -DUNICODE
     -D_UNICODE
     -DWIN32
     -D_WIN32
     -DWIN32_LEAN_AND_MEAN
-    -DNTDDI_VERSION=0x05010000
-    -D_WIN32_WINNT=0x0501
-    -D_WIN32_IE=0x0501
     -D_CRT_SECURE_NO_DEPRECATE
     -D_SCL_SECURE_NO_DEPRECATE
     -DNOMINMAX
+    -DBOOST_ALL_NO_LIB
 )
-# and boost
-set(Boost_USE_STATIC_LIBS  True)
-# set(Boost_USE_STATIC_RUNTIME True)
+
+# Enable if libtorrent was built with this flag defined
+#list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS -DTORRENT_NO_DEPRECATE)
+
+if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
+    list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
+    -DTORRENT_DEBUG)
+else ()
+    add_definitions(-DNDEBUG)
+endif ()
 
 # Here we assume that all required libraries are installed into the same prefix
 # with usual unix subdirectories (bin, lib, include)
@@ -38,17 +56,9 @@ set(COMMON_INSTALL_PREFIX "c:/usr" CACHE PATH "Prefix used to install all the re
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH "${COMMON_INSTALL_PREFIX}")
 
 # If two version of Qt are installed, separate prefixes are needed most likely
-set(QT4_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt4" CACHE PATH "Prefix where Qt4 is installed")
 set(QT5_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt5" CACHE PATH "Prefix where Qt5 is installed")
 
 # it is safe to set Qt dirs even if their files are directly in the prefix
-# Qt4
-if(NOT QT5)
-    # for qt 4 we need qmake, Qt5 provides cmake config files
-    LIST(APPEND CMAKE_PROGRAM_PATH  "${QT4_INSTALL_PREFIX}/bin/")
-endif(NOT QT5)
-
-# Qt5
 set(Qt5_DIR "${QT5_INSTALL_PREFIX}/lib/cmake/Qt5")
 
 # And now we can set specific values for the Boost and libtorrent libraries.

conf.pri.in

@@ -5,6 +5,8 @@ BINDIR = @EXPAND_BINDIR@
 DATADIR = @EXPAND_DATADIR@
 MANPREFIX = @EXPAND_MANDIR@
 
+QMAKE_CC = @QBT_CC@
+QMAKE_CXX = @QBT_CXX@
 QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
 
 EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@

conf.pri.windows

@@ -35,27 +35,24 @@ LIBS += zlib.lib
 #LIBS += libcrypto libssl
 #LIBS += libz
 
-DEFINES += NTDDI_VERSION=0x05010000
-DEFINES += _WIN32_WINNT=0x0501
-DEFINES += _WIN32_IE=0x0501
-
 # Disable to use Boost auto-linking
 DEFINES += BOOST_ALL_NO_LIB
 # Use one of the following options
 DEFINES += BOOST_SYSTEM_STATIC_LINK
 #DEFINES += BOOST_SYSTEM_DYN_LINK
-# Boost 1.60+ defaults to Vista+ support. The define below enables XP support again.
-DEFINES += BOOST_USE_WINAPI_VERSION=0x0501
-# Enable if building against libtorrent 1.0.x (RC_1_0) (static linking)
-#DEFINES += BOOST_ASIO_SEPARATE_COMPILATION
-# Enable if building against libtorrent 1.0.x (RC_1_0) (dynamic linking)
-#DEFINES += BOOST_ASIO_DYN_LINK
+# Enable if encountered build error with boost version <= 1.59
+#DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES
 
-# Enable if building against libtorrent 1.1.x (RC_1_1)
-# built with this flag defined
+# Enable if libtorrent was built with this flag defined
 #DEFINES += TORRENT_NO_DEPRECATE
 # Enable if linking dynamically against libtorrent
 #DEFINES += TORRENT_LINKING_SHARED
 
 # Enable stack trace support
-CONFIG += strace_win
+CONFIG += stacktrace
+
+win32-msvc* {
+    QMAKE_CXXFLAGS += "/guard:cf"
+    QMAKE_LFLAGS += "/guard:cf"
+    QMAKE_LFLAGS_RELEASE += "/OPT:REF /OPT:ICF"
+}

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v4.1.0alpha], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.2.5], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
@@ -8,16 +8,12 @@ AC_LANG(C++)
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
 
-
+# use compiler from env variables if available
+QBT_CC="$CC"
+QBT_CXX="$CXX"
 
 # Define --wth-* and --enable-* arguments
 
-AC_ARG_WITH(qtsingleapplication,
-            [AS_HELP_STRING([--with-qtsingleapplication=@<:@system|shipped@:>@],
-                            [Use the shipped qtsingleapplication library or the system one (default=shipped)])],
-            [],
-            [with_qtsingleapplication=shipped])
-
 AC_ARG_ENABLE(debug,
               [AS_HELP_STRING([--enable-debug],
                               [Enable debug build])],
@@ -161,38 +157,72 @@ AS_CASE(["x$enable_qt_dbus"],
         AC_MSG_ERROR([Unknown option "$enable_qt_dbus". Use either "yes" or "no".])])
 
 
-AX_BOOST_BASE([1.35],
-              [AC_MSG_NOTICE([Boost CPPFLAGS: "$BOOST_CPPFLAGS"
-                Boost LDFLAGS: "$BOOST_LDFLAGS"])],
+AX_BOOST_BASE([1.40],
+              [AC_MSG_NOTICE([Boost CXXFLAGS: "$BOOST_CPPFLAGS"])
+               AC_MSG_NOTICE([Boost LDFLAGS: "$BOOST_LDFLAGS"])],
               [AC_MSG_ERROR([Could not find Boost])])
-CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
+CXXFLAGS="$BOOST_CPPFLAGS $CXXFLAGS"
 LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
 
+# add workaround for problematic boost version
+# taken from ax_boost_base.m4
+m4_define([DETECT_BOOST_VERSION_PROGRAM],
+    [AC_LANG_PROGRAM([[#include <boost/version.hpp>]],
+                     [[(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($1))]));]])])
+
+AC_COMPILE_IFELSE([DETECT_BOOST_VERSION_PROGRAM(106000)], [],
+    [QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"])
+
 AX_BOOST_SYSTEM()
 AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
 LIBS="$BOOST_SYSTEM_LIB $LIBS"
 
-AC_MSG_CHECKING([which qtsingleapplication to use])
-AS_CASE(["x$with_qtsingleapplication"],
-        ["xshipped"],
-                   [AC_MSG_RESULT([shipped])
-                   QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG usesystemqtsingleapplication"],
-        ["xsystem"],
-                  [AC_MSG_RESULT([system])
-                  QBT_ADD_CONFIG="$QBT_ADD_CONFIG usesystemqtsingleapplication"],
-        [AC_MSG_RESULT([$with_qtsingleapplication])
-        AC_MSG_ERROR([Unknown option "$with_qtsingleapplication". Use either "system" or "shipped".])])
-
 PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 1.0.6],
-                  [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
+                  [libtorrent-rasterbar >= 1.1.10],
+                  [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS"
                   LIBS="$libtorrent_LIBS $LIBS"])
 
+PKG_CHECK_MODULES(openssl,
+                  [openssl >= 1.0],
+                  [CXXFLAGS="$openssl_CFLAGS $CXXFLAGS"
+                  LIBS="$openssl_LIBS $LIBS"])
+
 PKG_CHECK_MODULES(zlib,
                  [zlib >= 1.2.5.2],
-                 [CPPFLAGS="$zlib_CFLAGS $CPPFLAGS"
+                 [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
+TMP_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=""
+AC_MSG_CHECKING([if compiler defaults to C++14 or later mode])
+AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+                  [AC_MSG_RESULT([yes])
+                   QBT_CXX14_FOUND="yes"],
+                  [AC_MSG_RESULT([no])
+                   QBT_CXX14_FOUND="no"])
+
+# In case of no, check if the compiler can support at least C++14
+# 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()],
+                        [AC_MSG_RESULT([yes])
+                         AC_MSG_CHECKING([if C++14 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()],
+                                           [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.])],
+                                           [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_RESULT([no])
+                         AC_MSG_ERROR([A compiler supporting C++14 is required.])])
+      ])
+CXXFLAGS="$TMP_CXXFLAGS"
+
 # These are required because autoconf doesn't expand these **particular**
 # vars automatically. And qmake cannot autoexpand them.
 AX_DEFINE_DIR([EXPAND_PREFIX], [prefix])
@@ -219,18 +249,20 @@ extract() {
   for i in $string; do
     case "$(echo "$i" | cut -c1)" in
       '') ;;
-      D) QBT_CONF_DEFINES="$(echo $i | cut -c2-) $QBT_CONF_DEFINES";;
-      I) QBT_CONF_INCLUDES="$(echo $i | cut -c2-) $QBT_CONF_INCLUDES";;
-      *) QBT_CONF_EXTRA_CFLAGS="-$i $QBT_CONF_EXTRA_CFLAGS";;
+      D) QBT_CONF_DEFINES="$QBT_CONF_DEFINES $(echo $i | cut -c2-)";;
+      I) QBT_CONF_INCLUDES="$QBT_CONF_INCLUDES $(echo $i | cut -c2-)";;
+      *) QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS -$i";;
     esac
   done
   IFS=$SAVEIFS
 }
 
-extract "$CFLAGS $CPPFLAGS $CXXFLAGS"
+extract "$CFLAGS $CXXFLAGS"
 QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
 
 # Substitute the values of these vars in conf.pri.in
+AC_SUBST(QBT_CC)
+AC_SUBST(QBT_CXX)
 AC_SUBST(QBT_CONF_INCLUDES)
 AC_SUBST(QBT_CONF_EXTRA_CFLAGS)
 AC_SUBST(QBT_ADD_CONFIG)
@@ -242,17 +274,14 @@ AC_OUTPUT(conf.pri)
 AS_IF([test "x$enable_systemd" = "xyes"],
       [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)])
 
-
-
 AC_MSG_NOTICE([Running qmake to generate the makefile...])
-CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
-
-$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE"
-
-ret="$?"
+TOPDIR="$(cd "$(dirname "$0")" && pwd)"
+$QT_QMAKE -r "$TOPDIR/qbittorrent.pro" "QMAKE_LRELEASE=$QMAKE_LRELEASE"
+qmake_ret="$?"
 
 AS_ECHO()
-AS_IF([test "x$ret" = "x0"],
-      [AC_MSG_NOTICE([Good, your configure finished.])],
-      [AC_MSG_ERROR([Failed running $QT_QMAKE to generate the makefile])])
+AS_IF([test "x$qmake_ret" != "x0"],
+      [AC_MSG_ERROR([$QT_QMAKE failed to generate the makefile])])
+
+AC_MSG_NOTICE([Good, the configure finished.])
 AS_ECHO()

dist/CMakeLists.txt

@@ -1,3 +1,5 @@
+find_package(Qt5Widgets ${requiredQtVersion}) # to conditionally install desktop-related files
+
 if (APPLE)
     add_subdirectory(mac)
 else (APPLE)

dist/mac/Info.plist

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>qBittorrent</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -21,6 +25,10 @@
 			<array>
 				<string>org.bittorrent.torrent</string>
 			</array>
+			<key>NSExportableTypes</key>
+			<array>
+				<string>org.bittorrent.torrent</string>
+			</array>
 			<key>LSIsAppleDefaultForType</key>
 			<true/>
 		</dict>
@@ -28,6 +36,8 @@
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>magnet</string>
@@ -45,21 +55,19 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.0</string>
-	<key>CFBundleSignature</key>
-	<string>qBit</string>
+	<string>4.2.5</string>
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.qbittorrent</string>
+	<string>org.qbittorrent.qBittorrent</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>${MACOSX_DEPLOYMENT_TARGET}.0</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<key>NSHighResolutionCapable</key>
-	<string>True</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2018 The qBittorrent project</string>
+	<string>Copyright © 2006-2020 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>
@@ -76,17 +84,21 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.bittorrent.torrent</string>
 			<key>UTTypeReferenceURL</key>
-			<string>http://www.bittorrent.org/beps/bep_0000.html</string>
+			<string>https://www.bittorrent.org/beps/bep_0000.html</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>com.apple.ostype</key>
-				<string>TORR</string>
+				<array>
+					<string>TORR</string>
+				</array>
 				<key>public.filename-extension</key>
 				<array>
 					<string>torrent</string>
 				</array>
 				<key>public.mime-type</key>
-				<string>application/x-bittorrent</string>
+				<array>
+					<string>application/x-bittorrent</string>
+				</array>
 			</dict>
 		</dict>
 	</array>