Bump to 4.2.2

Closes #11748.

.appveyor.yml

@@ -51,6 +51,8 @@ before_build:
 
 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*
@@ -35,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

CMakeLists.txt

@@ -2,6 +2,10 @@ 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)
 
@@ -30,8 +34,10 @@ include(GNUInstallDirs)
 include(FeatureSummary)
 
 # version requirements
-set(requiredBoostVersion 1.35)
-set(requiredQtVersion 5.5.1)
+set(requiredBoostVersion 1.40)
+set(requiredQtVersion 5.9.0)
+set(requiredOpensslVersion 1.0)
+set(requiredLibtorrentVersion 1.1.10)
 
 if(WIN32)
     include(winconf)

CODING_GUIDELINES.md

@@ -306,7 +306,7 @@ Example:
 #include <QString>
 #include <QUrl>
 
-#ifdef Q_OS_MAC  // conditional
+#ifdef Q_OS_MACOS  // conditional
 #include <QFont>
 #endif
 

Changelog

@@ -1,15 +1,217 @@
-* Thu Oct 31 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.9.1
-    - WINDOWS: Fix a problem with bigger dialogs due to wrong DPI reported by the system (Chocobo1)
+Tue Mar 24 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.2
+    - FEATURE: Allow transfer list text color changes through QSS (Prince Gupta)
+    - FEATURE: Option to show console when external program is run (sledgehammer999)
+    - FEATURE: Rename Country column to "Country / Region" (Thomas Piccirello)
+    - FEATURE: Change the defaults of some settings (FranciscoPombal)
+    - FEATURE: Refactored Transfer List code to allow theming. As a sideffect the row height has more padding. (glassez)
+    - FEATURE: Allow double-click in preview dialog (thalieht)
+    - FEATURE: Expose stop_tracker_timeout in advanced settings (an0n666)
+    - FEATURE: Add piece_extent_affinity to AdvancedSettings (FranciscoPombal)
+    - FEATURE: Reorganize UI theme selection (Prince Gupta)
+    - FEATURE: Show any multiple connections from the same IP in peer list (thalieht)
+    - FEATURE: Add stalled filters to GUI and Web API/UI (FranciscoPombal)
+    - FEATURE: Use IP geolocation database by DB-IP instead of MaxMind (sledgehammer999)
+    - FEATURE: Allow to save downloaded metadata as torrent file (glassez)
+    - FEATURE: Allow single app instance per configuration (glassez)
+    - PERFORMANCE: Move multiple torrents one by one (glassez)
+    - BUGFIX: Disable Torrent Queue by default for new users (an0n666)
+    - BUGFIX: Update free disk space label on Category change in Auto Mode (Medvedishce)
+    - BUGFIX: Save resume data after recheck (glassez)
+    - BUGFIX: Tracker is errored only if all local endpoints fail (sledgehammer999)
+    - BUGFIX: Change placement of stop tracker timeout setting (An0n)
+    - BUGFIX: Redesign torrent startup handling (glassez)
+    - BUGFIX: Show "∞" instead of " -1" in Preferences (Sakib-Abrar)
+    - BUGFIX: Improve code efficiency for reverse resolution of peers (Chocobo1)
+    - BUGFIX: Handle HTTP redirection to magnet URI (glassez)
+    - BUGFIX: Various fixes for portable mode (Tester798)
+    - BUGFIX: Include resume folder path in exception message (Chocobo1)
+    - BUGFIX: Change placeholder text in torrent list's filter (djt3)
+    - BUGFIX: Improvements in the embedded tracker to be more spec compliant (FranciscoPombal)
+    - BUGFIX: Improve the options tooltips (NotTsunami)
+    - BUGFIX: Check if file exists in seed mode (an0n666)
+    - BUGFIX: Delegate GUI scaling work to Qt (Nick Korotysh)
+    - BUGFIX: Fix crash when renaming torrent contents (Chocobo1)
+    - BUGFIX: Fix total connected peers count calculation (FranciscoPombal)
+    - BUGFIX: Allow other keypresses in LogListWidget (NotTsunami)
+    - BUGFIX: Disable Auto TMM when not using default savepath from monitored folder (thalieht)
+    - WEBUI: Fix first row renaming in files tab (Denis)
+    - WEBUI: Use SVG image for WebUI favicon (Nick Korotysh)
+    - WEBUI: Inherit text color for filter list elements (Nick Korotysh)
+    - WEBUI: Expose WebUI ban counter to users (Chocobo1)
+    - WEBUI: Expose WebUI ban duration to users (Chocobo1)
+    - WEBUI: Implement "Secure" flag for session cookie (FranciscoPombal)
+    - WEBUI: Remove unused/deprecated option (FranciscoPombal)
+    - WEBUI: Prevent excessive sync requests (FranciscoPombal)
+    - WEBUI: Fix populating statistics window (FranciscoPombal)
+    - WEBUI: Fix matching uncategorized torrents (FranciscoPombal)
+    - WEBUI: Always allow whitespace in category names (FranciscoPombal)
+    - SEARCH: Bump python version for new installation (Chocobo1)
+    - SEARCH: Fix missing string (Chocobo1)
+    - SEARCH: Drop python2 support (Chocobo1)
+    - WINDOWS: Installer: Option to start qBittorrent on Windows start up (An0n)
+    - WINDOWS: Installer: Improve Czech translation (slrslr)
+    - WINDOWS: Installer: Update French translation (zywo)
+    - WINDOWS: Installer: Update German translation (schnurlos)
+    - WINDOWS: Installer: Update Japanese translation (maboroshin)
+    - WINDOWS: Path length limitation is removed on Windows 10 1607 onwards (an0n666)
 
