Bump to 4.0.1

The wait time wasn't long enough causing the thread to
terminate prematurely.
Also, to avoid crashing qbt entirely when creating a torrent for a very
big file, I decided to wait indefinitely here.

.github/ISSUE_TEMPLATE.md

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

.travis.yml

@@ -131,13 +131,13 @@ install:
         cp "version" $HOME/hombebrew_cache
         cd "$HOME/hombebrew_cache"
         wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar.rb
-        wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.0.11+git20172003.8736a59adc.el_capitan.bottle.tar.gz
+        wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.0.11+git20170910.6d5625e0ea.el_capitan.bottle.tar.gz
       fi
 
       # Copy custom libtorrent bottle to homebrew's cache so it can find and install it
       # Also install our custom libtorrent formula by passing the local path to it
       # These 2 files are restored from Travis' cache.
-      cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.0.11+git20172003.8736a59adc.el_capitan.bottle.tar.gz" "$(brew --cache)"
+      cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.0.11+git20170910.6d5625e0ea.el_capitan.bottle.tar.gz" "$(brew --cache)"
       brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb"
 
       if [ "$build_system" = "cmake" ]; then

AUTHORS

@@ -34,6 +34,14 @@ Code from other projects:
   license: GPLv2/3
 
 Images Authors:
+* files: src/icons/skin/qbittorrent-tray.svg (and related pngs)
+  copyright: Provided by HVS <hvs linuxmail org> (raster first proposal) and Atif Afzal(@atfzl github) <atif5801@gmail.com> (vectorized and modified)
+  license: GPLv2+
+
+* files: src/qbittorrent_file.ico src/icons/fileicon.svg
+  copyright: 'uknown.svg' (LGPLv3+) from Oxygen Icon Theme was used as base which was slightly modified and 'qbittorrent-tray.svg' (GPLv2+) was overlayed above it.
+  license: GPLv3+
+
 * files: src/icons/*.png
   copyright: Gnome Icon Theme
   license: GPLv2
@@ -44,10 +52,10 @@ Images Authors:
   license: LGPL
   url: http://www.oxygen-icons.org
 
-* files: src/icons/flags/*.png
-  copyright: Mark James <mjames@gmail.com>
-  license: Public Domain
-  url: http://www.famfamfam.com
+* files: src/icons/flags/*.svg
+  copyright: lipis/flag-icon-css
+  license: MIT
+  url: https://github.com/lipis/flag-icon-css/
 
 * files: src/icons/skin/*.png
   files: src/menuicons/YYxYY/*.png

CMakeLists.txt

@@ -22,13 +22,8 @@ add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
 add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
 add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
 
-# os2 {
-#     DEFINES += DQBT_VERSION=\'\"v$${PROJECT_VERSION}\"\'
-#     DEFINES += DQBT_VERSION_2=\'\"$${PROJECT_VERSION}\"\'
-# } else {
 add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
 add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
-# }
 
 if (UNIX AND NOT APPLE)
     include(GNUInstallDirs)

CODING_GUIDELINES.md

@@ -9,7 +9,7 @@ If you make changes in a file that still uses another coding style, make sure th
 ```c++
 int myFunction(int a)
 {
-    //code
+    // code
 }
 
 void myFunction() {} // empty body
@@ -17,29 +17,29 @@ void myFunction() {} // empty body
 MyClass::MyClass(int *parent)
     : m_parent(parent)
 {
-    //initialize
+    // initialize
 }
 
 int MyClass::myMethod(int a)
 {
-    //code
+    // code
 }
 
 class MyOtherClass
 {
 public:
-    //code
-    
+    // code
+
 protected:
-    //code
-    
+    // code
+
 private:
-    //code
+    // code
 };
 
 namespace Name
 {
-    //code
+    // code
 }
 
 // Lambdas
@@ -54,20 +54,20 @@ namespace Name
 #### b. Other code blocks ####
 ```c++
 if (condition) {
-    //code
+    // code
 }
 
 for (int a = 0; a < b; ++b) {
-    //code
+    // code
 }
 
 switch (a) {
 case 1:
-    //blah
+    // blah
 case 2:
-    //blah
+    // blah
 default:
-    //blah
+    // blah
 }
 ```
 
@@ -75,17 +75,17 @@ default:
 ```c++
 switch (var) {
 case 1: {
-        //declare local variables
-        //code
+        // declare local variables
+        // code
     }
     break;
 case 2: {
-        //declare local variables
-        //code
+        // declare local variables
+        // code
     }
     break;
 default:
-    //code
+    // code
 }
 ```
 
@@ -103,13 +103,13 @@ QVariantMap map {{"key1", 5}, {"key2", 10}};
 #### a. Multiple tests ####
 ```c++
 if (condition) {
-    //code
+    // code
 }
 else if (condition) {
-    //code
+    // code
 }
 else {
-    //code
+    // code
 }
 ```
 The `else if`/`else` must be on their own lines.
@@ -154,7 +154,7 @@ myClass::myClass(int a, int b, int c, int d)
     , m_c(c)
     , m_d(d)
 {
-    //code
+    // code
 }
 ```
 
@@ -231,8 +231,8 @@ Example:
 
 #include <libtorrent/version.hpp>
 
-#include "base/bittorrent/session.h"
 #include "base/bittorrent/infohash.h"
+#include "base/bittorrent/session.h"
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
@@ -282,20 +282,32 @@ auto spinBox = static_cast<QSpinBox*>(sender());
 // we know the variable type based on the right-hand expression
 ```
 
-* Space around operations eg `a = b + c` or `a=b+c`:
-
-Before and after the assignment and other binary (and ternary) operators there should be a space.<br/>
-There should not be a space between increment/decrement and its operand.<br/>
-Some valid use cases:
+* Notice the spaces in the following specific situations:
 ```c++
+// Before and after the assignment and other binary (and ternary) operators there should be a space
+// There should not be a space between increment/decrement and its operand
 a += 20;
 a = (b <= MAX_B ? b : MAX_B);
 ++a;
-b--;
+--b;
 
 for (int a = 0; a < b; ++b) {
-    // code
 }
+
+// Range-based for loop, spaces before and after the colon
+for (auto i : container) {
+}
+
+// Derived class, spaces before and after the colon
+class Derived : public Base
+{
+};
+```
+
+* Prefer pre-increment, pre-decrement operators
+```c++
+++i, --j;  // Yes
+i++, j--;  // No
 ```
 
 * private/public/protected must not be indented

Changelog

@@ -1,4 +1,16 @@
-Unreleased - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.4.0
+* Wed Nov 22 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.0.1
+    - BUGFIX: Fix crash on opening torrent/magnet (uninitialized pointer). Closes #7739 #7723. (sledgehammer999)
+    - BUGFIX: Enable preferences Apply button when ip banlist is modified (Thomas Piccirello)
+    - BUGFIX: Allow drag-n-drop magnet links to mainwindow. Closes #7742. (Chocobo1)
+    - BUGFIX: Fix crash when aborting a torrent creation process. Closes #7783. (Chocobo1)
+    - BUGFIX: Correctly check if torrent passed during application start already exists. (sledgehammer999)
+    - WEBUI: Add ip subnet whitelist for bypassing webui auth (Thomas Piccirello)
+    - WEBUI: Fix logo missing in login page (Chocobo1)
+    - COSMETIC: Fix english typo. (sledgehammer999)
+    - OTHER: cmake: qtsingleapplication should always be built statically (luigino)
+
+* Mon Nov 20 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.0.0
+    - FEATURE: Change qbittorrent logo. Issue #6467. (HVS, Atif Afzal, sledgehammer999)
     - FEATURE: New icon theme with SVG source, so we can scale it appropriately in the future. (Bert Verhelst)
     - FEATURE: Drop Qt 4 support. Raise minimum Qt version to 5.5.1 (evsh)
     - FEATURE: UI for managing locally banned IP list (dzmat)
@@ -18,20 +30,85 @@ Unreleased - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.4.0
     - FEATURE: Fetch Favicons via google as a final fallback (KingLucius)
     - FEATURE: Add a Tags (multi-label) feature to the GUI. Closes #13. (tgregerson)
     - FEATURE: Use the system icons for each file type in the Content tab (evsh)
+    - FEATURE: Use SVG files for monochrome tray icons. Closes #6085. (evsh)
+    - FEATURE: Prefill torrent name when creating a new torrent. Closes #7229. (Chocobo1)
+    - FEATURE: Expose more libtorrent options in advanced settings (Chocobo1)
+    - FEATURE: Add comboBox for selecting BitTorrent protocol. Closes #6316. (Chocobo1)
+    - FEATURE: Allow SMTP sender to be set. Closes #7575. (Chocobo1)
+    - FEATURE: Allow to specify if announcing to all tiers is desired. (sledgehammer999)
+    - FEATURE: Configurable number of history of paths in Add New Torrent dialog. (evsh)
     - BUGFIX: Adjust icons names to better fit FDO scheme (evsh)
     - BUGFIX: Optimized IP filter parsing, making blazingly fast (sledgehammer999, evsh)
     - BUGFIX: Fix dialogs didn't position on the correct screen which qBittorrent window is on. Closes #1690, #2474, #3538. (Chocobo1)
     - BUGFIX: Refactor and improve StatusBar (glassez)
     - BUGFIX: Set expiration date for newly added cookie to +2 years from now, instead of +99 years. (Chocobo1)
+    - BUGFIX: Don't create subfolder inside temp folder (glassez)
+    - BUGFIX: Don't replace existing files when relocating torrent (glassez)
+    - BUGFIX: Fix explicit Torrent Management Mode in Add New Torrent dialog. Closes #5602. (sledgehammer999)
+    - BUGFIX: Fix calculation of 'Average time in queue' stat under libtorrent 1.1.x (sledgehammer999)
+    - BUGFIX: Don't disable bandwidth scheduler when manually switching speed limits. Closes #7306. (glassez)
+    - BUGFIX: Fix dereferencing freed pointer. Closes #7420. (Chocobo1)
+    - BUGFIX: Change the default cache size to 64MiB. (Chocobo1)
+    - BUGFIX: The previous "Disk write cache size" is not accurate since it is also being used for read cache, so rename it to "Disk cache". (Chocobo1)
+    - BUGFIX: Replace dialog ok-cancel buttons with QDialogButtonBox, which follows the platform specific button order. (Chocobo1)
+    - BUGFIX: Better reporting of success/failure of torrent and file deletion. (sledgehammer999)
+    - BUGFIX: Fix last activity calculation. Closes #7461. (Chocobo1)
+    - BUGFIX: Save state of options windows on cancel too. (silverqx)
+    - BUGFIX: Persist size and treeview header state in preview dialog. (silverqx)
+    - BUGFIX: Show torrent name in "add new torrent" dialog on merging trackers (Chocobo1)
+    - BUGFIX: Properly pre-select the selected torrent's current ratio limiting options in  UpDownRatioDlg dialogs. Fixes #7352 (thalieht)
+    - BUGFIX: Optimize code for SpeedWidget. (dzmat)
+    - BUGFIX: Disable processing events when adding torrents(prevents crashes). Closes #7436. (Chocobo1)
+    - BUGFIX: Open links in browser. Closes #7651. (Chocobo1)
+    - BUGFIX: Change default settings for tracker/tier announces to mimick μTorrent behavior. (sledgehammer999)
+    - BUGFIX: Explicitly set UPnP state on start-up. Closes #7338. (Chocobo1)
+    - BUGFIX: Include/print caught signal in stackdump (Chocobo1)
     - COSMETIC: Trackerlist: Set text alignment of columns with numbers to the right (thalieht)
     - COSMETIC: Enable alternatingRowColors for "Manage Cookie" dialog (Chocobo1)
+    - COSMETIC: Remove indentation for category/tag filter widgets in all platforms (thalieht)
+    - COSMETIC: Add space between widgets in left side panel. Closes #7224. (Chocobo1, glassez)
+    - COSMETIC: Unify preference window borders across the tabs (vit9696)
+    - COSMETIC: Center Options dialog when showed. (silverqx)
+    - COSMETIC: Show delete accelerator key in menu. closes #7508 (Nick Korotysh)
+    - COSMETIC: Set QTextOption::NoWrap property in "Download from URLs" dialog (Chocobo1)
+    - COSMETIC: Use SVG icons for the country flags. Closes #6223. (sledgehammer999)
     - WEBUI: Allow to load/use ECDSA certificate in webUI. (Chocobo1)
+    - WEBUI: Add copy options to webui context menu (addresses #6815) (#7036) (Tom Piccirello)
+    - WEBUI: Set torrent location from webui context menu (addresses #6815) (#7062) (Tom Piccirello)
+    - WEBUI: Add option to rename torrent from WebUI (Thomas Piccirello)
+    - WEBUI: Add auto torrent management to webui context menu (addresses #6815) (Thomas Piccirello)
+    - WEBUI: Option for "Create subfolder" when adding new torrent. (thalieht)
+    - WEBUI: Fix addPaused wrong default behavior. (Chocobo1)
+    - WEBUI: Reposition "Priority" menu option in WebUI to match gui. Closes #7072. (Thomas Piccirello)
+    - WEBUI: Report TCPServer errorString() if webui fails to listen to port. (Matthew Fioravante)
+    - WEBUI: Exit gracefully when failed to initialize web server with qbt-nox (Chocobo1)
+    - WEBUI: Add file-to-piece-index mappings in /query/propertiesFiles command (Chocobo1)
+    - WEBUI: Add optional parameters for /command/download & /command/upload (Chocobo1)
+    - WEBUI: Print error messages upon receiving invalid header fields. (Chocobo1)
+    - WEBUI: Add WebUi\Address config option. (Matthew Fioravante)
+    - WEBUI: Reinitialize webUI server when "IP address" setting changed. An app restart won't be necessary from now on. (Chocobo1)
+    - WEBUI: Improve log and error messages (Chocobo1)
     - SEARCH: Use explicit class for search plugin versions (evsh)
     - SEARCH: Remove all search plugins from repo. There is another repo named 'search-plugins'. (sledgehammer999)
     - SEARCH: Update the backend when a new plugin favicon is downloaded. (sledgehammer999)
+    - SEARCH: Allow search plugins sorting. Closes #7526. (Nick Korotysh)
     - RSS: Redesigned RSS subsystem (glassez)
     - RSS: Do not use hardcoded colors in RSS feed view (evsh)
+    - RSS: Improve RSS events logging (glassez)
+    - WINDOWS: Use dpiawareness=1 on Windows. Closes #5393. (sledgehammer999)
+    - WINDOWS: Reformat Windows build configuration files. (glassez)
+    - LINUX: Allow custom tray icons when system icon theme is used. Closes #7403. (evsh)
+    - MACOS: Various macOS UI improvements (vit9696)
+    - MACOS: Fix main menu item location on macOS (vit9696)
+    - MACOS: Fix macOS window restoration after using hide icon (vit9696)
+    - MACOS: Fix notification display on macOS (vit9696)
     - OTHER: Use new classes/methods from libtorrent and stop using deprecate ones. (glassez)
+    - OTHER: Various string fixes (Allan Nordhøy, sledgehammer999)
+    - OTHER: cmake: do not use Qt5Widgets when locating QtSingleApplication. Closes #7551. (evsh)
+    - OTHER: Update BOOST m4 macros and simplify AX_BOOST_BASE usage (Chocobo1)
+    - OTHER: Drop OS/2 support. (sledgehammer999)
+    - OTHER: Optimize file size of PNG and SVG files. (sledgehammer999)
+    - OTHER: Add new translators in the About page.
 
 * Thu Jun 01 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.13
     - BUGFIX: Fixed UI glitch about torrent numbers in the sidepanel. Fixes #6454. (evsh)

README.os2

@@ -1,74 +0,0 @@
-qBittorrent - A BitTorrent client in Qt4
-------------------------------------------
-
-This is the eComStation (OS/2) qBittorrent part of the readme. See also README for more general information.
-
-
-Building qBittorrent
-********************
-
-
-Requirements
-============
-
-- gcc based build env (recommended gcc v4.4.2 or greater)
-  
-- Qt4 for eCS (OS/2) dev package (see http://svn.netlabs.org/qt4 for more information)
-
-- libtorrent-rasterbar for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
-
-- boost for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
-
-
-How to build
-============
-
-First you need to create the conf.pri file in the same dir as this readme.os2 is.
-the conf.pri file has the following content:
-
-##### conf.pri content begin #####
-BINDIR = ./bin
-INCDIR = ./include
-LIBDIR = ./lib
-DATADIR = ./share
-
-CONFIG += staticlib
-INCLUDEPATH += x:/trees/libtorrent/trunk/include
-LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
-        -Lx:/trees/boost/trunk/stage/lib \
-        -Lx:/trees/openssl \
-	-Lx:/extras/lib
-##### conf.pri content end #####
-
-Of course all the above path references have to be adjusted to your build env.
-
-Now you can either do a normal build or a shadow build. A shadow build has the
-advantage that no created files are in the same dir as the sources are.
-
-For a normal build do the following:
-
-Simply type:
-$ qmake
-
-Followed by:
-$ make
-
-For a shadow build do the following:
-given your sources are in x:\trees\qbittorrent\trunk create a 
-x:\trees\qbittorrent\build directory
-
-Now switch to the created directory and type:
-$ qmake ..\trunk
-
-Followed by:
-$ make
-
-If all works fine you should get a working qbittorrent executable.
-
-If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC:
-#netlabs on irc.freenode.net
-
-------------------------------------------
-Silvan Scherrer <silvan.scherrer@aroa.ch>
-
-

cmake/Modules/FindQtSingleApplication.cmake

@@ -30,9 +30,9 @@ IF(QT4_FOUND)
         NAMES ${QTSINGLEAPPLICATION_NAMES}
         PATHS ${QT_LIBRARY_DIR}
     )
-ELSEIF(Qt5Widgets_FOUND)
+ELSEIF(Qt5Core_FOUND)
     message(STATUS "Looking for Qt5 single application library")
-    FOREACH(TOP_INCLUDE_PATH in ${Qt5Widgets_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
+    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)
@@ -43,12 +43,12 @@ ELSEIF(Qt5Widgets_FOUND)
     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_WIDGETSLIBRARY Qt5::Widgets LOCATION)
-    GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
+    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_WIDGETSLIBRARYPATH}
+        PATHS ${_QT5_CORELIBRARYPATH}
     )
 ENDIF()
 

cmake/Modules/winconf.cmake

@@ -24,6 +24,7 @@ add_definitions(-DUNICODE
     -D_WIN32_IE=0x0501
     -D_CRT_SECURE_NO_DEPRECATE
     -D_SCL_SECURE_NO_DEPRECATE
+    -DNOMINMAX
 )
 # and boost
 set(Boost_USE_STATIC_LIBS  True)

conf.pri.windows

@@ -0,0 +1,61 @@
+# Adapt these paths
+# Point these to the include folders
+INCLUDEPATH += $$quote(C:/qBittorrent/boost)
+INCLUDEPATH += $$quote(C:/qBittorrent/libtorrent/include)
+INCLUDEPATH += $$quote(C:/qBittorrent/zlib/include)
+INCLUDEPATH += $$quote(C:/qBittorrent/openssl/include)
+# Point these to the lib folders
+LIBS += $$quote(-LC:/qBittorrent/boost/stage/lib)
+LIBS += $$quote(-LC:/qBittorrent/libtorrent/lib)
+LIBS += $$quote(-LC:/qBittorrent/zlib/lib)
+LIBS += $$quote(-LC:/qBittorrent/openssl/lib)
+
+# Adapt the lib names/versions accordingly
+# If you want to use Boost auto-linking then disable
+# BOOST_ALL_NO_LIB below and omit Boost libraries here
+CONFIG(debug, debug|release) {
+    LIBS += libtorrentd.lib \
+            libboost_system-vc140-mt-sgd-1_64.lib
+}
+else {
+    LIBS += libtorrent.lib \
+            libboost_system-vc140-mt-s-1_64.lib
+}
+LIBS += libeay32.lib ssleay32.lib
+LIBS += zlib.lib
+# ...or if you use MinGW
+#CONFIG(debug, debug|release) {
+#    LIBS += libtorrent-rasterbar \
+#            libboost_system-mt
+#}
+#else {
+#    LIBS += libtorrent-rasterbar \
+#            libboost_system-mt
+#}
+#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 building against libtorrent 1.1.x (RC_1_1)
+# 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

configure.ac

@@ -116,6 +116,12 @@ AS_CASE(["x$enable_webui"],
         AC_MSG_ERROR([Unknown option "$enable_webui". Use either "yes" or "no".])])
 
 FIND_QT5()
+AS_IF([test "x$QT_QMAKE" = "x"],
+      [AC_MSG_ERROR([Could not find qmake])
+      ])
+AS_IF([test "x$enable_gui" = "xyes"],
+      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.5.1])
+      ])
 AC_MSG_CHECKING([whether QtDBus should be enabled])
 AS_CASE(["x$enable_qt_dbus"],
         ["xyes"],
@@ -132,22 +138,16 @@ AS_CASE(["x$enable_qt_dbus"],
         AC_MSG_ERROR([Unknown option "$enable_qt_dbus". Use either "yes" or "no".])])
 
 
-AX_BOOST_BASE([1.35])
-# HAVE_BOOST is set to an empty value when Boost is found. I don't know
-# how to test for a set vs unset variable.
-AS_IF([test "x$BOOST_CPPFLAGS" = "x"],
-      [AC_MSG_ERROR([Could not find Boost])],
-      [AC_MSG_NOTICE([Boost CPPFLAGS: $BOOST_CPPFLAGS])
-      CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
-      LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])
+AX_BOOST_BASE([1.35],
+              [AC_MSG_NOTICE([Boost CPPFLAGS: "$BOOST_CPPFLAGS"
+                Boost LDFLAGS: "$BOOST_LDFLAGS"])],
+              [AC_MSG_ERROR([Could not find Boost])])
+CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
+LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
 
 AX_BOOST_SYSTEM()
-# HAVE_BOOST_SYSTEM is set to an empty value when Boost.System is found.
-# I don't know how to test for a set vs unset variable.
-AS_IF([test "x$BOOST_SYSTEM_LIB" = "x"],
-      [AC_MSG_ERROR([Could not find Boost.System])],
-      [AC_MSG_NOTICE([Boost.System LIB: $BOOST_SYSTEM_LIB])
-      LIBS="$BOOST_SYSTEM_LIB $LIBS"])
+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"],
@@ -234,4 +234,3 @@ 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_ECHO()
-

dist/mac/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
+	<string>4.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>

dist/unix/CMakeLists.txt

@@ -25,10 +25,6 @@ if (GUI)
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
             FILES_MATCHING PATTERN "*.png")
 
-    install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.png
-            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/
-            COMPONENT data)
-
     install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.desktop
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/
             COMPONENT data)
@@ -38,6 +34,7 @@ if (GUI)
             COMPONENT data)
 
     install(FILES
+            ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray.svg
             ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-dark.svg
             ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-light.svg
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status