-* Sun Oct 27 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.9
-    - BUGFIX: Preserve relative order when moving to top/bottom in queue (Chocobo1)
-    - WINDOWS: Use real physical screen DPI (Chocobo1)
+Wed Dec 18 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.1
+    - FEATURE: Enable portable mode if "profile" directory exists (Tester798)
+    - FEATURE: Enable "Apply rate limit to peers on LAN" option by default (Chocobo1)
+    - BUGFIX: Sync translations from Transifex and run lupdate (sledgehammer999)
+    - BUGFIX: Don't unnecessarily delete OS files in folders (sledgehammer999)
+    - BUGFIX: Use the incomplete folder where appropriate (sledgehammer999)
+    - BUGFIX: Align Properties tab bar correctly on window resize (Prince Gupta)
+    - BUGFIX: Rework the listening IP/interface selection code (sledgehammer999)
+    - BUGFIX: Fix inconsistent icon for deleting torrent (Chocobo1)
+    - BUGFIX: Show torrent error message in transfer list (Chocobo1)
+    - BUGFIX: Fix stuck in wrong torrent state (Chocobo1)
+    - BUGFIX: Expand single-item folders in torrent content (warren)
+    - WEBUI: Bump Web API version (sledgehammer999)
+    - WEBUI: Add ability to rename torrent files from the WebUI (Thomas Piccirello)
+    - WEBUI: Mention lack of HTTPS in WebUI magnet link warning (nl6720)
+    - WEBUI: Fix HTML elements size in search tab (Chocobo1)
+    - SEARCH: Fix incorrect translation displayed after language change (Chocobo1)
+    - SEARCH: Fix missing translations in search plugins dialog (Chocobo1)
+    - WINDOWS: Update russian translation of the installer (Andrei Stepanov)
+
+Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
+    - FEATURE: Libtorrent 1.2.x series are supported now (glassez)
+    - FEATURE: Add OpenSSL version to GUI and stackdump (Chocobo1)
+    - FEATURE: Add zlib version to GUI & stackdump (silverqx)
+    - FEATURE: Use PBKDF2 for the GUI lock. You will need to set your password again. (Chocobo1)
+    - FEATURE: Rename "#" column to "Tier" in the tracker list (thalieht)
+    - FEATURE: Allow setting larger checking memory usage in GUI (airium)
+    - FEATURE: Converted remaining icons to svg (Bert Verhelst)
+    - FEATURE: Replace CheckBox with Arrow in the side panel (Prince Gupta)
+    - FEATURE: Log performance alerts from libtorrent (Chocobo1)
+    - FEATURE: Use native folder icon in content tree (Chocobo1)
+    - FEATURE: Move copy actions under a submenu (Chocobo1)
+    - FEATURE: Add "Socket backlog size" option (Chocobo1)
+    - FEATURE: Add "File pool size" option (Chocobo1)
+    - FEATURE: Allow styling with QSS stylesheets (Prince Gupta)
+    - FEATURE: Add "Tracker entries" dialog (Chocobo1)
+    - FEATURE: Add availability column (Chocobo1)
+    - FEATURE: Use a randomized port number for the first run (Chocobo1)
+    - FEATURE: Enable Super Seeding mode once ratio/time limit is reached (thalieht)
+    - FEATURE: Improve embedded tracker. Now it conforms to BEPs more closely. (Chocobo1)
+    - FEATURE: Add option to align file to piece boundary when creating new torrent (Chocobo1)
+    - FEATURE: Ability to open file or trigger torrect action via keypad Enter (Chocobo1)
+    - FEATURE: Add "Remove torrent and its files" option to share ratio limiting (thalieht)
+    - FEATURE: Allow to select multiple entries in "banned IP" dialog (Chocobo1)
+    - FEATURE: Reallow to pause checking torrents (thalieht)
+    - FEATURE: Reallow to force recheck torrents that aren't fully started (thalieht)
+    - FEATURE: Add "Preview file" double-click action (warren)
+    - BUGFIX: Avoid performance penalty when logger is full (Chocobo1)
+    - BUGFIX: Remove the max half-open connections option (thalieht)
+    - BUGFIX: Center align the section labels in advanced settings (thalieht)
+    - BUGFIX: Add documentation links to some advanced settings (thalieht)
+    - BUGFIX: Impove DownloadManager code (glassez)
+    - BUGFIX: Limit DownloadHandler max redirection to 20 (Chocobo1)
+    - BUGFIX: Log DownloadManager SSL errors (Chocobo1)
+    - BUGFIX: Force recheck multiple torrents one by one (glassez)
+    - BUGFIX: Close context menu when content model is reset (glassez)
+    - BUGFIX: Improve Properties widget (glassez)
+    - BUGFIX: Prevent flickering preview dialog (silver)
+    - BUGFIX: Rename "Prefer encryption" to "Allow encryption" (thalieht)
+    - BUGFIX: Fix search icon placement when using RTL languages (Chocobo1)
+    - BUGFIX: Avoid combo boxes extending to the right in Options dialog (Chocobo1)
+    - BUGFIX: Fix speed limit not applying to IPv6 peers (Chocobo1)
+    - BUGFIX: Log failed file rename errors (Chocobo1)
+    - BUGFIX: Fix wrong "Time Active" value displayed (Chocobo1)
+    - BUGFIX: Rename priority to queue in the context of torrents (thalieht)
+    - BUGFIX: Update remaining size of ignored files to 0 (Thomas Piccirello)
+    - BUGFIX: Move "Check for program updates" checkbox to the Behavior settings (Chocobo1)
+    - BUGFIX: Improve error messages for URL seed (Chocobo1)
+    - BUGFIX: Rename share ratio limiting options (thalieht)
+    - BUGFIX: Fix country name misspelling (horgan)
+    - PERFORMANCE: Faster/efficient way of handling updates in the Transfer list (Chocobo1)
     - WEBUI: Bump Web API version
-
-* Mon Sep 23 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.8
-    - BUGFIX: Fix filename validation on non-Windows OS (Chocobo1)
-    - BUGFIX: ScanFolders/FileSystemWatcher now detect magnet files with case insensitivity in filename (Chocobo1)
-    - BUGFIX: Fix failed seeding after creating a torrent and auto-adding it to the session (Chocobo1)
+    - WEBUI: Use PBKDF2 for the WebUI password. You will need to set your password again. (Chocobo1)
+    - WEBUI: Use Javascript strict mode (Chocobo1)
+    - WEBUI: Remove autocorrect/autocapitalise from filepaths on WebUI (AceLewis)
+    - WEBUI: Display warning when Javascript is disabled (Chocobo1)
+    - WEBUI: Remove mootools lib from login page (Chocobo1)
+    - WEBUI: Prevent login credential appearing in URL (Chocobo1)
+    - WEBUI: Load WebUI certificate & key from file path (Chocobo1)
+    - WEBUI: Add migration code for WebUI https related change (Chocobo1)
+    - WEBUI: Fix wrong element id being used (Thomas Piccirello)
+    - WEBUI: Fix direction of Web UI sorted column icon (Thomas Piccirello)
+    - WEBUI: Match WebUI About page to GUI (Thomas Piccirello)
+    - WEBUI: Simplify tab logic (Thomas Piccirello)
+    - WEBUI: Separate URL components before percent-decoding (glassez)
+    - WEBUI: Capitalize event name (Thomas Piccirello)
+    - WEBUI: Fix bug where input wouldn't always be focused (Thomas Piccirello)
+    - WEBUI: Add Web UI support for escape key (Thomas Piccirello)
+    - WEBUI: Fix broken image link (Tom Piccirello)
+    - WEBUI: Include application version in css/js url for cache busting (Thomas Piccirello)
+    - WEBUI: Update WebUI img to use svg images (Chocobo1)
+    - WEBUI: Fix speed limit icon too large on WebUI (Chocobo1)
+    - WEBUI: Fix misaligned icons in STATUS list in GUI (Chocobo1)
+    - WEBUI: Drop legacy WebAPI support (glassez)
+    - WEBUI: Allow WebUI Content tab to be sorted (Thomas Piccirello)
+    - WEBUI: Encode torrent name before passing in URL (Thomas Piccirello)
+    - WEBUI: Move WebUI Peers code to separate file (Thomas Piccirello)
+    - WEBUI: Prevent WebUI tables from being highlighted (Thomas Piccirello)
+    - WEBUI: Allow WebUI Trackers table to be manipulated (Thomas Piccirello)
+    - WEBUI: Fix only the first newline char is replaced (Chocobo1)
+    - WEBUI: Fix missing semicolon in WebUI (Chocobo1)
+    - WEBUI: Add autocomplete attribute to WebUI (Chocobo1)
+    - WEBUI: Always use index.html as default page (CzBiX)
+    - WEBUI: Set title attribute for all WebUI table cells (Thomas Piccirello)
+    - WEBUI: Align WebUI login button to the right (Chocobo1)
+    - WEBUI: Use force refresh on WebUI logout (Chocobo1)
+    - WEBUI: Use a random number for WebUI cache busting (Chocobo1)
+    - WEBUI: Register protocol handler in WebUI for magnet links (Cory)
+    - WEBUI: Add WebAPI session timeout settings (Chocobo1)
+    - WEBUI: Fix encoding of special characters (Tom Piccirello)
+    - WEBUI: Avoid word wrap in webui footer (airium)
+    - WEBUI: Add advanced options in WebUI (Zhaoyu Gan)
+    - WEBUI: Move WebUI copy actions under a submenu (Thomas Piccirello)
+    - WEBUI: Add WebUI support for triggering context menus on mobile (Thomas Piccirello)
+    - WEBUI: Implement tag management for WebUI (Vasiliy Halimonchuk)
+    - WEBUI: Fix WebUI removing parameters from magnet links (Thomas Piccirello)
+    - WEBUI: Enable by default the search tab (Thomas Piccirello)
+    - WEBUI: Add context menu to Web UI search table (Thomas Piccirello)
+    - WEBUI: Display files hierarchically in Web UI content tab (Thomas Piccirello)
+    - WEBUI: Add ability to add and ban a peer from the Web UI (Thomas Piccirello)
+    - WEBUI: Increase WebUI window heights (Thomas Piccirello)
+    - WEBUI: Sort torrent names case-insensitively in webui (airium)
+    - WEBUI: Support exclusions in WebUI table filters (Thomas Piccirello)
+    - WEBUI: Don't save preferences until all options are processed (Tom Piccirello)
+    - WEBUI: Disable port selection when "Use different port on each startup" is selected (Chocobo1)
+    - WEBUI: Remove max character limit of location path (Clément Pera)
+    - RSS: Better widget for choosing file path in automated downloader (thalieht)
+    - RSS: Allow to cancel/retry the fetching of feeds (glassez)
+    - RSS: Add create subfolder option to RSS auto-download rules (Xegor)
+    - RSS: Log "RSS Feed successfully downloaded" event (glassez)
+    - SEARCH: Add default tooltip "Searching..." on tab creation. (paolo-sz)
+    - SEARCH: Avoid crashes on torrent search (paolo-sz)
+    - SEARCH: Add right click menu to SearchJobWidget (Chocobo1)
+    - SEARCH: Rename label in search widget (Chocobo1)
+    - SEARCH: Add more copy field actions to search widget (Chocobo1)
+    - SEARCH: Remove buttons from search widget (Chocobo1)
+    - SEARCH: Update python installer URL (Chocobo1)
+    - WINDOWS: Drop support for < Windows 7
+    - WINDOWS: Allow headless builds on Windows (knackebrot)
+    - WINDOWS: Add option to control qBittorrent process memory priority (Chocobo1)
+    - LINUX: Add content_rating, release tags to appdata (Peter Eszlari)
+    - LINUX: Update .appdata descriptions (Chocobo1)
+    - LINUX: Use reverse DNS convention for metadata files naming (Chocobo1)
+    - LINUX: Adjust open file descriptor limit on startup to max (Chocobo1)
+    - MACOS: Drop support for < macOS 10.10 (Yosemite)
+    - MACOS: Replace deprecated `qt_mac_set_dock_menu()` (Chocobo1)
+    - MACOS: Add some padding to macOS app icon (Nick Korotysh)
+    - OTHER: Raise minimum C++ version to C++14 (Chocobo1)
+    - OTHER: Raise minimum Qt version to 5.9.0 (sledgehammer999)
+    - OTHER: Drop support of libtorrent < 1.1.10 (glassez)
+    - OTHER: Drop upgrade code from older saving systems (sledgehammer999)
+    - OTHER: Update INSTALL dependencies (Chocobo1)
+    - OTHER: Optimize PNG images losslessly with zopflipng (Peter Dave Hello)
+    - OTHER: Optimize svg files using SVGO (sledgehammer999)
+    - OTHER: QMake: Compile translations at build time (glassez)
+    - OTHER: Drop support for "BC Link" format (Chocobo1)
+    - OTHER: Lots of code refactorings, cleanups, improvements and optimizations (Chocobo1, glassez, thalieht)
 
 * Sun Aug 04 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.7
     - FEATURE: Add 12 hour and 24 hour speed graphs (dzmat)

INSTALL

@@ -1,7 +1,26 @@
 qBittorrent - A BitTorrent client in C++ / Qt
 ------------------------------------------
 
-1) Compile and install qBittorrent with Qt 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
@@ -9,21 +28,7 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   will install and execute qBittorrent.
 
-  Dependencies:
-    - Qt >= 5.5.1
-
-    - pkg-config
-
-    - libtorrent-rasterbar >= 1.0.6 (by Arvid Norberg)
-        * https://www.libtorrent.org/
-        * Be careful: another library (the one used by rTorrent) uses a similar name
-
-    - Boost >= 1.35
-
-    - Python >= 2.7.9 / 3.3.0 (optional, runtime only)
-        * Required by the internal search engine
-
-2) Compile and install qBittorrent without Qt graphical interface
+2b) Compile and install qBittorrent without Qt graphical interface
 
   $ ./configure --disable-gui
   $ make && make install
@@ -31,17 +36,6 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   will install and execute qBittorrent.
 
-  Dependencies:
-    - Qt >= 5.5.1
-
-    - pkg-config
-
-    - libtorrent-rasterbar >= 1.0.6 (by Arvid Norberg)
-        * https://www.libtorrent.org/
-        * Be careful: another library (the one used by rTorrent) uses a similar name
-
-    - Boost >= 1.35
-
 DOCUMENTATION:
 Please note that there is a "Compilation" section at http://wiki.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:

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()
 

cmake/Modules/FindQtSingleApplication.cmake

@@ -1,79 +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 (Qt5Widgets_FOUND)
-    set(_includeFileName qtsingleapplication.h)
-else()
-    set(_includeFileName qtsinglecoreapplication.h)
-endif()
-
-FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
-    FIND_PATH(QtSingleApplication_INCLUDE_DIR ${_includeFileName} ${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}
-)
-
-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)
-    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)
-
-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)

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,22 +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 -Wno-long-long"
+            "-Wcast-qual -Wcast-align"
+            "-Winvalid-pch -Wno-long-long"
             #"-fstack-protector-all"
             #"-Werror -Wno-error=deprecated-declarations"
         )
         set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti"
             "-Woverloaded-virtual -Wold-style-cast"
-            "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align"
+            "-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"
         )
 
+        # 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()
 
@@ -39,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")
@@ -72,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/winconf-mingw.cmake

@@ -1,14 +1,11 @@
-if (STACKTRACE)
-    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)
-
 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)
-    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)
-
-# 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.windows

@@ -35,26 +35,15 @@ 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

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v4.1.9.1], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.2.2], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
@@ -14,12 +14,6 @@ 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])],
@@ -163,7 +157,7 @@ AS_CASE(["x$enable_qt_dbus"],
         AC_MSG_ERROR([Unknown option "$enable_qt_dbus". Use either "yes" or "no".])])
 
 
-AX_BOOST_BASE([1.35],
+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])])
@@ -183,58 +177,51 @@ 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],
+                  [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],
                  [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS"
                  LIBS="$zlib_LIBS $LIBS"])
 
-# Check if already in >= C++11 mode because of the flags returned by one of the above packages
-AC_MSG_CHECKING([if compiler is using C++11 or later mode])
-AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()],
+# 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_CXX11_FOUND="yes"],
+                   QBT_CXX14_FOUND="yes"],
                   [AC_MSG_RESULT([no])
-                   QBT_CXX11_FOUND="no"])
-                  
-# In case of no, check if the compiler can support at least C++11
+                   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_CXX11_FOUND" = "xno"],
-      [AC_MSG_CHECKING([if compiler supports C++11])
-       TMP_CXXFLAGS="$CXXFLAGS"
-       CXXFLAGS="$CXXFLAGS -std=c++11"
-       AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()],
+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++11 is disabled by the set compiler flags])
+                         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++11 $TMP_CXXFLAGS"
-                         AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()],
+                         CXXFLAGS="-std=c++14 $TMP_CXXFLAGS"
+                         AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
                                            [AC_MSG_RESULT([no])
-                                            CXXFLAGS="$TMP_CXXFLAGS -std=c++11"
-                                            AC_MSG_WARN([C++11 mode is now force enabled.
-Make sure you use the same C++ mode for qBittorrent and its dependencies.
-To explicitly set qBittorrent to a later mode use CXXFLAGS.
-Example: `CXXFLAGS="\$CXXFLAGS -std=c++14" ./configure`])],
+                                            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++11 but the user or a dependency has explicitly enabled a lower mode.])])],
+                                            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++11 is required.])])
+                         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.
@@ -287,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/mac/Info.plist

@@ -55,7 +55,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.9</string>
+	<string>4.2.2</string>
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
@@ -67,7 +67,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2019 The qBittorrent project</string>
+	<string>Copyright © 2006-2020 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>
@@ -84,7 +84,7 @@
 			<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>