Bump to 3.3.4

And some refactor

.editorconfig

@@ -1,12 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[**.yml]
-indent_size = 2

.github/ISSUE_TEMPLATE.md

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

.gitignore

@@ -17,7 +17,6 @@ Makefile*
 
 # Generated MOC, resource and UI files
 moc_*.cpp
-moc_*.h
 qrc_*.cpp
 ui_*.h
 *.moc
@@ -31,6 +30,3 @@ src/qbittorrent.app
 aclocal.m4
 autom4te.cache/*
 config.status
-src/icons/qbt-theme/build-icons/node_modules/
-src/icons/skin/build-icons/node_modules/
-src/icons/skin/build-icons/icons/*.png

.travis.yml

@@ -3,26 +3,21 @@ language: cpp
 os:
   - linux
   - osx
-osx_image: xcode7.3
+osx_image: xcode7
 
 env:
   matrix:
     # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
     #- lt_branch=dist gui=true
     #- lt_branch=dist gui=false
-    - lt_branch=RC_1_0 gui=true build_system=cmake
-    - lt_branch=RC_1_0 gui=false build_system=cmake
-    - lt_branch=RC_1_0 gui=true build_system=qmake
-    - lt_branch=RC_1_0 gui=false build_system=qmake
+    - lt_branch=RC_1_0 qt=5 gui=true
+    - lt_branch=RC_1_0 qt=5 gui=false
+    - lt_branch=RC_1_0 qt=4 gui=true
+    - lt_branch=RC_1_0 qt=4 gui=false
   global:
     - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
     - coverity_branch: coverity_scan
 
-matrix:
-  allow_failures:
-    - env: lt_branch=RC_1_0 gui=true build_system=cmake
-    - env: lt_branch=RC_1_0 gui=false build_system=cmake
-
 branches:
   except:
     - search_encoding_windows
@@ -33,15 +28,16 @@ notifications:
     on_success: change
     on_failure: change
 
-cache:
-  ccache: true
-  directories:
-    - $HOME/hombebrew_cache
+# container-based builds
+#sudo: false
+# TODO: osx builder does not enable cache yet, see: https://github.com/travis-ci/travis-ci/issues/4011
+#cache:
+  #directories:
+    #- $HOME/.ccache
 
 # opt-in Ubuntu Trusty
+sudo: required
 dist: trusty
-# container-based builds
-sudo: false
 
 addons:
   coverity_scan:
@@ -53,143 +49,95 @@ addons:
     branch_pattern: $coverity_branch
     notification_email: sledgehammer999@qbittorrent.org
   apt:
-    sources:
+    #sources:
     # sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
-      - ubuntu-toolchain-r-test
+    #- ubuntu-toolchain-r-test
     #- boost-latest
-      - sourceline: 'ppa:qbittorrent-team/qbittorrent-stable'
-      - sourceline: 'ppa:beineri/opt-qt551-trusty'
-      - sourceline: 'ppa:adrozdoff/cmake'
     packages:
     # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
-      - [autoconf, automake, colormake]
-      - [cmake, ninja-build]
+    - autoconf
+    - automake
+    - colormake
     - libssl-dev
-      - [libboost-dev, libboost-system-dev]
-      - libtorrent-rasterbar-dev
-      - [qt55base, qt55svg, qt55tools]
-      - [gcc-6, g++-6]
+    - libboost-dev
+    - libboost-system-dev
+    # uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
+    #- libtorrent-rasterbar6
 
 before_install:
   # only allow specific build for coverity scan, others will stop
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true -a "$build_system" = "qmake" ]; then exit ; fi
+  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true ]; then exit ; fi
 
   - shopt -s expand_aliases
   - alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system)
   #- libt_path="$HOME/libt_install"
   #- ltconf="$ltconf --prefix="$libt_path" --disable-geoip"
   - qbt_path="$HOME/qbt_install"
-  - qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH"
+  - qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":$PKG_CONFIG_PATH"
 
   # options for specific branches
+  - if [ "$qt" = 4 ]; then qbtconf="$qbtconf --with-qt4" ; fi
   - if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; fi
   - |
     if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      # ccache
+      #if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
+        #dpkg-query -L ccache && export PATH="/usr/lib/ccache/:$PATH" && export use_ccache=true ;
+        #ccache -V && ccache --show-stats && ccache --zero-stats ;
+      #fi ;
+
       # setup virtual display for after_success target
       if [ "$gui" = true ]; then export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi ;
-
-      # Qt 5
-      PATH=/opt/qt55/bin:${PATH}
-
-      if [ "$build_system" = "cmake" ]; then
-          COMPILER_VERSION=6
-          export CXX="${CXX}-${COMPILER_VERSION}" CC="${CC}-${COMPILER_VERSION}"
     fi
+  - |
+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      qbtconf="$qbtconf --disable-qt-dbus" ;
     fi
 
   # print settings
   - echo $lt_branch
   - echo $gui
-  - echo $build_system
   - echo $ltconf
   - echo $qbtconf
 
 install:
-  #- |
-    #if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+  - |
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      # libtorrent
+      sudo add-apt-repository --yes ppa:qbittorrent-team/qbittorrent-stable ;
+      sudo apt-get update -qq ;
+      sudo apt-get install -qq libtorrent-rasterbar-dev ;
+
       # build libtorrent from source
       #if [ "$lt_branch" != "dist" ]; then
-        #cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch
-        #cd libtorrent && ./autotool.sh && ./configure $ltconf && make install
-      #fi
-    #fi
+        #cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch ;
+        #cd libtorrent && ./autotool.sh && ./configure $ltconf && make install ;
+      #fi ;
+
+      # Qt
+      if [ "$qt" = 4 ]; then sudo apt-get -qq install qt4-default libqt4-dev ; fi ;
+      if [ "$qt" = 5 ]; then sudo apt-get -qq install qt5-default qtbase5-dev qttools5-dev-tools ; fi ;
+    fi
   - |
     if [ "$TRAVIS_OS_NAME" = "osx" ]; then
       # dependencies
-      brew update > /dev/null
-      brew outdated "pkg-config" || brew upgrade "pkg-config"
-      brew install colormake ccache zlib qt
-      PATH="/usr/local/opt/ccache/libexec:$PATH"
-      brew link --force zlib qt
+      brew update > /dev/null && brew install colormake libtorrent-rasterbar ;
 
-      wget https://builds.shiki.hu/homebrew/version
-      if ! cmp --quiet "version" "$HOME/hombebrew_cache/version" ; then
-        echo "Cached files are different from server. Downloading new ones."
-        # First delete old files
-        rm -r "$HOME/hombebrew_cache"
-        mkdir "$HOME/hombebrew_cache"
-        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+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+git20170910.6d5625e0ea.el_capitan.bottle.tar.gz" "$(brew --cache)"
-      brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb"
-
-      if [ "$build_system" = "cmake" ]; then
-        brew outdated cmake || brew upgrade cmake
-        brew install ninja
-
-        ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
-        ln -s /usr/local/opt/qt/plugins /usr/local/plugins
-      fi
-
-      MY_CMAKE_OPENSSL_HINT="-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/"
-    fi
-  - |
-    if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
-      export use_ccache=true
-      ccache -V && ccache --show-stats && ccache --zero-stats
+      # Qt
+      if [ "$qt" = 4 ]; then brew install qt ; fi ;
+      if [ "$qt" = 5 ]; then brew install qt5 && brew link --force qt5 ; fi ;
     fi
 
 script:
   - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # skip usual build when running coverity scan
-  - |
-    cd "$TRAVIS_BUILD_DIR"
-    if [ "$build_system" = "cmake" ]; then
-      mkdir build
-      cd build
-      cmake -DGUI=${gui} -DCMAKE_INSTALL_PREFIX="$qbt_path" "$MY_CMAKE_OPENSSL_HINT" \
-        -G "Ninja" -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE ..
-      BUILD_TOOL="ninja"
-    fi
-    if [ "$build_system" = "qmake" ]; then
-      ./bootstrap.sh && ./configure $qbtconf
-      if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-        sed -i "" -e "s/^\(CC.*&&\).*$/\1 $CC/" src/Makefile  # workaround for Qt & ccache: https://bugreports.qt.io/browse/QTBUG-31034
-        sed -i "" -e "s/^\(CXX.*&&\).*$/\1 $CXX/" src/Makefile
-        sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs -Wno-inconsistent-missing-override/' src/Makefile
-      fi
-      BUILD_TOOL="make"
-    fi
-  - $BUILD_TOOL && $BUILD_TOOL install
+  - cd "$TRAVIS_BUILD_DIR" && ./bootstrap.sh && ./configure $qbtconf
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs/' src/Makefile ; fi
+  - make && make install
 
 after_success:
   - if [ "$gui" = true ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd "$qbt_path/bin" ; fi
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      if [ "$build_system" = "qmake" ]; then
-        macdeployqt "$TRAVIS_BUILD_DIR/src/$qbt_exe.app"
-        cd "$TRAVIS_BUILD_DIR/src/$qbt_exe.app/Contents/MacOS"
-      else
-        cd "$qbt_path/$qbt_exe.app/Contents/MacOS"
-      fi
-    fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cd "$TRAVIS_BUILD_DIR/src/$qbt_exe.app/Contents/MacOS" ; fi
   - ./$qbt_exe --version
 
 after_script:

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[qbittorrent.qbittorrent_master]
+[qbittorrent.qbittorrent_v3_3_x]
 file_filter = src/lang/qbittorrent_<lang>.ts
 lang_map = pt: pt_PT
 source_file = src/lang/qbittorrent_en.ts

520EC6F6.asc

@@ -0,0 +1,53 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+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
+x8m1+aYiYlKfcKWm1nKQG0hF04Axq5AYezjKvA==
+=Zdwm
+-----END PGP PUBLIC KEY BLOCK-----

5B7CC9A2.asc

@@ -1,92 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
-
-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
-xdpwp07LYo2ilhMI8RnzmtoRmg==
-=UBeB
------END PGP PUBLIC KEY BLOCK-----

AUTHORS

@@ -34,14 +34,6 @@ 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
@@ -52,10 +44,10 @@ Images Authors:
   license: LGPL
   url: http://www.oxygen-icons.org
 
-* files: src/icons/flags/*.svg
-  copyright: lipis/flag-icon-css
-  license: MIT
-  url: https://github.com/lipis/flag-icon-css/
+* files: src/icons/flags/*.png
+  copyright: Mark James <mjames@gmail.com>
+  license: Public Domain
+  url: http://www.famfamfam.com
 
 * files: src/icons/skin/*.png
   files: src/menuicons/YYxYY/*.png

CMakeLists.txt

@@ -1,14 +1,15 @@
-cmake_minimum_required(VERSION 3.5)
-cmake_policy(VERSION 3.5)
+cmake_minimum_required(VERSION 3.2)
+cmake_policy(VERSION 3.2)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
-include(FunctionReadVersion)
+project(qBittorrent VERSION 3.4.0.0)
 
-read_version("${CMAKE_CURRENT_SOURCE_DIR}/version.pri" VER_MAJOR VER_MINOR VER_BUGFIX VER_BUILD VER_STATUS)
-# message(STATUS "Project version is: ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD} (${VER_STATUS})")
-
-project(qBittorrent VERSION ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD})
+set(VER_MAJOR ${qBittorrent_VERSION_MAJOR})
+set(VER_MINOR ${qBittorrent_VERSION_MINOR})
+set(VER_BUGFIX ${qBittorrent_VERSION_PATCH})
+set(VER_BUILD ${qBittorrent_VERSION_TWEAK})
+set(VER_STATUS "alpha") # Should be empty for stable releases!
 
+# Don't touch the rest part
 set(PROJECT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}")
 
 if (NOT VER_BUILD EQUAL 0)
@@ -17,14 +18,19 @@ endif()
 
 set(PROJECT_VERSION "${PROJECT_VERSION}${VER_STATUS}")
 
-add_definitions(-DQBT_VERSION_MAJOR=${VER_MAJOR})
-add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
-add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
-add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
+add_definitions(-DVERSION_MAJOR=${VER_MAJOR})
+add_definitions(-DVERSION_MINOR=${VER_MINOR})
+add_definitions(-DVERSION_BUGFIX=${VER_BUGFIX})
+add_definitions(-DVERSION_BUILD=${VER_BUILD})
 
-add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
-add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
+# os2 {
+#     DEFINES += VERSION=\'\"v$${PROJECT_VERSION}\"\'
+# } else {
+add_definitions(-DVERSION="v${PROJECT_VERSION}")
+# }
+list(APPEND CMAKE_MODULE_PATH ${qBittorrent_SOURCE_DIR}/cmake/Modules)
 
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og")
 if (UNIX AND NOT APPLE)
     include(GNUInstallDirs)
 endif (UNIX AND NOT APPLE)
@@ -36,8 +42,11 @@ endif(WIN32)
 # we need options here, because they are used not only in "src" subdir, but in the "dist" dir too
 include(CMakeDependentOption)
 
+option(QT5 "Compile using Qt5" ON)
 option(SYSTEM_QTSINGLEAPPLICATION
     "Use the system qtsingleapplication library or shipped one otherwise")
+cmake_dependent_option(SYSTEM_QJSON
+    "Use the shipped qjson library or the system one (Qt4 only)" OFF "NOT QT5" OFF)
 
 option(GUI "Allows to disable GUI for headless running. Disables QtDBus and the GeoIP Database" ON)
 

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,27 @@ 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 +52,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,41 +73,37 @@ 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
 }
 ```
 
-#### d. Brace enclosed initializers ####
-Unlike single-line functions, you must not insert spaces between the brackets and concluded expressions.<br/>
-But you must insert a space between the variable name and initializer.
+#### d. single-line blocks (lambdas, initializer lists etc.) ####
 ```c++
-Class obj {}; // empty
-Class obj {expr};
-Class obj {expr1, /*...,*/ exprN};
-QVariantMap map {{"key1", 5}, {"key2", 10}};
+ {} // empty - space before {
+ { body } // spaces around { and before }
 ```
 
 ### 2. If blocks ###
 #### 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.
@@ -138,14 +132,14 @@ However, there are cases where curly braces for single statement if blocks **sho
 
 Generally it will depend on the particular piece of code and would be determined on how readable that piece of code is. **If in doubt** always use braces if one of the above exceptions applies.
 
-### 3. Indentation ###
+### 3. Indentation###
 4 spaces.
 
-### 4. File encoding and line endings. ###
+### 4. File encoding and line endings.###
 
 UTF-8 and Unix-like line ending (LF). Unless some platform specific files need other encodings/line endings.
 
-### 5. Initialization lists. ###
+### 5. 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)
@@ -154,11 +148,11 @@ myClass::myClass(int a, int b, int c, int d)
     , m_c(c)
     , m_d(d)
 {
-    // code
+    //code
 }
 ```
 
-### 6. Enums. ###
+### 6. Enums.###
 Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
 ```c++
 enum Days
@@ -173,17 +167,17 @@ enum Days
 };
 ```
 
-### 7. Names. ###
+### 7. Names.###
 All names should be camelCased.
 
 #### a. Type names and namespaces ####
 Type names and namespaces start with Upper case letter (except POD types).
 ```c++
-class ClassName {};
+class ClassName {}
 
-struct StructName {};
+struct StructName {}
 
-enum EnumName {};
+enum EnumName {}
 
 typedef QList<ClassName> SomeList;
 
@@ -207,40 +201,7 @@ class MyClass
 }
 ```
 
-### 8. Header inclusion order. ###
-The headers should be placed in the following order:
- 1. Module header (in .cpp)
- 2. System/Qt/Boost etc. headers (splitted in subcategories if you have many).
- 3. Application headers, starting from *Base* headers.
-
-The headers should be ordered alphabetically within each group (subgroup).<br/>
-<br/>
-Example:
-```c++
-// examplewidget.cpp
-
-#include "examplewidget.h"
-
-#include <cmath>
-#include <cstdio>
-
-#include <QDateTime>
-#include <QList>
-#include <QString>
-#include <QUrl>
-
-#include <libtorrent/version.hpp>
-
-#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"
-#include "ui_examplewidget.h"
-
-```
-
-### 9. Misc. ###
+### 8. Misc.###
 
 * Line breaks for long lines with operation:
 
@@ -250,18 +211,47 @@ a += "b"
   + "d";
 ```
 
+* Initializers
+
+We allow brace enclosed initializers only for aggregates and arrays/containers.<br />
+Brace enclosed initializer MUST be used with equality sign if it follows the variable declaration.<br />
+Brace enclosed initializer MUST be additionally enclosed in parentheses if it is used in constructor initialization list.<br />
+Some valid use cases:
+```c++
+// aggregate
+Person john = { "John", "Smith", 21 };
+Person *john = new Person { "John", "Smith", 21 };
+
+// array
+int array[] = { 1, 2, 3, 4 };
+
+// container
+QHash<QString, QString> map = {
+    { "key1", "value1" },
+    { "key2", "value2" }
+);
+
+// member array
+SomeClass::SomeClass(BaseClass *parent)
+    : BaseClass(parent)
+    , m_someArrayMember({ 1, 2, 3, 4 })
+{
+}
+
+// return from function
+Person getPersonByName(const QString &name)
+{
+    // do something
+    return { name, surname, age };
+}
+
+// function argument
+doSomething({ name, surname, age }, someOtherArg);
+```
+
 * **auto** keyword
 
-We allow the use of the **auto** keyword only where it is strictly necessary 
-(for example, to declare a lambda object, etc.), or where it **enhances** the readability of the code.
-Declarations for which one can gather enough information about the object interface (type) from its name 
-or the usage pattern (an iterator or a loop variable are good examples of clear patterns) 
-or the right part of the expression nicely fit here.<br/>
-<br/>
-When weighing whether to use an auto-typed variable please think about potential reviewers of your code, 
-who will read it as a plain diff (on github.com, for instance). Please make sure that such reviewers can 
-understand the code completely and without excessive effort.<br/>
-<br/>
+We allow the use of the **auto** keyword only where it doesn't break the readability of the code (i.e. either we can gather enough information about the type from the right part of the expression, or we do not need to know the exact type), or where it is strictly necessary (for example, to compute the type of a lambda, etc.).<br />
 Some valid use cases:
 ```c++
 template <typename List>
@@ -282,32 +272,12 @@ auto spinBox = static_cast<QSpinBox*>(sender());
 // we know the variable type based on the right-hand expression
 ```
 
-* Notice the spaces in the following specific situations:
+* Space around operations eg `a = b + c` or `a=b+c`:
+
+Before and after the assignment there should be a space. One exception could be: for loops.
 ```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;
-
-for (int a = 0; a < b; ++b) {
+for (int a=0; a<b; ++b) {
 }
-
-// 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
@@ -316,5 +286,5 @@ i++, j--;  // No
 
 * Method definitions aren't allowed in header files
 
-### 10. Not covered above ###
+### 9. Not covered above###
 If something isn't covered above, just follow the same style the file you are editing has. If that particular detail isn't present in the file you are editing, then use whatever the rest of the project uses.

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Filing an issue
+# Filing an issue
 
 ### Must read
 * If you aren't sure, you can ask on the [**forum**](http://forum.qbittorrent.org) or read our [**wiki**](http://wiki.qbittorrent.org) first.
@@ -6,11 +6,12 @@
 * Write in **English**!
 * Provide **version** information: (You can find version numbers at menu `Help -> About -> Libraries`)
   ```
-  qBittorrent:
-  Qt:
-  libtorrent:
-  boost:
-  OS version:
+qBittorrent:
+Qt:
+libtorrent:
+boost:
+OS version:
+
   ```
 * Provide **steps** to reproduce the problem, it will be easier to pinpoint the fault.
 * **Screenshots**! A screenshot is worth a thousand words. just upload it. [(How?)](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests)

COPYING

@@ -292,3 +292,63 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    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, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

Changelog

@@ -1,397 +1,3 @@
-* 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)
-    - FEATURE: Support for specifying where to save/load config files. Support for portable mode. (evsh)
-    - FEATURE: It is now possible to pass options via ENV variables instead of cmd options. (evsh)
-    - FEATURE: Allow to strip subfolder in multifile torrents. (glassez, sledgehammer999)
-    - FEATURE: Allow cmd args to specify options when adding torrents. (Brian Kendall)
-    - FEATURE: Widget for showing filesystem paths while typing. Used in the Add New Torrent and Options dialogs. (evsh)
-    - FEATURE: Trackerlist: Allow to toggle columns (thalieht)
-    - FEATURE: Add availability column to torrent content model and torrent properties window (evsh)
-    - FEATURE: Implemented share limit by seeding time (naikel)
-    - FEATURE: Revamp Torrent creator (Chocobo1)
-    - FEATURE: Enable drag n drop to create torrent on mainwindow (Chocobo1)
-    - FEATURE: Add show/hide statusbar option (takiz)
-    - FEATURE: Show number of pieces. Closes #6774. (Chocobo1)
-    - FEATURE: Allow to select & delete multiple entries in "Manage Cookies" dialog (Chocobo1)
-    - 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)
-    - BUGFIX: Fix downloaded/uploaded columns were not highlighted properly when selected. (Chocobo1)
-    - BUGFIX: Always draw background in files list and search result list (Chocobo1)
-    - BUGFIX: Remove torrent temp folder if it becomes unneeded (glassez)
-    - BUGFIX: Remove torrent temp folder when torrent is deleted (glassez)
-    - BUGFIX: Setup DPI at startup (Chocobo1)
-    - BUGFIX: Do not attempt to show detailed tooltips without torrent metadata. Closes #6768. (evsh)
-    - BUGFIX: Better detection of already present files when adding a torrent. (fbriere)
-    - BUGFIX: Fix double click on system tray icon causing program to open and minimize immediately. Closes #5826. (Chocobo1)
-    - BUGIFX: Fix categories sorting in AddNewTorrentDialog. Partially fixes #6708. (fbriere)
-    - BUGFIX: Set "category" column as case-insensitive in transfer list. (fbriere)
-    - BUGFIX: Properly sort categories case-insensitively in filter widget. Closes #6708. (fbriere)
-    - BUGFIX: Fix renaming files is not case sensitive on Windows platform. Closes #5128. (Chocobo1)
-    - BUGFIX: Fix crash in download piece bar (evsh)
-    - BUGFIX: Fix focusing on the previously opened dialog didn't work (Chocobo1)
-    - WEBUI: Bugfix: `RequestParser::splitMultipartData` drop extra trailing newline. (OpenGG)
-    - WEBUI: Add `skip_checking` and `paused` to `/command/download` and `/command/upload` (OpenGG)
-    - WEBUI: Fix checkbox hidden. Closes #6642. (Chocobo1)
-    - WEBUI: Implement http persistence connection. Max simultaneous connection limit set to 500. This also release allocated memory of Connection instances at runtime instead of at program shutdown. (Chocobo1)
-    - WEBUI: Always send Content-Length header. (Chocobo1)
-    - WEBUI: Send Date http header (Chocobo1)
-    - WEBUI: Fix "Content-Encoding" header is always created. (Chocobo1)
-    - WEBUI: Implement robust checking for gzip encoding and revise gzip compressing/decompressing code. (Chocobo1)
-    - WEBUI: Make the context obligatory for translatable strings. Also delete duplicate strings from extra translations. (sledgehammer999)
-    - WEBUI: Use translatable strings in Statistics dialog. (sledgehammer999)
-    - WEBUI: Add missing unit sizes in misc.js (sledgehammer999)
-    - WEBUI: Use the same layout in the Speed tab in preferences as the GUI. (sledgehammer999)
-    - WEBUI: Return status indicating if at least one torrent was successfully added (Thomas Piccirello)
-    - WEBUI: Increase the number of digits after the decimal point (thalieht)
-    - WEBUI: Use less permissive Content Security Policy (Thomas Piccirello)
-    - WEBUI: Fix connection status icon too large. Closes #6804. (Chocobo1)
-    - WEBUI: Cosmetic fixes for WebUI upload and download windows (naikel)
-    - WEBUI: Fix slow filtering in WebUI. (naikel)
-    - WEBUI: Make cookie parsing robust (Chocobo1)
-    - WEBUI: New API for getting torrent piece info (Chocobo1)
-    - WEBUI: Implement Cross-Site Request Forgery defense. Due to this the HTTP referer header is now expected in (almost) all HTTP requests. qBittorrent will drop the request sent without the referer header. That's why we bump the API_VERSION_MIN too. (reported by OpenGG, fixed by Chocobo1)
-    - SEARCH: Update demonoid, legittorrents plugins (ngosang)
-    - SEARCH: Remove mininova, ExtraTorrent plugins (ngosang, KingLucius)
-    - SEARCH: Add btdb plugin (ngosang)
-    - WINDOWS: Updated Spanish, Ukrainian, German, Chinese languages of the installer. (ngosang, evsh, schnurlos, wevsty)
-    - LINUX: Rename .desktop and appdata files to match executable name. Fixes #6625. (evsh)
-    - MACOS: Fix UI responsiveness after AddNewTorrentDialog received metadata. (Brian Kendall)
-
-* Thu Apr 06 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.12
-    - FEATURE: Indicate bitness in stackstrace and about dialog. Closes #6172. (sledgehammer999)
-    - BUGFIX: Fix incomplete type compile error with Qt4 (Chocobo1)
-    - BUGFIX: Fix compile error: ‘escape’ is not a member of ‘Qt’ (Chocobo1)
-    - BUGFIX: Use system locale to format dates/time/etc (sledgehammer999)
-    - BUGFIX: Follow http user-agent format (Chocobo1)
-    - BUGFIX: Fix cancel "Set location" causes files move to installation dir. (Chocobo1)
-    - WEBUI: Improve performance of updating 'progress' column (buinsky)
-    - WEBUI: Implement statistics window in web UI (FranciscoPombal)
-    - WEBUI: fixed "remaining" column in WebUI (FranciscoPombal)
-    - WEBUI: Set HttpOnly attribute to SID cookie (Chocobo1)
-    - WEBUI: Fire up the timer to clean inactive sessions (Chocobo1)
-    - WEBUI: Set cookie SID value to empty on logout (Chocobo1)
-    - WINDOWS: Make the installer DPI aware (regs01)
-    - WINDOWS: Set exit code to 0 on install/uninstall success. Fixes problem with silent installations. (Chocobo1)
-    - WINDOWS: The 64-bit installer refuses to install on 32-bit systems. (sledgehammer999)
-    - WINDOWS: The 64-bit installer uses the correct "Program Files" now. Detection will not work if you install on top of previous installer. (sledgehammer999)
-    - WINDOWS: Fix running the uninstaller if the user chose a different path in the installer. Closes #6080. (sledgehammer999)
-    - LINUX: Add keywords to the .desktop file. (sledgehammer999)
-    - LINUX: Update stuff in appdata.xml and run 'appstream-utl upgrade' on it. (sledgehammer999)
-    - OTHER: Replace rand() by a true uniform distribution generator (Chocobo1)
-    - OTHER: Change our user-agent format as indicated earlier in the news section (Chocobo1)
-    - OTHER: cmake: fix OSX bundle creation (evsh)
-
-* Fri Mar 03 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.11
-    - FEATURE: Always show progress and remaining bytes for unselected files. (sledgehammer999)
-    - FEATURE: Allow to change priority for unselected files through the combobox like it is done via the context menu. (sledgehammer999)
-    - FEATURE: Remove settings to exchange trackers. It wasn't used by non-libtorrent clients. Also it has a privacy risk and you might be DDoSing someone. (sledgehammer999)
-    - FEATURE: Put temp files in .qBittorrent directory. Closes #4462. (Chocobo1)
-    - FEATURE: Use the numbers from tracker scrape response. Closes #5048, #6117. (Chocobo1)
-    - FEATURE: Implement category filter widget. Show categories in tree mode when subcategories are enabled. (glassez)
-    - FEATURE: Allow to toggle columns in searchtab (thalieht)
-    - FEATURE: PeerList: allow to hide zero values for the "uploaded" and "downloaded" columns (thalieht)
-    - FEATURE: Display more information in tracker tab (ngosang)
-    - FEATURE: Use Ctrl+F to search torrents. Closes #5797. (Tim Delaney)
-    - FEATURE: Transferlist: add hotkeys for double click and recheck selected torrents (thalieht)
-    - FEATURE: Add hotkey for execution log tab, Trackerlist, Peerlist etc (thalieht)
-    - FEATURE: Seperate seeds from peers for DHT, PeX and LSD (thalieht)
-    - BUGFIX: Do not remove added files unconditionally. Closes #6248 (Eugene Shalygin)
-    - BUGFIX: Ignore mouse wheel events in Advanced Settings. Closes #866. (Chocobo1)
-    - BUGFIX: Add queue repair code. It should fix missing torrents after restarting. (Eugene Shalygin, nxd4)
-    - BUGFIX: Fetch torrent status when generating final fastresume data. It should fix missing torrents after restarting. (Eugene Shalygin)
-    - BUGFIX: Fix queue overload for add torrent at session start. It should fix missing torrents after restarting. (falco)
-    - BUGFIX: After files relocate, don't remove the old folder even if it is empty. (Chocobo1)
-    - BUGFIX: Fix finding 'English' item in language dropdown menu when an unrecognized locale is requested. Closes #6109. (sledgehammer999)
-    - BUGIFX: Speedlimitdlg: raise slider default value to 10000. Closes #6150. (Chocobo1)
-    - BUGFIX: TransferListWidget: keep columns width even if they are hidden on qBittorrent startup (unless something goes wrong) (thalieht)
-    - BUGFIX: fix index overflow for torrents with invalid meta data or empty progress (Falco)
-    - BUGFIX: Immediately update torrent_status after manipulating super seeding mode. Partially fixes #6072. (sledgehammer999)
-    - BUGFIX: Use case-insensitive comparsion for torrent content window. Closes #6327. (Chocobo1)
-    - BUGFIX: Fixed sort order for datetime columns with empty values (closes #2988) (Vladimir Sinenko)
-    - BUGFIX: Disable proxy in WebUI HTTP server. Closes #6349. (Eugene Shalygin)
-    - COSMETIC: Use a disabled progressbar's palette for unselected files. (sledgehammer999)
-    - COSMETIC: Support fallback when selecting theme icons (Eugene Shalygin)
-    - COSMETIC: Do not resize SVG icons (Eugene Shalygin)
-    - COSMETIC: Align text to the right in columns that handle numbers for PeerList and SearchTab (thalieht)
-    - COSMETIC: Increased number of digits after the decimal point for Gibibytes and above (thalieht)
-    - COSMETIC: Use non-breaking spaces between numbers and units (thalieht)
-    - WEBUI: Fix proxy type bug (Oke Atime)
-    - WEBUI: Use the correct value for KEY_TORRENT_NUM_COMPLETE/KEY_TORRENT_NUM_INCOMPLETE (Chocobo1)
-    - WEBUI: Make torrents table scrollable horizontally (buinsky)
-    - WEBUI: Make torrent peers table scrollable horizontally (buinsky)
-    - WEBUI: Add tooltips to dynamic table header (buinsky)
-    - WEBUI: Implement dynamic table columns resizing, reordering and hiding (buinsky)
-    - WEBUI: Add some missing columns to dynamic tables (buinsky)
-    - WEBUI: Make too tall menus scrollable (buinksy)
-    - WEBUI: Prevent text wrapping in menus (buinsky)
-    - WEBUI: Add a vertical separator between columns (buinsky)
-    - WEBUI: Implement resizable progress bar in "Done" column (buinsky)
-    - WEBUI: Fix scrollbar covers menu item with long text (buinsky)
-    - WEBUI: Remove 300px limit of column width (buinsky)
-    - WEBUI: Avoid lags in firefox on resizing progress column (buinsky)
-    - WEBUI: Fix category in torrent upload. Closes #6260 (ngosang)
-    - WEBUI: Turn off port forwarding of WebUI by default for GUI users (Chocobo1)
-    - WEBUI: Exclude insecure ciphers. Fixes security issues reported by @beardog108 privately. (Chocobo1)
-    - WEBUI: Avoid clickjacking attacks. Fixes security issues reported by @beardog108 privately. (ngosang)
-    - WEBUI: Add X-XSS-Protection, X-Content-Type-Options, CSP header. Fixes security issues reported by @beardog108 privately. (Chocobo1)
-    - WEBUI: Escape various values that might contain injected html. Fixes security issues reported by @beardog108 privately. (Chocobo1)
-    - WEBUI: Bump API_VERSION to 12.
-    - SEARCH: Update extratorrent plugin. Closes #6261 (ngosang)
-    - SEARCH: SearchTab: can now save sorting column changes (thalieht)
-    - SEARCH: Use case-insensitive sort for Name column in Search tab. Closes #407. (Chocobo1)
-    - RSS: Fix tab order in RSS downloader. Closes #6164. (Tim Delaney)
-    - RSS: Move old RSS items to separate config file. Closes #6167. (Tim Delaney)
-    - RSS: Episode filter code refactoring (Tim Delaney)
-    - RSS: Allow resetting rule to no category. Closes #5539. (Tim Delaney)
-    - RSS: Save rule on enable/disable even if not selected. Closes #6163. (Tim Delaney)
-    - RSS: Allow | in RSS must contain. Closes #6171. (Tim Delaney)
-    - RSS: RSS use red text to indicate invalid filter. Closes #6165. (Tim Delaney)
-    - RSS: Allow episode zero (special) and leading zeroes in RSS episode filter. (Tim Delaney)
-    - RSS: RSS parse torrent episodes like 1x01 as well as S01E01. Closes #2749. (Tim Delaney)
-    - RSS: RSS allow infinite range to extend beyond current season. Closes #800, #3876, #6170. (Tim Delaney)
-    - RSS: Improve UI responsiveness during RSS downloading. Closes #873, #1089, #1235, #5423. (Tim Delaney)
-    - RSS: Show name of feed list and sort rules in editor. Closes #3782, #6281. (Tim Delaney)
-    - RSS: Fix regex matching. Closes #6337. (Tim Delaney)
-    - MACOS: Fix qbittorrent-nox build (Oke Atime)
-    - LINUX: fixes default indicator name (Bilal Elmoussaoui)
-    - OTHER: Workaround problem with moc from Qt4 and #if (Eugene Shalygin)
-    - OTHER: Print warning to the user if stacktrace contains no function names (Eugene Shalygin)
-    - OTHER: Various cmake fixes (Eugene Shalygin)
-    - OTHER: Fix finding qmake in configure when cross-compiling (Zach Bacon)
-
-* Sat Dec 17 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.10
-    - BUGFIX: Fix share ratio limiting. Broken by commit 259b5e51c49b744. Closes #6039 #6048. (sledgehammer999)
-    - BUGFIX: Case insensitive sort for client column. Closes #6054. (Oke Atime)
-    - BUGFIX: Make resume/pause menu items clickable. Closes #6040. (Oke Atime)
-    - WINDOWS: Make the updater to look for the x64 installer if running x64 version. (sledgehammer999)
-
-* Wed Dec 14 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.9
-    - BUGFIX: Fix slider for per torrent speed limits when no global speed limit has been set. Closes #6046. (sledgehammer999)
-    - BUGFIX: Fix GUI for proxy settings. Closes #6045. (sledgehammer999)
-    - OSX: Correctly migrate settings/rss/usage stats in macOS. Closes #6041. (sledgehammer999)
-
-* Wed Dec 14 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.8
-    - FEATURE: Start using new libtorrent 1.1.x APIs (needs at least 1.1.2). Still unofficial support. (glassez, sledgehammer999)
-    - FEATURE: Add a new DHT bootstrap node run by libtorrent author arvidn. (sledgehammer999)
-    - FEATURE: Option to disable tracker's favicon download. (sledgehammer999)
-    - FEATURE: Shift + scroll = horizontal scroll. Closes #5980. Only for TransferListWidget, PeerListWidget. (Chocobo1)
-    - BUGFIX: Actually set new path as default when checkBox is enabled in Add New Torrent dialog. (erikssm)
-    - BUGFIX: Properly fix the handling of default save path store/load. (sledgehammer999)
-    - BUGFIX: Fix crash when restoring from tray. Closes #5854. (Chocobo1)
-    - BUGFIX: Export torrents added only after the setting was enabled. (sledgehammer999)
-    - BUGFIX: Delete old rss favicon before assigning new one. (sledgehammer999)
-    - BUGFIX: Don't revert save path value in the Dialog when metadata are received. Closes #5482. (sledgehammer999)
-    - BUGFIX: Don't ever stop seeding forced torrents. Closes #5784. (sledgehammer999)
-    - BUGFIX: Fix potential crash in TransferList widget. Closes #5873. (Chocobo1)
-    - BUGFIX: Sort torrent names case insensitively. (Yez Ezey)
-    - BUGFIX: Fix mistake in getting values for sorting in TransferList widget. (Anton Lashkov)
-    - BUGFIX: Fix memory leaks. (dzmat, Chocobo1)
-    - WEBUI: Fix webui port overflow. (thalieht)
-    - WEBUI: Changed meaning of the value of the 'dl_limit', 'up_limit', 'alt_dl_limit' and 'alt_up_limit' tokens. The value is expressed in bytes and not in KiB. (sledgehammer999)
-    - WEBUI: Don't request client SSL certificate. Closes #3883. (borouhin)
-    - WEBUI: Bump API_VERSION and API_VERSION_MIN to 11.
-    - SEARCH: Fixed extratorrent search not working Closes #5736 #5753. (Yez Ezey)
-    - SEARCH: Update Demonoid plugin. (ngosang)
-    - SEARCH: Remove TorrentReactor plugin. (ngosang)
-    - SEARCH: Fix python auto install, deletion of installer and use 3.5.x series for Vista+. Closes #5871. (sledgehammer999)
-    - SEARCH: Set /usr/local/bin before default PATH on macOS. closes #5639 #5571. This enables finding newer python installs. (Yez Ezey)
-    - COSMETIC: Log: set embedded Tracker [OFF] msg type as info. (thalieht)
-    - COSMETIC: Remove (mostly) useless log warnings about tracker's favicon. (sledgehammer999)
-    - COSMETIC: Change RSS view layout to horizontal. Closes #5920. (Chocobo1)
-    - OSX: Fix crash on exit using Qt4. (Yez Ezey)
-    - OSX: Change QSettings to IniFormat on macOS. Closes #5770 #5808. (Yez Ezey)
-    - LINUX: Workaround a Qt5 bug which results in a flood of network interface change singals. (Eugene Shalygin)
-    - OTHER: Turkish translation for installer. (Burak Yavuz)
-    - OTHER: Update portugueseBR for installer. (DaRKSoM)
-    - OTHER: Update portuguese for installer. (EdwardLinux)
-    - OTHER: Add --disable-qt-dbus to configure if $host_os is macOS. (Yez Ezey)
-    - OTHER: New translations: Icelandic, Latvian, Malay, Occitan, Uzbek.
-    - OTHER: A whole lot of code refactoring by various people.
-
-* Sun Sep 11 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.7
-    - FEATURE: Delete torrent+files with Shift+Delete (pieniacy)
-    - BUGFIX: Fix 6-hour speedplot point push rate. Close #5545 (Daniel Segesdi)
-    - BUGFIX: Avoid spawning a new explorer.exe process when selecting "Open containing folder". Closes #5564. (Chocobo1)
-    - BUGFIX: Fix loading of new geoip db due to an artificial size limit. (SagePtr)
-    - BUGFIX: Better error handling and logging with smtp communication. (Brian Kendall)
-    - SEARCH: Remove KickassTorrents search engine (ngosang)
-    - SEARCH: Remove BTDigg search engine (ngosang)
-    - SEARCH: Update Torrentz search engine (ngosang)
-    
-* Wed Jul 20 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.6
-    - BUGFIX: Do not create save folder in advance (glassez)
-    - BUGFIX: Fix upper-bound limit of command line for "Run External Program" in Windows. Closes #5399. (Chocobo1)
-    - BUGFIX: Invoke system's cmd.exe directly. (Chocobo1)
-    - BUGFIX: Workaround space issues in file path for running external program on Windows. (Chocobo1)
-    - BUGFIX: Fix icons are missing when using RTL languages in Options dialog. Closes #5398. (Chocobo1)
-
-* Mon Jun 20 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.5
-    - FEATURE: Implement Torrent Management Mode(TMM) (glassez)
-    - FEATURE: New cookies management dialog and various related fixes (glassez)
-    - FEATURE: Use unique temp directories (temp_path/<truncated_torrent_hash>). Closes #5154. (glassez)
-    - FEATURE: Display notifications when a torrent is added. Closes #334 and #915. (sledgehammer999)
-    - FEATURE: Sort labels with natural sort algorithm in the right-click menu. Closes #3919. (Chocobo1)
-    - FEATURE: Add option to automatically remove .torrent files upon adding (Eugene Shalygin)
-    - FEATURE: Add option to bind directly to an IP instead of using a network Interface (Sjoerd van der Berg, sledgehammer999)
-    - FEATURE: Detailed tooltips on the progress and availability bars in the General button of each torrent. (Eugene Shalygin)
-    - FEATURE: Let user able to specifiy a filter when choosing an IP filter file (Chocobo1)
-    - FEATURE: Improve usability of "Run External Program". Users can write (platform dependent) shell scripts now. (Chocobo1)
-    - PERFORMANCE: Optimize drawing in speed graph (Anton Lashkov, Chocobo1)
-    - BUGFIX: Fix memory leak. (sledgehammer999)
-    - BUGFIX: Fix resizing bug in "add torrent dialog". Closes #5036. (Chocobo1)
-    - BUGFIX: Fix qBittorrent doesn't exit immediately when "all donwloads are done -> exit" option enabled. (glassez, Chocobo1)
-    - BUGFIX: Display the filepath when a torrent fails to load. Closes #100 and #805. (sledgehammer999)
-    - BUGFIX: Fix Add tracker dialog empty trackers (ngosang)
-    - BUGFIX: Fix Add tracker dialog URL download (ngosang)
-    - BUGFIX: Fix torrent adding with existing data (glassez)
-    - BUGFIX: Try to find incomplete files for new torrent (glassez)
-    - BUGFIX: Fix rechecking after torrent is finished (glassez)
-    - BUGFIX: Fix duplicate network interfaces. Closes #5131 (ngosang)
-    - BUGFIX: Fix .!qB extension is added when disabled (glassez)
-    - BUGFIX: Fix "IP Filtering - Apply to trackers" wasn't being applied. Closes #5217. (Chocobo1)
-    - BUGFIX: Don't resize the Country column needlessly (thalieht)
-    - BUGFIX: Fix crashing when exiting the program while the Options window was showing. Closes #4871, #5049. (Chocobo1)
-    - BUGFIX: Fix parsing of eMule .DAT filters. Closes #5281. (thalieht, sledgehammer999)
-    - WEBUI: Implement in setting/removing/showing categories. (buinsky)
-    - WEBUI: Add 'Added on' column in Webui. Closes #5145,#1092,#738 (Ibrahim Tachijian)
-    - WEBUI: Add command to get the logs (pmzqla)
-    - WEBUI: Expose Add trackers feature (pmzqla)
-    - WEBUI: Bump API_VERSION and API_VERSION_MIN to 10. (sledgehammer999)
-    - SEARCH: Implement search filters in the proxy model. (Eugene Shalygin)
-    - SEARCH: Optimize widgets inside of the search tab (Eugene Shalygin)
-    - SEARCH: Remove duplicated code from search tab and widget (Eugene Shalygin)
-    - SEARCH: Use nova2dl.py script instead of DownloadManager. Closes #5026. (glassez)
-    - SEARCH: Various UI cleanups and optimizations. (Chocobo1, ngosang)
-    - SEARCH: Fix Torrentz, Mininova, LegitTorrents, PirateBay plugins (ngosang)
-    - SEARCH: Fix toolbar resizing when m_searchFilter appears/disappears. Closes #5120. (Chocobo1)
-    - SEARCH: Use QPalette::LinkVisited color for downloaded items in search results (Eugene Shalygin)
-    - SEARCH: Update Python version requirements (min 2.7.9 / 3.3.0) (ngosang)
-    - SEARCH: Remove filters from Torrentreactor, BTDigg and Demonoid. It is done in the GUI now. (ngosang)
-    - RSS: default refresh interval to 30 mins (botmtl)
-    - COSMETIC: Improve TransferListDelegate::sizeHint (Chocobo1)
-    - COSMETIC: Fix long text clipping. Closes #5091. (Chocobo1)
-    - COSMETIC: Minor change in Stats dialog (ngosang)
-    - COSMETIC: Fix Update all button height in RSS tab (ngosang)
-    - COSMETIC: Disable `comboHideZero` when `checkHideZero` is unchecked. (Chocobo1)
-    - COSMETIC: Disable `checkLimituTPConnections` when `checkuTP` is unchecked. (Chocobo1)
-    - COSMETIC: Enable word wrap for "Run external program" help text (Chocobo1)
-    - COSMETIC: Fix mutually exclusive radio buttons can be unselected. (Chocobo1)
-    - COSMETIC: Set About tab font-size to default (zywo)
-    - COSMETIC: Improve wordings in "Auto download torrent" section (Chocobo1)
-    - COSMETIC: Change "Auto download torrent" default save path to "default location". (Chocobo1)
-    - COSMETIC: Change ambiguous text "Copy selected" to "Copy IP:port" (Chocobo1)
-    - COSMETIC: Improve error messages for "Auto download torrents" (Chocobo1)
-    - COSMETIC: Slim down 'Downloads' page of options window. (sledgehammer999)
-    - COSMETIC: Cleanup Connection page in Option dialog. Closes #845. (Chocobo1)
-    - COSMETIC: Fix reload button size is not the same size as "..." button in options dialog. (Chocobo1)
-    - WINDOWS: Let Windows handle all widgets scaling. (Chocobo1)
-    - WINDOWS: Improve stack trace for windows by including source filenames and line numbers (SeigneurSerpent)
-    - OSX: Fix qt5 bundle on OSX. Closes #4014. (sledgehammer999)
-    - OTHER: Make AddNewTorrentDialog behavior uniform (glassez)
-    - OTHER: Optimize the shutdown dialog (Chocobo1)
-    - OTHER: Enable access to shutdown functions when configured with `--disable-gui` option (Chocobo1)
-    - OTHER: Delete Import Torrent Dialog. Just use the "add new torrent" dialog. (glassez)
-    - OTHER: Optimize code for natural sorting (Chocobo1)
-    - OTHER: Use new alert dispathing API for libtorrent 1.1.x (glassez)
-    - OTHER: Fix gcc 6 compilation with qmake. See #5237. (sledgehammer999)
-
 * Tue Mar 29 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.4
     - FEATURE: Download more pieces in "Download first and last pieces first" feature (ngosang)
     - FEATURE: Unlock first column in peerlist too (thalieht)
@@ -524,6 +130,7 @@
     - COSMETIC: Change text description for half-open connection (Chocobo1)
     - OTHER: Change update URL to FossHub. Closes #4188. (sledgehammer999)
     
+
 * Sun Nov 29 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.0
     - FEATURE: Huge core code refactoring. Problems with labels, temp folders etc should be eliminated. Smoother UI should be observed too. (glassez)
     - FEATURE: Speed graph (Anton Lashkov)
@@ -576,166 +183,6 @@
     - OTHER: Reduce max value of "Disk cache size" to 1536MB for 32bit. Closes to #4028. (Chocobo1)
     - OTHER: Make "Download in sequential order" and "Download first and last piece first" options independent. (glassez)
 
-* Sat Oct 31 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.5
-    - BUGFIX: Fix difficult to reproduce crash. (glassez)
-    - OTHER: Fix Windows' Qt5 build. (Gelmir)
-
-* Sat Oct 10 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.4
-    - FEATURE: Select the file of single file torrents when opening destination folder (pmzqla)
-    - BUGFIX: Fix crash with invalid favicon. Closes #3632. (glassez)
-    - BUGFIX: Try to download favicon.png when the download of favicon.ico fails (pmzqla)
-    - BUGFIX: Try to avoid loading a corrupted configuration file. Also log errors encountered while saving/loading the configuration. Closes #3503. (sledgehammer999)
-    - BUGFIX: Allow adding torrent link from Torcache (jsayol)
-    - BUGFIX: Don't limit the number of torrents that can be announced to the tracker/dht/lsd. Closes #3473. (sledgehammer999)
-    - BUGFIX: Fix potential crash when memory allocation failed. Closes #3877. (Chocobo1)
-    - COSMETIC: Change Queue buttons order in the Toolbar (GUI & Web UI) (ngosang)
-    - COSMETIC: Move option "Ignore transfer limits on local network" to Speed page (Chocobo1)
-    - COSMETIC: Move option "Confirm torrent deletion" to Behavior page (Chocobo1)
-    - COSMETIC: Fix typos. Make `μTP` untranslatable. Use American variation of words. Closes #3654. (sledgehammer999)
-    - COSMETIC: Optimize text color for dark themes. Closes #3633 and #3815. (sledgehammer999)
-    - COSMETIC: Show current label in the torrent context menu. Closes #3776. (sledgehammer999)
-    - WEBUI: Add save_path to /query/torrents (Casey Bodley)
-    - WEBUI: Bump API_VERSION to 5
-    - SEARCH: Fix python detection when the 'Anaconda' software is installed. Closes #3731. (sledgehammer999)
-    - RSS: Handle magnet links as torrents instead of news URLs. Closes #3560 (ngosang)
-    - RSS: Trim elements text in RSS articles (ngosang)
-    - RSS: Fix contextual menu in RSS torrents list (ngosang)
-    - RSS: Improve error handling when a RSS feed doesn't contain torrents (ngosang)
-    - RSS: More precise message and code simplification in RSS feeds deletion (ngosang)
-    - RSS: Don't hide the elements in Unread list when clicked (ngosang)
-    - RSS: Allow multiple selection in RSS torrents list (ngosang)
-    - RSS: Simplify string translation (ngosang)
-    - RSS: Handle more types of RSS feeds (ngosang)
-    - RSS: Fix RSS panel position not saved (ngosang)
-    - RSS: Fix forgetting label changes to first item in RSS rule list. (Gelmir)
-    - RSS: Add label to UI when a new one is creating during rule addition. (Gelmir)
-    - RSS: Removes refresh message when adding a new feed (ngosang)
-    - RSS: Fix RSS crash when deleting RSS feeds. Closes #997, #2152, #2461, #3718, #3747, #3766, #3806, #3814, #3829 and #3846. (ngosang)
-    - RSS: Sort labels in RSS Downloader dialog, closes #3140. (Chocobo1)
-    - WINDOWS: Correctly show german letters in the installer. Closes #3574, #3566. (sledgehammer999)
-    - WINDOWS: Fix file selection on Explorer when the filename contains weird characters. Closes #3185. (sledgehammer999)
-    - WINDOWS: Fix wrong default download directory in Windows. Closes #2625. (Chocobo1)
-    - WINDOWS: Fix German translation of the installer. (netswap)
-    - LINUX: Fix broken .desktop file icon for some locales. See #3905. (sledgehammer999)
-    - OTHER: Fix ppc64le detection during configure (sledgehammer999)
-    - OTHER: Don't use sed in configure. Closes #3169. (pmzqla)
-    - OTHER: Fix broken donation link. Closes #3771. (sledgehammer999)
-    - OTHER: Add forum link in README. Closes #3853. (sledgehammer999)
-    - OTHER: New translation: Esperanto
-    - OTHER: Fix Qt5 nox build on non-Windows. (sledgehammer999)
-
-* Sun Aug 02 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.3
-    - BUGFIX: Fix crash when closing a search tab while search is running (pmzqla)
-    - SEARCH: Other minor search fixes and improvements (pmzqla)
-    
-* Sat Aug 01 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.2
-    - FEATURE: Allow to force reannounce DHT too (Chocobo1)
-    - FEATURE: Implement an option to disable confirmation of torrent recheck (blaxspirit)
-    - FEATURE: Allow to copy all the trackers with a keyboard shortcut (pmzqla)
-    - BUGFIX: Fix torrent renaming. Closes #3398 (ngosang)
-    - BUGFIX: Fix localhost address (::ffff:127.0.0.1) is not recognized when connecting to WebUI (Chocobo1)
-    - BUGFIX: Fix '&' character in label name becomes accelerator key, closes #3454. (Chocobo1)
-    - BUGFIX: Fix HTTP header parsing when torrent filename contains a semicolon. Closes #3511.
-    - BUGFIX: Fix installing search plugin from local file. (sledgehammer999)
-    - BUGFIX: Fix installing search plugin by drag-n-dropping file. (sledgehammer999)
-    - COSMETIC: Update color scheme of completed.png icon. (sledgehammer999)
-    - COSMETIC: Fix printing of the copyright symbol in the About dialog. (sledgehammer999)
-    - COSMETIC: Minor changes in Preview File dialog (ngosang)
-    - COSMETIC: Add Force Resume icon (ngosang)
-    - COSMETIC: Add count of unread items to RSS tab label (pmzqla)
-    - WEBUI: Ports between 1 and 65535 as in the GUI. Closes #1602 (ngosang)
-    - WEBUI: Fix an error in Content tab when the torrent doesn't have metadata (ngosang)
-    - WEBUI: New option Web UI port UPNP. Closes #3358 (ngosang)
-    - WEBUI: Fix API Content Types. Closes #3393 (ngosang)
-    - WEBUI: Fix empty trackers addition (ngosang)
-    - WEBUI: Torrent download from hash. Closes #1173 (ngosang)
-    - WEBUI: Fix sort by queue number (ngosang)
-    - WEBUI: Open external links in a new window/tab (ngosang)
-    - WEBUI: Massive increase in performance. (ngosang)
-    - SEARCH: Search status per tab (DoumanAsh)
-    - SEARCH: Remove the word 'torrent' in ExtraTorrent results (ngosang)
-    - SEARCH: Prefer python3 over python2 on Linux and OS X (pmzqla)
-    - SEARCH: Show notification if Python is not found and a search is started (pmzqla)
-    - SEARCH: Update link to the Windows Python installer (pmzqla)
-    - SEARCH: Improve checks for python. Print python version and path to log. (sledgehammer999)
-    - SEARCH: Improve Python detection (ngosang)
-    - OTHER: Improvements on the build system (Chocobo1)
-    - OTHER: Bump minimum libtorrent version required to 1.0.6/0.16.19. (sledgehammer999)
-    - OTHER: New translation: Slovenian
-
-* Sat Jul 11 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.1
-    - FEATURE: Change default preferences (ngosang)
-    - FEATURE: Add "Add link to torrent" menu in TrayIconMenu. Closes #2918. (Chocobo1)
-    - FEATURE: Allow to Open files from the properties pane by pressing "Enter" (pmzqla)
-    - FEATURE: Add checkbox option for IpFilterTrackers. (Chocobo1)
-    - FEATURE: Download-from-URL textbox change focus on tab key (Mayank Asthana)
-    - FEATURE: Increase priority value of "High" (pmzqla)
-    - FEATURE: Add 16 KiB, 8 MiB and 16 MiB piece sizes in Torrent Creator (ngosang)
-    - BUGFIX: Disable Auto piece size when creating a new torrent (ngosang)
-    - BUGFIX: Set default focus to cancel button in delete confirm dlg, closes #3085 (Chocobo1)
-    - BUGFIX: Set default focus to ok button in add new torrent dlg (Chocobo1)
-    - BUGFIX: Set default focus to no button in exit confirm box (Chocobo1)
-    - BUGFIX: Fix Start Minimized checkbox in Options (ngosang)
-    - BUGFIX: Remove limits on alternative speeds setting (LazyBui)
-    - BUGFIX: Fix sorting torrents by ETA (pmzqla)
-    - BUGFIX: Improve ratio calculation formula. Closes #3096. (Chocobo1)
-    - BUGFIX: Clear missing files flag when resuming or force rechecking. Fixes issues in #2750. (sledgehammer999)
-    - BUGFIX: Delete tempfile when downloading favicon.ico. Closes #3257. (sledgehammer999)
-    - BUGFIX: Don't close downloadFromURL dialog when showing empty url warning (Chocobo1)
-    - BUGFIX: Minimize to tray only if the relevant option is enabled. (sledgehammer999)
-    - BUGFIX: Update disk space label after changing partition, closes #3309. (Chocobo1)
-    - BUGFIX: Don't use a default upload limit. Closes #3275. (sledgehammer999)
-    - BUGFIX: Fix Properties bar size when started minimized to tray. Closes #3206. (sledgehammer999)
-    - COSMETIC: Change option text "Confirmation on exit when torrents are active" (Chocobo1)
-    - COSMETIC: Enable to choose dark/light tray icons on all platforms. (Chocobo1)
-    - COSMETIC: Use AllUppercase for label text (Chocobo1)
-    - COSMETIC: changes in typography (ngosang)
-    - COSMETIC: Menu revamp (Chocobo1)
-    - COSMETIC: Revamp general tab info (Chocobo1)
-    - COSMETIC: Better update message for users (Chocobo1)
-    - COSMETIC: Fix ugly 'C++' wrapping in About dialog. (glassez)
-    - WEBUI: Fix login and logout relative URLs (ngosang)
-    - WEBUI: Fix resumeAll and pauseAll. Closes #3016 (ngosang)
-    - WEBUI: Changes in title bar (ngosang)
-    - WEBUI: Complete translatable strings (ngosang)
-    - WEBUI: Minor changes in style (ngosang)
-    - WEBUI: Fix Max connections and Time active in transfer information (ngosang)
-    - WEBUI: New config - Global maximum number of upload slots (ngosang)
-    - WEBUI: Display wasted data with friendly units. Closes #2994 (ngosang)
-    - WEBUI: add delay in shutdown command in order to send out response msg (Chocobo1)
-    - WEBUI: Option to hide Top Toolbar (ngosang)
-    - WEBUI: Reorder the tabs/groups in Options window (ngosang)
-    - WEBUI: Add new options (ngosang)
-    - WEBUI: Increase API_VERSION due to changes in #3279, #3197, #3226 and #3040 (ngosang)
-    - WEBUI: Add Web Seeds (HTTP Sources) tab (ngosang)
-    - WEBUI: Don't update the tabs if tab's panel is collapsed (ngosang)
-    - WEBUI: Fix alternative global rate limits. (ngosang)
-    - SEARCH: Fix thepiratebay. Closes #3012 (ngosang)
-    - SEARCH: Improve torrentz engine to return more results (ngosang)
-    - SEARCH: Change width of columns in search tab. Closes #764 (ngosang)
-    - SEARCH: Make strings translatable in seach engine (ngosang)
-    - SEARCH: Aborting search engine process during closure. Close #2671 (DoumanAsh)
-    - SEARCH: Perform searches in parallel (DoumanAsh)
-    - SEARCH: Add Demonoid search engine (ngosang)
-    - SEARCH: Minor fixes in search engines (ngosang)
-    - SEARCH: Show the version of search engines (ngosang)
-    - SEARCH: Update Legit Torrent to remove sgmllib (DoumanAsh)
-    - SEARCH: Update KickassTorrents (ngosang)
-    - SEARCH: Update BTDigg (ngosang)
-    - SEARCH: Update Torrentz (ngosang)
-    - SEARCH: Update ExtraTorrent (ngosang)
-    - SEARCH: Update TorrentReactor (ngosang)
-    - SEARCH: Fix Python 2 implementation of Torrentz (ngosang)
-    - SEARCH: Cosmetic changes in search engine (ngosang)
-    - SEARCH: Fix column sort in search engine. Closes #2621 (ngosang)
-    - RSS: Update matching RSS articles while editing rules (pmzqla)
-    - WINDOWS: Fix python detection from registry when multiple versions are installed (sledgehammer999)
-    - LINUX: Fixes Linux issue for when the theme doesn't have a corresponding icon. (sledgehammer999)
-    - OTHER: Correctly detect FreeBSD when configuring. (sledgehammer999, yurivict)
-    - OTHER: Add translator to credits.
-    - OTHER: New translation: Indonesian.
-    - OTHER: Split Chinese locales into Chinese Simplified, Chinese Traditional(Taiwan), Chinese Traditional(Hong Kong). (sledgehammer999)
-
 * Sun May 10 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.0
     - FEATURE: Show actual protocol for listen success/failure in the log. Needs libtorrent v1.0.0 (Gelmir)
     - FEATURE: Support per tracker re-announce. Needs libtorrent v1.0.0 (Gelmir)
@@ -826,208 +273,6 @@
     - OTHER: Backtrace generation now works on MinGW. (Gelmir)
     - OTHER: New translation: Hindi(India).
 
-* Wed Feb 22 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.12
-    - OSX: Fix build to work with older machines. (sledgehammer999, Noctem)
-    - WINDOWS: Fix automatic Python download. (sledgehammer999)
-    - WINDOWS: Fix crashes due to memory corruption and improve Python registry searching. (glassez)
-
-* Wed Oct 22 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.11
-    - FEATURE: Allow relative torrent paths when qBittorrent is already running (pmzqla)
-    - FEATURE: Make Windows icons suitable for high dpi screens (pmzqla)
-    - FEATURE: Increase maximum size of system icons (pmzqla)
-    - BUGFIX: Fix crash in the "Content" widget when user would right click in it without a torrent selected (Ivan Sorokin)
-    - BUGFIX: Don't show multiple unlock UI dialogs. Closes #2040. (sledgehammer999)
-    - SEARCH: Fix bug where python would falsely be detected and nothing worked (paolo-sz)
-    - SEARCH: Fix TorrentReactor search plugin (Bruno Barbieri)
-    - SEARCH: Fix search engine encoding issues with python3 on Windows (Bruno Barbieri)
-    - SEARCH: Pirate bay search engine update (DoumanAsh)
-    - SEARCH: Internal improvements in the python code (Bruno Barbieri)
-    - WINDOWS: Fix magnet link association. Closes #1952. (sledgehammer999)
-    - WINDOWS and OSX: Fix again the program updater. The url was changed by sourceforge.net. Closes #1954. (sledgehammer999)
-    - OSX: Fix compilation (sledgehammer999)
-    - WEBUI: Set correct HTTP Content-Type in case of forbidden access. (pmzqla)
-    - COSMETIC: Remove unneeded tooltip (pmzqla)
-    - COSMETIC: Don't stretch the last section in the transfer list (pmzqla)
-    - COSMETIC: Set minimum width of the left panel in the preferences (pmzqla)
-    - OTHER: Optimize sorting of rows. This should have less CPU impact when many torrents are present. (Ivan Sorokin)
-    - OTHER: Use the correct character encoding for exceptions coming from libtorrent. (sledgehammer999)
-    - OTHER: Use boost:bind() as the docs show. Allows compilation with older gcc versions. (sledgehammer999)
-
-* Sun Sep 21 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.10
-    - FEATURE: Allow disabling of OS cache. This will prevent RAM increases on Windows when seeding many files. Closes #1699. (sledgehammer999)
-    - FEATURE: Add 'Completed' column. Closes #1241. (sledgehammer999)
-    - FEATURE: Added 'Ratio Limit' column. Closes #936. (sledgehammer999)
-    - FEATURE: Add 'Open' and 'Open Containing Folder' entries in the content's right-click menu. Closes #1143. (sledgehammer999)
-    - FEATURE: Don't listen on IPv6 address by default. Prevents network connectivity problems. Closes #1880. (sledgehammer999)
-    - FEATURE: Added 'Shutdown now' button in shutdown confirmation dialog. Closes #969. (sledgehammer999)
-    - FEATURE: Add peer port column to PeerListWidget. Closes #1650. (Ivanov Juriy)
-    - COSMETIC: Fix weird ratio values when torrent was imported or downloaded history was lost due to crash. (sledgehammer999)
-    - COSMETIC: Use 'μTP' instead of 'uTP'. (sledgehammer999)
-    - COSMETIC: Show the loaded torrents in the transferlist when qBT is launched with a torrent/magnet and the AddNewTorrentDialog is showing. Closes #1564. (sledgehammer999)
-    - COSMETIC: Don't mix finished/unifinished torrents when sorting by ETA. Closes #1688. (sledgehammer999)
-    - COSMETIC: Sort finished torrents by completed date when sorting by queue number. (sledgehammer999)
-    - COSMETIC: Right align numerical values in the transfer list. Partially revert 51a9a9aab. Closes #1903. (sledgehammer999)
-    - COSMETIC: Don't display the Search Engine tab by default. (sledgehammer999)
-    - WINDOWS: Correctly associate torrents and magnet links with qBittorrent under non-admin accounts. Closes #291 #527 #579 #614 #964. (glassez, sledgehammer999)
-    - WINDOWS: Check for python before creating the search engine tab. Prevents the creation of python specific files in the user's PC if no python is found. Closes #1370. (sledgehammer999)
-    - WINDOWS: Don't create keys in the registry if python isn't found. Closes #1370. (sledgehammer999)
-    - WINDOWS: Can now correctly detect 64bit and 32bit python installations on 64bit Windows. Closes #1148 #445 #795 #1708. (sledgehammer999)
-    - WINDOWS: Search first in PATH for python. Closes #956. (sledgehammer999)
-    - OSX: Enable system tray in MACOSX (Nick Korotysh).
-    - OSX: Fix headless (nox) build. (sledgehammer999)
-    - WEBUI: Correctly save/load settings and other improvements (glassez)
-    - WEBUI: Removed broken 'Report a bug' iframe. Closes #1343 (Benjamin Hutchins)
-    - WEBUI: Removed broken 'Documentation'. Improves fix for #1343 (Benjamin Hutchins)
-    - WEBUI: Removed essentially useless 'Visit website' iframe and changed it to a regular link. Improves fix for #1343 (Benjamin Hutchins)
-    - BUGFIX: Fix RSS feed icon. The tmp file gets deleted in the feed destructor. Closes #1639 (sledgehammer999)
-    - BUGFIX: fix issue #1674: AddNewTorrentDialog is shown again and again even if checkbox "dont ask me again" is set (Ivan Sorokin)
-    - BUGFIX: Don't show availability bar for magnet links (Ivan Sorokin)
-    - BUGFIX: Fix crash when the selected torrent disappears from the transfer list. Closes #1661 (sledgehammer999)
-    - BUGFIX: Fix tracker announcing problem(hit-and-run) when many torrents are being active. Closes #1571 (sledgehammer999)
-    - BUGFIX: Count magnet links in the 'downloading' filter and make them prevent system inhibition. Closes #1558 (sledgehammer999)
-    - BUGFIX: Pick up updated plugins. Closes #1745. (sledgehammer999)
-    - BUGFIX: Bring mainwindow in front when notification is clicked and other windows are in front. (sledgehammer999)
-    - BUGFIX: Speedup torrent moving (Ivan Sorokin)
-    - BUGFIX: Fix bug when moving a torrent before the previous move is completed (Ivan Sorokin)
-    - BUGFIX: Add option to hibernate computer in Auto-Shutdown menu (Bruno Barbieri)
-    - BUGFIX: Fix column resizing issues (Bryan Roscoe)
-    - BUGFIX: Fix possible crashes. Closes #1814. (sledgehammer999)
-    - BUGFIX: Limit max cache to 1800MiB for 32bits compiled binaries and to 4GiB for other. Closes #1698. (sledgehammer999)
-    - BUGFIX: Don't localize double numbers in the webui. Closes #1525. (sledgehammer999)
-    - BUGFIX: Don't shrink transferlist rows when scrolling horizontally. Closes #1613. (sledgehammer999)
-    - BUGFIX: When qBT is launched with a magnet don't show it in the transferlist while the metadata are being loaded in the background. (sledgehammer999)
-    - BUGFIX: Show disk space while retrieving metadata. Closes #1693. (sledgehammer999)
-    - BUGFIX: Don't disable DHT/LSD/UPnP in the GUI when anonymous mode is enabled. (sledgehammer999)
-    - BUGFIX: Possible fix for crash in RSS code. Closes #1901. (sledgehammer999)
-    - BUGFIX: Fixed SMTP emailing code (Ivanov Juriy, sledgehammer999)
-    - BUGFIX: Don't display the context menu in 'Content' and 'HTTP Sources' buttons when no torrent is selected. It prevents crashes. Closes #1906, #1900. (sledgehammer999)
-    - BUGFIX: Don't translate file extensions. Closes #1907. (sledgehammer999)
-    - BUGFIX: Fix available disk space label on single file torrents. (sledgehammer999)
-    - BUGFIX: Show stalled downloads that are uploading under the 'Active' filter. Closes #1654." (sledgehammer999)
-    - BUGFIX: fix import torrent with "Keep incomplete torrents in:" enabled (lojack5)
-    - BUGFIX: Send a spoofed user agent for the search engines(fixes some of them) (Martin Janco)
-    - BUGFIX: Support URLs that redirect to magnet links (Gelmir)
-    - BUGFIX: Consider queued items before deciding to 'auto-shutdown on downloads completion'. Closes #1942. (sledgehammer999)
-
-* Tue Apr 29 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9.2
-    - OTHER: The v3.1.9.1 Windows build was broken
-
-* Mon Apr 28 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9.1
-    - OTHER: This is an excuse to produce new builds with an OpenSSL version that isn't affected by the heartbleed bug for Windows and Mac. This bug should only affect the WebUI and only if HTTPS/SSL authentication was enabled.
-
-* Sat Mar 01 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9
-    - BUGFIX: Fix nox build. Closes #1368 (bob23450)
-    - BUGFIX: Fix build with libtorrent 0.15.x (sledgehammer999)
-    - BUGFIX: Fix missing percentage signs. Closes #1392. (sledgehammer999)
-    - BUGFIX: Fix queue sorting order. (alfrix)
-    - BUGFIX: Fix build using qt < 4.7 Closes #1385. (Evgeny Lensky)
-    - BUGFIX: Fix autoupdater. Send our user-agent to sourceforge.net (sledgehammer999)
-    - FEATURE: Add button for links in toolbar (alfrix)
-
-* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.8
-    - BUGFIX: Really fix build of v3.1.6
-
-* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.7
-    - BUGFIX: Fix build of v3.1.6
-
-* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.6
-    - BUGFIX: Fix 'preview file' regression. Closes #1285. (sledgehammer999)
-    - BUGFIX: Fix peers and seeds sorting in transfer list. (Angel Alonso)
-    - BUGFIX: Fix btdigg search engine. (BTDigg research team)
-    - BUGFIX: Save statistics every 15min and only if there was new traffic. Fixes #1288 and partially #1272. (sledgehammer999)
-    - BUGFIX: Fix share ratio text in the 'general' tab. (sledgehammer999)
-    - BUGFIX: Output a more generic message when blocking IPs and don't use italics in the log. (sledgehammer999)
-    - BUGFIX: Allow 2 decimals when setting the share ratio. Closes #1303. (sledgehammer999)
-    - BUGFIX: Fix extratorrents search plugin. (sledgehammer999)
-    - BUGFIX: Use shorter names for amount columns in main UI (Gelmir)
-    - BUGFIX: Fix overstretched options dialog. Closes #1293. (sledgehammer999)
-    - BUGFIX: Don't show a popup menu when no torrent is selected. (sledgehammer999)
-    - BUGFIX: Launch external programs async and don't block. Closes #1252. (sledgehammer999)
-    - BUGFIX: Don't re-announce to trackers when torrent is paused. Closes #1310. (sledgehammer999)
-    - BUGFIX: Bring dialog boxes in the front when qbt doesn't have focus. (sledgehammer999)
-    - BUGFIX: Correctly resize 'name' column of the content tab. Closes #1360. (sledgehammer999)
-    - BUGFIX: Correctly restore 'name' column width when loading magnet links in the 'Add new torrent dialog'. Closes #1334. (sledgehammer999)
-    - WEBUI: Fix sorting by size in WebUI when non-default locale used. (Vladimir Golovnev)
-    - UI: Reposition statistics menu item. (sledgehammer999)
-    - UI: Convert more accurately decimal numbers to text. (sledgehammer999)
-    - WINDOWS/OSX: Improvements on the behavior of the program updater(closes #1282) (sledgehammer999)
-    - LINUX: Explicitle tell that we don't support freedesktop's startup notify standard. Fixes GNOME issues. Closes #1217. (sledgehammer999)
-    - LINUX: Add our WM_CLASS in the .desktop file so window managers know how to group our windows. (sledgehammer999)
-    - OTHER: Sync translations from Transifex.
-
-* Thu 16 Jan 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.5
-    - BUGFIX: Fix compilation with Qt 4.7. Closes #1215. (sledgehammer999)
-    - BUGFIX: Third attempt at fixing saving settings on OS shutdown. (sledgehammer999)
-    - BUGFIX: Preview now correctly uses the selected file. Closes #1222 #1182. (sledgehammer999)
-    - BUGFIX: Allow to resize the columns in Add New Torrent dialog. Closes #1207 #676 (sledgehammer999)
-    - BUGFIX: Ensure that at least one column in the tranferlist is always visible. Closes #1165. (sledgehammer999)
-    - BUGFIX: Ensure that the options window will always be placed onscreen. Closes #1226. (sledgehammer999)
-    - BUGFIX: Delete temporary files after they aren't needed. Closes #1188. (sledgehammer999)
-    - BUGFIX: Correctly detect libtorrent version. (sledgehammer999)
-    - BUGFIX: Various code cppcheck fixes (Konstantin Goncharik)
-    - BUGFIX: Remove isohunt search engine and update thepiratebay url (sledgehammer999)
-    - BUGFIX: Fix rss settings corruption when checking regexp and going to other rule. (Gelmir)
-    - BUGFIX: Don't count paused torrents for the autoshutdown. Closes #1280. (sledgehammer999)
-    - LINUX: Fix notifications with xfce4-notifyd.
-    - OSX: Added basic retina support. Closes #1251. (Sébastien Lavoie)
-    - OTHER: Sync translations from Transifex.
-
-* Sun 29 Dec 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.4
-    - FEATURE: Statistics dialog (Gelmir)
-    - FEATURE: Tooltips explaining each peer's connection flags (sledgehammer999)
-    - FEATURE: Win/Mac Check for program updates every 15min and allow the user to manually check for updates through the help menu. (sledgehammer999)
-    - BUGFIX: Better dialog message for torrent delete confirmation (sledgehammer999)
-    - BUGFIX: Fix resizing grip location. Closes #1146. (sledgehammer999)
-    - BUGFIX: Lock toolbar in place. Closes #1144. (sledgehammer999)
-    - BUGFIX: Second attempt at fixing saving settings on shutdown. (sledgehammer999)
-    - BUGFIX: Sort labels in 'Add new torrent' dialog. Closes #1150 #411. (sledgehammer999)
-    - LINUX: Fix build under Ubuntu 13.10 (sledgehammer999)
-    - LINUX: Make sleep and shutdown functions work on systemd's logind (Faheem Pervez)
-
-* Mon Nov 20 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.3
-    - FEATURE: Add a key shortcut to "Add link to torrent..." (Angel Alonso)
-    - BUGFIX: Make all columns and headers use the same text alignment in the transferlist. (sledgehammer999)
-    - BUGFIX: Fix build system for Unix/Linux. (sledgehammer999)
-    - BUGFIX: Case insensitive sort in Peers list. Closes #1066. (sledgehammer999)
-    - BUGFIX: Small optimization of WebUI responses when there isn't a data payload. (sledgehammer999)
-    - BUGFIX: Hide empty folders after filtering. Closes #74. (sledgehammer999)
-    - BUGFIX: Expand folders when filtering files. Closes #1076. (sledgehammer999)
-    - BUGFIX: Updated search plugin's URL (Zach Thibeau)
-    - BUGFIX: Strip some png to fix incorrect sRGB profiles. (Angel Alonso)
-    - BUGFIX: Fixed font issues on OSX Mavericks (Zach Thibeau)
-    - BUGFIX: Improve text in the About dialog (Artem S. Tashkinov)
-    - BUGFIX: Always show a peer IP address as a tool tip (Artem S. Tashkinov)
-    - BUGFIX: Fix inhibit system functionality. Closes #766. (sledgehammer999)
-    - BUGFIX: WebUI: Don't gzip too small payloads. (sledgehammer999)
-    - BUGFIX: Correctly detect if the browser supports gzip compression. (sledgehammer999)
-    - BUGFIX: Fix WebUI link to 'Anonymous mode' explanation. Closes #1093. (sledgehammer999)
-    - BUGFIX: Correctly update tracker tier number in the trackers tab. Closes #1075. (sledgehammer999)
-    - BUGFIX: Speed improvements.(sledgehammer999)
-    - OTHER: Updated translations.
-    
-* Tue Nov 05 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.2
-    - BUGFIX: Fix WebUI gzip compression. Closes #1037. (sledgehammer999)
-    - BUGFIX: Fix compilation with qt < 4.8.0. Closes #1043. (sledgehammer999)
-    - OTHER: Updated translations.
-
-* Mon Oct 28 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.1
-    - FEATURE: Show external IP in the log. Closes #968. (sledgehammer999)
-    - FEATURE: Enable gzip compression in the webui. It should be faster now. (sledgehammer999)
-    - FEATURE: Torrents show more states(queued for checking, downloading metadata, allocating, checking resume). (sledgehammer999)
-    - FEATURE: Reenable "force reannounce" to all trackers. (sledgehammer999)
-    - FEATURE: Allow to clear the UI lock password. Closes #973. (sledgehammer999)
-    - FEATURE: New translations: English(Australia) and English(United Kingdom)
-    - BUGFIX: Expose all available translation in the WebUI. Closes #976. (sledgehammer999)
-    - BUGFIX: Copy IP copied wrong data. Closes #970 (sledgehammer999)
-    - BUGFIX: "Preview file..." didn't work on single file torrents. (sledgehammer999)
-    - BUGFIX: Fix and improve the scheduler (Gelmir and sledgehammer999)
-    - BUGFIX: RSS fixes. Closes #960, #998 (Gelmir)
-    - BUGFIX: Fix 'append label to save path' with magnet links. (sledgehammer999)
-    - BUGFIX: Can download up to 10MB .torrent file when a link is provided. Closes #879 (sledgehammer999)
-    - OTHER: Updated translations.
-    - LINUX: Fix missing conf.pri error (leigh123linux)
-    - WINDOWS: Don't remove file associations if they aren't our own. (sledgehammer999)
-
 * Sat Oct 12 2013 - Christophe Dumez <chris@qbittorrent.org> and sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.0
     - FEATURE: Add command line option to daemonize qbittorrent-nox (ngaro)
     - FEATURE: Add "Shutdown qBittorrent" button to Web UI (ngaro)
@@ -1066,118 +311,6 @@
     - PERFORMANCE: Impove drawing speed of tranferlist when there are many torrents(>100)
     - PERFORMANCE: Impove drawing speed of peers list when there are many peers
 
-* Mon Jul 29 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.0.11
-    - FEATURE: Allow more fine tuning of upload slots. It should improve speed (sledgehammer999)
-    - FEATURE: Enable edit/rename via F2 or double click in various places (Gelmir)
-    - BUGFIX: Fix Spanish and Basque translations being messed up on Windows (sledgehammer999)
-    - BUGFIX: Don't allow newlines in rename dialog (Gelmir)
-    - BUGFIX: Treat unfinished dates as the newest ones when sorting (sledgehammer999)
-    - BUGFIX: Fix text size problem on Windows with custom DPI (sledgehammer999)
-    - BUGFIX: Respect UI lock when clicking on tray notification (sledgehammer999)
-    - BUGFIX: Fix kickass torrents search plugin (Gelmir)
-    - BUGFIX: Use system language as default language. Closes #780 (sledgehammer999)
-    - BUGFIX: Move completed files to .unwanted folder when they are unselected by the user (constantined)
-    - BUGFIX: Show delete action when multiple feeds are selected (Gelmir)
-    - BUGFIX: Use Unicode for libtorrent alert messages (Gelmir)    
-    - OTHER: Update translations
-    - WINDOWS: Shave off ~4MB from the binary size (sledgehammer999)
-    - WINDOWS: Remove wrong dependency on msvc2008 runtime (sledgehammer999)
-    - WINDOWS: Disable stacktrace when building with mingw (Gelmir)
-    - WINDOWS: Updated NSIS script to include/delete .pdb file. (sledgehammer999)
-
-* Tue Jul 9 2013 - Christophe Dumez <chris@qbittorrent.org> and sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.0.10
-    - BUGFIX: Fix LegitTorrents search plugin
-    - BUGFIX: Improve peer host name resolution (closes #360)
-    - BUGFIX: Context menu fix in the Web UI
-    - BUGFIX: Respect 'don't show' torrent dialog in Search (sledgehammer999)
-    - BUGFIX: Torrent creator can now use files/folders from disk root (Gelmir)
-    - BUGFIX: Update free disk space when changing drives in the add new torrent dialog (sledgehammer999)
-    - BUGFIX: Various fixes relating to RSS drag and drop (Gelmir)
-    - BUGFIX: Properly rename torrent which changes position in filter model (Gelmir)
-    - BUGFIX: Actually show tray notifications when a torrent finishes downloading (sledgehammer999)
-    - BUGFIX: Don't download RSS items based on rules still being edited (Gelmir)
-    - COSMETIC: Native look for the search boxes (Hyperz)
-    - IMPROVEMENT: Use natural sorting where possible (Gelmir and sledgehammer999)
-    - LINUX: Drop Boost.Thread dependency from configure script
-    - OTHER: Update translations.
-    - OTHER: Drop obsolete Boost.Thread dependency from configure script on linux (Dumez)
-    - LIBTORRENT: SOCKS5 fixes (0.16.10)
-    - LIBTORRENT: Fix hanging issue on Windows when closing files (0.16.10)
-    - LIBTORRENT: Cache can now be returned to the OS (0.16.10)
-    - PERFORMANCE: Impove drawing speed of tranferlist when there are many torrents(>100) (sledgehammer999)
-    - PERFORMANCE: Impove drawing speed of peers list when there are many peers (sledgehammer999)
-    
-* Sat Mar 16 2013 - Christophe Dumez <chris@qbittorrent.org> - v3.0.9
-    - BUGFIX: Raise qBittorrent windows when another instance is launched
-    - BUGFIX: Show human readable names for network interfaces in preferences (Windows)
-    - BUGFIX: Fix torrent creator bug when saving non-latin path (Windows)
-    - BUGFIX: Enable 'copy magnet uri' for torrents without metadata too
-    - BUGFIX: Fix a few JSON parser issues (Gelmir)
-    - BUGFIX: Add support for gzipped encoded HTTP responses (daimor)
-    - BUGFIX: Fix possibly missing "Add torrent" icon (Driim)
-    - OTHER: Add search plugin for Legit Torrents
-
-* Sun Jan 20 2013 - Christophe Dumez <chris@qbittorrent.org> - v3.0.8
-    - BUGFIX: Fix support for --no-splash command line argument
-    - BUGFIX: Fix compilation error with libtorrent v0.15
-    - BUGFIX: Fix search issues with Python3
-    - BUGFIX: Fix dead link about certificates in program preferences
-
-* Sat Jan 19 2013 - Christophe Dumez <chris@qbittorrent.org> - v3.0.7
-    - BUGFIX: Update max write cache size to 2048MB and set it to automatic by default (closes #148)
-    - BUGFIX: Add m4v to the list of previewable file extensions (closes #216)
-    - BUGFIX: Fix "Couldn't set environment variable..." message on start up (closes #245)
-    - BUGFIX: Use right path separator in torrent addition dialog on Windows
-    - BUGFIX: Fix "Set as default save path" setting (closes #254)
-    - BUGFIX: Reenable disk cache on Windows since the memory issue seems to be gone
-    - BUGFIX: Fixed several search engine plugins and removed the dead ones
-    - BUGFIX: Use https links in search plugins when possible
-    - BUGFIX: Bump Mootools to v1.4.5 (Web UI)
-    - BUGFIX: Require password to exit qBittorrent from tray icon when locked (closes #311)
-    - BUGFIX: Fix possible crash in loadPeers() (closes #222)
-
-* Sun Oct 7 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.6
-    - BUGFIX: Fix unicode support for command-line arguments on Windows (closes #139)
-    - BUGFIX: Do not store created torrent in memory before writing it to a file (closes #133)
-    - BUGFIX: No longer fallback to ANY interface if the user-selected interface cannot be found (closes #143)
-    - BUGFIX: Fix timezone parsing in RSS (closes #136)
-    - BUGFIX: Fix cookie support for RSS feeds (closes #119)
-
-* Sun Sep 30 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.5
-    - BUGFIX: Disabling systray icon no longer disables file association settings (closes #114)
-    - BUGFIX: Import new trackers from magnet link in case of duplicate torrent (closes #111)
-    - BUGFIX: Fix "Skip hash check" feature in torrent import dialog (closes #128)
-    - BUGFIX: Several Web UI connection fixes
-    - BUGFIX: Add Basque locale to Web UI
-
-* Tue Sep 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.4
-    - BUGFIX: Fix issue with downloads starting from scratch on startup if temporary
-      directory setting is enabled.
-
-* Sun Sep 16 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.3
-    - BUGFIX: Fix issue with temporary directory not being taken into consideration (closes #94)
-    - BUGFIX: Address encoding issues when using search engine on Windows (closes #29)
-    - BUGFIX: Bypass cache when uploading a torrent file in Web UI (closes #68)
-    - BUGFIX: "Completed On" column is not updated until restart (closes #84)
-    - BUGFIX: Fix possible build error on some systems
-    - I18N: Add hebrew translation
-
-* Sat Sep 1 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.2
-    - FEATURE: Add "clear" functionality to search field (closes #59)
-    - BUGFIX: Attempt to use qBittorrent icon from theme if available (closes #49)
-    - BUGFIX: Fix crash when a fastresume file is empty (closes #52)
-    - BUGFIX: Fix encoding problem for detected XDG Download folder (closes #53)
-    - BUGFIX: Improve performance when showing torrent content panel (Improves #24)
-    - BUGFIX: Fix label-based filtering of torrents whose label contains special characters
-    - BUGFIX: Fix possible crash due to labels (closes #64)
-
-* Tue Aug 21 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.1
-    - BUGFIX: Fix possible crash when adding a tracker to a magnet torrent without metadata (Closes #1034254)
-    - BUGFIX: Remember queue position for torrents without metadata (closes #17)
-    - BUGFIX: Fix crash when using unauthorized characters in label names (closes #19)
-    - BUGFIX: Fix search plugins updating (closes #25)
-    - BUGFIX: Make uTP connections rate limited by default
-
 * Thu Aug 09 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.0
     - FEATURE: Brand new torrent addition dialog
     - FEATURE: Add the ability to choose the save path when using magnet links (mutoso)
@@ -1189,92 +322,6 @@
     - OTHER: Drop support for libtorrent v0.14.x
     - OTHER: Drop support for Qt 4.5
 
-* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.9.12
-    - BUGFIX: Fix issue when "Minimize to tray" and "Start minimized" are both enabled
-
-* Sun Jul 1 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.11
-    - BUGFIX: Fix unreversible "Minimize to tray" on some window managers
-    - BUGFIX: Fix torrent availability computation (closes #988869)
-    - BUGFIX: Bring window to front after restoring from systray
-    - BUGFIX: Fix keyboard focus problems on main window (closes #1019563)
-    - BUGFIX: Fix ThePirateBay search plugin
-
-* Sun Jun 24 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.10
-    - BUGFIX: Fix possible crash when showing torrent content (closes #1002586)
-    - BUGFIX: Add support for RSS feeds using magnet links (closes #1016379)
-    - BUGFIX: Remove 100kb limit for torrent file size in Web UI
-    - BUGFIX: Fix ratio limiting bug (closes #835217)
-    - BUGFIX: Do not display .!qB file extensions in Web UI
-    - BUGFIX: Stop using absolute URLs in Web UI ajax requests (closes #1011226)
-    - BUGFIX: Fix torrent association and loading on Mac OS X (closes #1011229)
-    - BUGFIX: Fix unreversible "Minimize to tray" on some window managers (closes #917825)
-
-* Sun May 20 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.9
-    - BUGFIX: More reliable RSS feed parsing (closes #1001777)
-    - BUGFIX: Better support for cookies in RSS
-    - BUGFIX: Make sure show/hide text in tray icon menu is correct
-    - COSMETIC: Improve style of left panel
-    - COSMETIC: Never disable properties panel
-    - COSMETIC: Make sure first tab is initially selected in options dialog
-    - COSMETIC: Fix a few focus issues on Mac OS X
-
-* Sat May 5 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.8
-    - BUGFIX: Various UI style fixes
-    - BUGFIX: Fix compilation with gcc 4.7
-    - BUGFIX: Fix possible compilation error with msvc (Windows)
-    - BUGFIX: Fix compilation on OS/2
-    - I18N: Update Italian translation
-
-* Sun Mar 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.7
-    - BUGFIX: Fix important HTTP request parsing bug (Web UI)
-
-* Sat Mar 17 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.6
-    - BUGFIX: Fix download first/last pieces state reporting
-    - BUGFIX: Fix name of progress column in torrent content panel
-    - BUGFIX: Disable system tray icon on Mac OS X
-    - BUGFIX: RSS downloader should not ignore "Do not start automatically" rule (closes #946910)
-    - BUGFIX: Fix DHT port setting in Web UI (Closes #952182)
-    - BUGFIX: Fix possible Web UI authentication problem when using SSL (closes #941343)
-    - BUGFIX: Fix possible issues with folder removal when removing a torrent
-    - I18N: Add Basque translation
-
-* Sat Feb 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.5
-    - BUGFIX: Fix crash when disabling then reenabling RSS
-    - BUGFIX: Fix duplicate torrent detection when adding a magnet link
-    - BUGFIX: Fix import of new trackers when adding a torrent with same hash (Closes #747000)
-    - BUGFIX: Fix possible redownload of torrents marked as read (Closes #927495)
-    - BUGFIX: Properly remove RSS feed settings/history upon feed removal
-
-* Sat Feb 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.4
-    - BUGFIX: qBittorrent does not handle redirection to relative URLs correctly (Closes #919905)
-    - BUGFIX: Cmd+M minimizes main window on Mac OS X (Closes #928216)
-    - BUGFIX: Cmd+Del removes torrents on Mac OS X (Closes #928852)
-    - BUGFIX: Fix potential bug when moving single file torrents to tmp folder (closes #932861)
-    - BUGFIX: Fix torrent import dialog layout (Closes #930932)
-    - BUGFIX: Prevent log window buffer from filling up (Closes #929673)
-    - I18N: Add Belarusian translation
-
-* Thu Dec 29 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.3
-    - BUGFIX: Fix btdigg plugin (Python3 support + torrent name in magnet links)
-    - BUGFIX: Fix banning of IPv6 peers (Closes #885021)
-    - BUGFIX: Fix torrent addition dialog layout problem (Closes #84650522)
-    - BUGFIX: Do not report any progress for disabled files (Closes #56731485)
-    - BUGFIX: Make torrent sorting case insensitive (Closes #857154)
-    - BUGFIX: Improve Web UI usability of small devices
-    - BUGFIX: Program updater: More reliable version detection / comparison
-    - I18N: Add Georgian translation
-
-* Sat Oct 29 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.2
-    - BUGFIX: Fix mimimum dimensions for torrent addition dialog
-    - BUGFIX: Remove dependency on boost-datetime
-    - BUGFIX: Remove dependency on boost-filesystem (libtorrent v0.16.x)
-
-* Sun Oct 23 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.1
-    - BUGFIX: Add support for speed limits scheduling (Web UI)
-    - BUGFIX: Fix ratio calculation for purely seeded torrents
-    - I18N: Update Russian translation
-    - COSMETIC: Torrent addition dialog layout fixes
-
 * Sat Oct 08 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.0
     - FEATURE: Add file association settings to program preferences (Windows)
     - FEATURE: Add setting to ignore slow torrents in queueing system

README.md

@@ -29,9 +29,8 @@ will install and execute qBittorrent hopefully without any problem.
 
 ### Public key:
 Starting from v3.3.4 all source tarballs and binaries are signed.<br />
-The key currently used is 4096R/[5B7CC9A2](https://pgp.mit.edu/pks/lookup?op=get&search=0x6E4A2D025B7CC9A2) with fingerprint `D8F3DA77AAC6741053599C136E4A2D025B7CC9A2`.<br />
-You can also download it from [here](https://github.com/qbittorrent/qBittorrent/raw/master/5B7CC9A2.asc).<br />
-**PREVIOUSLY** the following key was used to sign the v3.3.4 source tarballs and v3.3.4 Windows installer **only**: 4096R/[520EC6F6](https://pgp.mit.edu/pks/lookup?op=get&search=0xA1ACCAE4520EC6F6) with fingerprint `F4A5FD201B117B1C2AB590E2A1ACCAE4520EC6F6`.<br />
+The key currently used is 4096R/[520EC6F6](https://pgp.mit.edu/pks/lookup?op=get&search=0xA1ACCAE4520EC6F6) with fingerprint `F4A5FD201B117B1C2AB590E2A1ACCAE4520EC6F6`.<br />
+You can also download it from [here](https://github.com/qbittorrent/qBittorrent/raw/master/520EC6F6.asc).<br />
 
 ### Misc:
 For more information please visit:

README.os2

@@ -0,0 +1,74 @@
+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>
+
+

appveyor.yml

@@ -3,18 +3,14 @@ version: '{branch}-{build}'
 # Do not build on tags (GitHub only)
 skip_tags: true
 
-image: Visual Studio 2017
-
-branches:
-  except:  # blacklist
-    - coverity_scan
+os: Visual Studio 2015
 
 environment:
   REPO_DIR: &REPO_DIR c:\qbittorrent
   CACHE_DIR: &CACHE_DIR c:\qbt_cache
 
-  QBT_VER_URL: https://builds.shiki.hu/appveyor/version
-  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries.7z
+  QBT_VER_URL: http://builds.shiki.hu/appveyor/version
+  QBT_LIB_URL: http://builds.shiki.hu/appveyor/qbt_libraries.7z
 
 # project directory
 clone_folder: *REPO_DIR
@@ -24,8 +20,6 @@ clone_folder: *REPO_DIR
 cache:
   - *CACHE_DIR
 
-clone_depth: 50
-
 install:
   # check if library needs update
   - appveyor DownloadFile "%QBT_VER_URL%" -FileName "c:\version_new" && SET /P newVersion=<"c:\version_new"
@@ -42,7 +36,7 @@ install:
 
 before_build:
   # setup env
-  - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+  - CALL "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvars32.bat"
   - SET PATH=%PATH%;c:\qbt\qt5_32\bin;%CACHE_DIR%\jom;
   # setup project
   - COPY /Y "%CACHE_DIR%\winconf.pri" "%REPO_DIR%"

bootstrap.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 aclocal -I m4
 autoconf

cmake/Modules/DeployQt5.cmake

@@ -1,355 +0,0 @@
-# Borrowed from Avogadro project (https://github.com/OpenChemistry/avogadroapp)
-
-#.rst:
-# DeployQt5
-# ---------
-#
-# Functions to help assemble a standalone Qt5 executable.
-#
-# A collection of CMake utility functions useful for deploying Qt5
-# executables.
-#
-# The following functions are provided by this module:
-#
-# ::
-#
-#    write_qt5_conf
-#    resolve_qt5_paths
-#    fixup_qt5_executable
-#    install_qt5_plugin_path
-#    install_qt5_plugin
-#    install_qt5_executable
-#
-# Requires CMake 2.8.9 or greater because Qt 5 does.
-# Also depends on BundleUtilities.cmake.
-#
-# ::
-#
-#   WRITE_QT5_CONF(<qt_conf_dir> <qt_conf_contents>)
-#
-# Writes a qt.conf file with the <qt_conf_contents> into <qt_conf_dir>.
-#
-# ::
-#
-#   RESOLVE_QT5_PATHS(<paths_var> [<executable_path>])
-#
-# Loop through <paths_var> list and if any don't exist resolve them
-# relative to the <executable_path> (if supplied) or the
-# CMAKE_INSTALL_PREFIX.
-#
-# ::
-#
-#   FIXUP_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf>])
-#
-# Copies Qt plugins, writes a Qt configuration file (if needed) and
-# fixes up a Qt5 executable using BundleUtilities so it is standalone
-# and can be drag-and-drop copied to another machine as long as all of
-# the system libraries are compatible.
-#
-# <executable> should point to the executable to be fixed-up.
-#
-# <qtplugins> should contain a list of the names or paths of any Qt
-# plugins to be installed.
-#
-# <libs> will be passed to BundleUtilities and should be a list of any
-# already installed plugins, libraries or executables to also be
-# fixed-up.
-#
-# <dirs> will be passed to BundleUtilities and should contain and
-# directories to be searched to find library dependencies.
-#
-# <plugins_dir> allows an custom plugins directory to be used.
-#
-# <request_qt_conf> will force a qt.conf file to be written even if not
-# needed.
-#
-# ::
-#
-#   INSTALL_QT5_PLUGIN_PATH(plugin executable copy installed_plugin_path_var <plugins_dir> <component> <configurations>)
-#
-# Install (or copy) a resolved <plugin> to the default plugins directory
-# (or <plugins_dir>) relative to <executable> and store the result in
-# <installed_plugin_path_var>.
-#
-# If <copy> is set to TRUE then the plugins will be copied rather than
-# installed.  This is to allow this module to be used at CMake time
-# rather than install time.
-#
-# If <component> is set then anything installed will use this COMPONENT.
-#
-# ::
-#
-#   INSTALL_QT5_PLUGIN(plugin executable copy installed_plugin_path_var <plugins_dir> <component>)
-#
-# Install (or copy) an unresolved <plugin> to the default plugins
-# directory (or <plugins_dir>) relative to <executable> and store the
-# result in <installed_plugin_path_var>.  See documentation of
-# INSTALL_QT5_PLUGIN_PATH.
-#
-# ::
-#
-#   INSTALL_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf> <component>])
-#
-# Installs Qt plugins, writes a Qt configuration file (if needed) and
-# fixes up a Qt5 executable using BundleUtilities so it is standalone
-# and can be drag-and-drop copied to another machine as long as all of
-# the system libraries are compatible.  The executable will be fixed-up
-# at install time.  <component> is the COMPONENT used for bundle fixup
-# and plugin installation.  See documentation of FIXUP_QT5_BUNDLE.
-
-#=============================================================================
-# Copyright 2011 Mike McQuaid <mike@mikemcquaid.com>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-# The functions defined in this file depend on the fixup_bundle function
-# (and others) found in BundleUtilities.cmake
-
-include(BundleUtilities)
-set(DeployQt5_cmake_dir "${CMAKE_CURRENT_LIST_DIR}")
-set(DeployQt5_apple_plugins_dir "PlugIns")
-
-function(write_qt5_conf qt_conf_dir qt_conf_contents)
-  set(qt_conf_path "${qt_conf_dir}/qt.conf")
-  message(STATUS "Writing ${qt_conf_path}")
-  file(WRITE "${qt_conf_path}" "${qt_conf_contents}")
-endfunction()
-
-function(resolve_qt5_paths paths_var)
-  set(executable_path ${ARGV1})
-
-  set(paths_resolved)
-  foreach(path ${${paths_var}})
-    if(EXISTS "${path}")
-      list(APPEND paths_resolved "${path}")
-    else()
-      if(${executable_path})
-        list(APPEND paths_resolved "${executable_path}/${path}")
-      else()
-        list(APPEND paths_resolved "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${path}")
-      endif()
-    endif()
-  endforeach()
-  set(${paths_var} ${paths_resolved} PARENT_SCOPE)
-endfunction()
-
-function(fixup_qt5_executable executable)
-  set(qtplugins ${ARGV1})
-  set(libs ${ARGV2})
-  set(dirs ${ARGV3})
-  set(plugins_dir ${ARGV4})
-  set(request_qt_conf ${ARGV5})
-
-  message(STATUS "fixup_qt5_executable")
-  message(STATUS "  executable='${executable}'")
-  message(STATUS "  qtplugins='${qtplugins}'")
-  message(STATUS "  libs='${libs}'")
-  message(STATUS "  dirs='${dirs}'")
-  message(STATUS "  plugins_dir='${plugins_dir}'")
-  message(STATUS "  request_qt_conf='${request_qt_conf}'")
-
-  if(QT_LIBRARY_DIR)
-    list(APPEND dirs "${QT_LIBRARY_DIR}")
-  endif()
-  if(QT_BINARY_DIR)
-    list(APPEND dirs "${QT_BINARY_DIR}")
-  endif()
-
-  if(APPLE)
-    set(qt_conf_dir "${executable}/Contents/Resources")
-    set(executable_path "${executable}")
-    set(write_qt_conf TRUE)
-    if(NOT plugins_dir)
-      set(plugins_dir "${DeployQt5_apple_plugins_dir}")
-    endif()
-  else()
-    get_filename_component(executable_path "${executable}" PATH)
-    if(NOT executable_path)
-      set(executable_path ".")
-    endif()
-    set(qt_conf_dir "${executable_path}")
-    set(write_qt_conf ${request_qt_conf})
-  endif()
-
-  foreach(plugin ${qtplugins})
-    set(installed_plugin_path "")
-    install_qt5_plugin("${plugin}" "${executable}" 1 installed_plugin_path)
-    list(APPEND libs ${installed_plugin_path})
-  endforeach()
-
-  foreach(lib ${libs})
-    if(NOT EXISTS "${lib}")
-      message(FATAL_ERROR "Library does not exist: ${lib}")
-    endif()
-  endforeach()
-
-  resolve_qt5_paths(libs "${executable_path}")
-
-  if(write_qt_conf)
-    set(qt_conf_contents "[Paths]\nPlugins = ${plugins_dir}")
-    write_qt5_conf("${qt_conf_dir}" "${qt_conf_contents}")
-  endif()
-
-  fixup_bundle("${executable}" "${libs}" "${dirs}")
-endfunction()
-
-function(install_qt5_plugin_path plugin executable copy installed_plugin_path_var)
-  set(plugins_dir ${ARGV4})
-  set(component ${ARGV5})
-  set(configurations ${ARGV6})
-  if(EXISTS "${plugin}")
-    if(APPLE)
-      if(NOT plugins_dir)
-        set(plugins_dir "${DeployQt5_apple_plugins_dir}")
-      endif()
-      set(plugins_path "${executable}/Contents/${plugins_dir}")
-    else()
-      get_filename_component(plugins_path "${executable}" PATH)
-      if(NOT plugins_path)
-        set(plugins_path ".")
-      endif()
-      if(plugins_dir)
-        set(plugins_path "${plugins_path}/${plugins_dir}")
-      endif()
-    endif()
-
-    set(plugin_group "")
-
-    get_filename_component(plugin_path "${plugin}" PATH)
-    get_filename_component(plugin_parent_path "${plugin_path}" PATH)
-    get_filename_component(plugin_parent_dir_name "${plugin_parent_path}" NAME)
-    get_filename_component(plugin_name "${plugin}" NAME)
-    string(TOLOWER "${plugin_parent_dir_name}" plugin_parent_dir_name)
-
-    if("${plugin_parent_dir_name}" STREQUAL "plugins")
-      get_filename_component(plugin_group "${plugin_path}" NAME)
-      set(${plugin_group_var} "${plugin_group}")
-    endif()
-    set(plugins_path "${plugins_path}/${plugin_group}")
-
-    if(${copy})
-      file(MAKE_DIRECTORY "${plugins_path}")
-      file(COPY "${plugin}" DESTINATION "${plugins_path}")
-    else()
-      if(configurations AND (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE))
-        set(configurations CONFIGURATIONS ${configurations})
-      else()
-        unset(configurations)
-      endif()
-      install(FILES "${plugin}" DESTINATION "${plugins_path}" ${configurations} ${component})
-    endif()
-    set(${installed_plugin_path_var} "${plugins_path}/${plugin_name}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-function(install_qt5_plugin plugin executable copy installed_plugin_path_var)
-  set(plugins_dir ${ARGV4})
-  set(component ${ARGV5})
-  if(EXISTS "${plugin}")
-    install_qt5_plugin_path("${plugin}" "${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}" "${component}")
-  else()
-    string(TOUPPER "QT_${plugin}_PLUGIN" plugin_var)
-    set(plugin_release_var "${plugin_var}_RELEASE")
-    set(plugin_debug_var "${plugin_var}_DEBUG")
-    set(plugin_release "${${plugin_release_var}}")
-    set(plugin_debug "${${plugin_debug_var}}")
-    if(DEFINED "${plugin_release_var}" AND DEFINED "${plugin_debug_var}" AND NOT EXISTS "${plugin_release}" AND NOT EXISTS "${plugin_debug}")
-      message(WARNING "Qt plugin \"${plugin}\" not recognized or found.")
-    endif()
-    if(NOT EXISTS "${${plugin_debug_var}}")
-      set(plugin_debug "${plugin_release}")
-    endif()
-
-    if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      install_qt5_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}_release" "${plugins_dir}" "${component}" "Release|RelWithDebInfo|MinSizeRel")
-      install_qt5_plugin_path("${plugin_debug}" "${executable}" "${copy}" "${installed_plugin_path_var}_debug" "${plugins_dir}" "${component}" "Debug")
-
-      if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
-        set(${installed_plugin_path_var} ${${installed_plugin_path_var}_debug})
-      else()
-        set(${installed_plugin_path_var} ${${installed_plugin_path_var}_release})
-      endif()
-    else()
-      install_qt5_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}" "${component}")
-    endif()
-  endif()
-  set(${installed_plugin_path_var} ${${installed_plugin_path_var}} PARENT_SCOPE)
-endfunction()
-
-function(install_qt5_executable executable)
-  set(qtplugins ${ARGV1})
-  set(libs ${ARGV2})
-  set(dirs ${ARGV3})
-  set(plugins_dir ${ARGV4})
-  set(request_qt_conf ${ARGV5})
-  set(component ${ARGV6})
-  if(QT_LIBRARY_DIR)
-    list(APPEND dirs "${QT_LIBRARY_DIR}")
-  endif()
-  if(QT_BINARY_DIR)
-    list(APPEND dirs "${QT_BINARY_DIR}")
-  endif()
-  if(TARGET Qt5::Core)
-    get_property(_locCore TARGET Qt5::Core PROPERTY LOCATION_RELEASE)
-    get_filename_component(_loc ${_locCore} DIRECTORY)
-    message(STATUS "Adding Qt 5 directory: ${_loc}")
-    list(APPEND dirs "${_loc}")
-  else()
-    message(FATAL_ERROR "No Qt5::Core target found, ensure it is available")
-  endif()
-  if(component)
-    set(component COMPONENT ${component})
-  else()
-    unset(component)
-  endif()
-
-  get_filename_component(executable_absolute "${executable}" ABSOLUTE)
-  if(EXISTS "${QT_QTCORE_LIBRARY_RELEASE}")
-    gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_RELEASE}" qtcore_type)
-  elseif(EXISTS "${QT_QTCORE_LIBRARY_DEBUG}")
-    gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_DEBUG}" qtcore_type)
-  endif()
-  if(qtcore_type STREQUAL "system")
-    set(qt_plugins_dir "")
-  endif()
-
-  if(QT_IS_STATIC)
-    message(WARNING "Qt built statically: not installing plugins.")
-  else()
-    if(APPLE)
-      get_property(loc TARGET Qt5::QCocoaIntegrationPlugin
-        PROPERTY LOCATION_RELEASE)
-      install_qt5_plugin("${loc}" "${executable}" 0 installed_plugin_paths
-        "PlugIns" "${component}")
-      list(APPEND libs ${installed_plugin_paths})
-    elseif(WIN32)
-      get_property(loc TARGET Qt5::QWindowsIntegrationPlugin
-        PROPERTY LOCATION_RELEASE)
-      install_qt5_plugin("${loc}" "${executable}" 0 installed_plugin_paths
-        "" "${component}")
-      list(APPEND libs ${installed_plugin_paths})
-    endif()
-    foreach(plugin ${qtplugins})
-      set(installed_plugin_paths "")
-      install_qt5_plugin("${plugin}" "${executable}" 0 installed_plugin_paths "${plugins_dir}" "${component}")
-      list(APPEND libs ${installed_plugin_paths})
-    endforeach()
-  endif()
-
-  resolve_qt5_paths(libs "")
-
-  install(CODE
-  "include(\"${DeployQt5_cmake_dir}/DeployQt5.cmake\")
-  set(BU_CHMOD_BUNDLE_ITEMS TRUE)
-  fixup_qt5_executable(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${executable}\" \"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")"
-    ${component}
-    )
-endfunction()

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -14,11 +14,6 @@
 find_package(Threads REQUIRED)
 find_package(PkgConfig QUIET)
 
-macro(_detect_boost_components _outComponets librariesList)
-    string(REGEX MATCHALL "boost_[a-z_]+[-a-z]*" _boost_libraries "${librariesList}")
-    string(REGEX REPLACE "boost_([a-z_]+)[-a-z]*" "\\1" ${_outComponets} "${_boost_libraries}")
-endmacro()
-
 if(PKG_CONFIG_FOUND)
     pkg_check_modules(PC_LIBTORRENT_RASTERBAR QUIET libtorrent-rasterbar)
 endif()
@@ -67,38 +62,19 @@ endif()
 set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
 set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIR})
 
-# Without pkg-config, we can't possibly figure out the correct boost dependencies
-if (LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-    set(_boost_components "${LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES}")
-else(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-    if(PC_LIBTORRENT_RASTERBAR_FOUND)
-        _detect_boost_components(_boost_components "${PC_LIBTORRENT_RASTERBAR_LIBRARIES}")
-    else()
-        # all possible boost dependencies
-        set(_boost_components
-            date_time
-            system
-            chrono
-            random
-            thread
-        )
-    endif()
-endif(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-
-list(SORT _boost_components)
-message(STATUS "Libtorrent Boost dependencies: ${_boost_components}")
-find_package(Boost REQUIRED COMPONENTS ${_boost_components})
-set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-foreach(_boost_cmpnt IN LISTS _boost_components)
-    list(APPEND LibtorrentRasterbar_LIBRARIES "Boost::${_boost_cmpnt}")
-endforeach(_boost_cmpnt)
-
-set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIRS})
+if(NOT Boost_SYSTEM_FOUND OR NOT Boost_CHRONO_FOUND OR NOT Boost_RANDOM_FOUND)
+    find_package(Boost REQUIRED COMPONENTS date_time system chrono random thread)
+    set(LibtorrentRasterbar_LIBRARIES
+        ${LibtorrentRasterbar_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+    set(LibtorrentRasterbar_INCLUDE_DIRS
+        ${LibtorrentRasterbar_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+endif()
 
 list(FIND LibtorrentRasterbar_DEFINITIONS -DTORRENT_USE_OPENSSL LibtorrentRasterbar_ENCRYPTION_INDEX)
 if(LibtorrentRasterbar_ENCRYPTION_INDEX GREATER -1)
     find_package(OpenSSL REQUIRED)
-    set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto)
+    set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} ${OPENSSL_LIBRARIES})
+    set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS})
     set(LibtorrentRasterbar_OPENSSL_ENABLED ON)
 endif()
 
@@ -107,21 +83,11 @@ include(FindPackageHandleStandardArgs)
 # if all listed variables are TRUE
 find_package_handle_standard_args(LibtorrentRasterbar DEFAULT_MSG
                                   LibtorrentRasterbar_LIBRARY
-                                  LibtorrentRasterbar_INCLUDE_DIR)
+                                  LibtorrentRasterbar_INCLUDE_DIR
+                                  Boost_SYSTEM_FOUND
+                                  Boost_CHRONO_FOUND
+                                  Boost_RANDOM_FOUND)
 
 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)
-
-    set_target_properties(LibtorrentRasterbar::LibTorrent PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-        IMPORTED_LOCATION "${LibtorrentRasterbar_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"
-        INTERFACE_LINK_LIBRARIES "${LibtorrentRasterbar_LIBRARIES}"
-        INTERFACE_COMPILE_OPTIONS "${LibtorrentRasterbar_DEFINITIONS}"
-    )
-endif()

cmake/Modules/FindQtSingleApplication.cmake

@@ -30,9 +30,9 @@ IF(QT4_FOUND)
         NAMES ${QTSINGLEAPPLICATION_NAMES}
         PATHS ${QT_LIBRARY_DIR}
     )
-ELSEIF(Qt5Core_FOUND)
+ELSEIF(Qt5Widgets_FOUND)
     message(STATUS "Looking for Qt5 single application library")
-    FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
+    FOREACH(TOP_INCLUDE_PATH in ${Qt5Widgets_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
         FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication ${TOP_INCLUDE_PATH}/QtSolutions)
 
         IF(QTSINGLEAPPLICATION_INCLUDE_DIR)
@@ -43,12 +43,12 @@ ELSEIF(Qt5Core_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_CORELIBRARY Qt5::Core LOCATION)
-    GET_FILENAME_COMPONENT(_QT5_CORELIBRARYPATH ${_QT5_CORELIBRARY} PATH)
+    GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION)
+    GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
 
     FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
         NAMES ${QTSINGLEAPPLICATION_NAMES}
-        PATHS ${_QT5_CORELIBRARYPATH}
+        PATHS ${QT5_WIDGETSLIBRARYPATH}
     )
 ENDIF()
 
@@ -79,16 +79,3 @@ ELSE (QTSINGLEAPPLICATION_FOUND)
 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/FindSystemd.cmake

@@ -3,9 +3,6 @@
 # sets variables
 # SYSTEMD_FOUND
 # SYSTEMD_SERVICES_INSTALL_DIR
-
-find_package(PkgConfig QUIET REQUIRED)
-
 if (NOT SYSTEMD_FOUND)
     pkg_check_modules(SYSTEMD "systemd")
 endif(NOT SYSTEMD_FOUND)

cmake/Modules/FunctionReadVersion.cmake

@@ -1,28 +0,0 @@
-# function for parsing version variables that are set in version.pri file
-# the version identifiers there are defined as follows:
-# VER_MAJOR = 3
-# VER_MINOR = 4
-# VER_BUGFIX = 0
-# VER_BUILD = 0
-# VER_STATUS = alpha
-
-function(read_version priFile outMajor outMinor outBugfix outBuild outStatus)
-    file(STRINGS ${priFile} _priFileContents REGEX "^VER_.+")
-    # message(STATUS "version.pri version contents: ${_priFileContents}")
-    # the _priFileContents variable contains something like the following:
-    # VER_MAJOR = 3;VER_MINOR = 4;VER_BUGFIX = 0;VER_BUILD = 0;VER_STATUS = alpha # Should be empty for stable releases!
-    set(_regex "VER_MAJOR += +([0-9]+);VER_MINOR += +([0-9]+);VER_BUGFIX += +([0-9]+);VER_BUILD += +([0-9]+);VER_STATUS += +([0-9A-Za-z]+)?")
-     # note quotes around _regex, they are needed because the variable contains semicolons
-    string(REGEX MATCH "${_regex}" _tmp "${_priFileContents}")
-    if (NOT _tmp)
-        message(FATAL_ERROR "Could not detect project version number from ${priFile}")
-    endif()
-
-    # message(STATUS "Matched version string: ${_tmp}")
-
-    set(${outMajor} ${CMAKE_MATCH_1} PARENT_SCOPE)
-    set(${outMinor} ${CMAKE_MATCH_2} PARENT_SCOPE)
-    set(${outBugfix} ${CMAKE_MATCH_3} PARENT_SCOPE)
-    set(${outBuild} ${CMAKE_MATCH_4} PARENT_SCOPE)
-    set(${outStatus} ${CMAKE_MATCH_5} PARENT_SCOPE)
-endfunction()

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/MacroLinkQtComponents.cmake

@@ -5,23 +5,11 @@
 macro (target_link_qt_components target)
 if (QT4_FOUND)
     foreach(_cmp ${ARGN})
-        if ("${_cmp}" STREQUAL "PRIVATE" OR
-            "${_cmp}" STREQUAL "PUBLIC" OR
-            "${_cmp}" STREQUAL "INTERFACE")
-             list(APPEND _QT_CMPNTS "${_cmp}")
-        else()
         list(APPEND _QT_CMPNTS "Qt4::Qt${_cmp}")
-        endif()
     endforeach()
 else (QT4_FOUND)
     foreach(_cmp ${ARGN})
-        if ("${_cmp}" STREQUAL "PRIVATE" OR
-            "${_cmp}" STREQUAL "PUBLIC" OR
-            "${_cmp}" STREQUAL "INTERFACE")
-             list(APPEND _QT_CMPNTS "${_cmp}")
-        else()
         list(APPEND _QT_CMPNTS "Qt5::${_cmp}")
-        endif()
     endforeach()
 endif (QT4_FOUND)
     target_link_libraries(${target} ${_QT_CMPNTS})

cmake/Modules/MacroQbtCompilerSettings.cmake

@@ -1,89 +0,0 @@
-# Sets cache variable QBT_ADDITONAL_FLAGS and QBT_ADDITONAL_CXX_FLAGS to list of additional
-# compiler flags for C and C++ (QBT_ADDITONAL_FLAGS) and for C++ only (QBT_ADDITONAL_CXX_FLAGS)
-# and appends them to CMAKE_XXX_FLAGS variables.
-
-# It could use add_compile_options(), but then it is needed to use generator expressions,
-# and most interesting of them are not compatible with Visual Studio :(
-
-macro(qbt_set_compiler_options)
-# if (NOT QBT_ADDITONAL_FLAGS)
-    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"
-        )
-        set (_GCC_COMMON_CXX_FLAGS  "-fexceptions -frtti"
-            "-Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel"
-            "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align"
-            "-Werror=overloaded-virtual"
-    # 		"-Weffc++"
-            "-Werror -Wno-error=cpp"
-            # we should modify code to make these ones obsolete
-            "-Wno-error=sign-conversion -Wno-error=float-equal"
-        )
-
-        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()
-
-        include(CheckCXXCompilerFlag)
-        # check for -pedantic
-        check_cxx_compiler_flag(-pedantic _PEDANTIC_IS_SUPPORTED)
-        if (_PEDANTIC_IS_SUPPORTED)
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-pedantic -pedantic-errors")
-        else (_PEDANTIC_IS_SUPPORTED)
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wpedantic")
-        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)
-
-        string(REPLACE ";" " " _GCC_COMMON_C_AND_CXX_FLAGS_STRING "${_GCC_COMMON_C_AND_CXX_FLAGS}")
-        string(REPLACE ";" " " _GCC_COMMON_CXX_FLAGS_STRING "${_GCC_COMMON_CXX_FLAGS}")
-
-        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}")
-    endif ()
-
-# endif (NOT QBT_ADDITONAL_FLAGS)
-endmacro(qbt_set_compiler_options)
-

cmake/Modules/QbtTargetSources.cmake

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

cmake/Modules/bundle.cmake

@@ -1,21 +0,0 @@
-set(BU_CHMOD_BUNDLE_ITEMS ON)
-include(DeployQt5)
-
-set(plugins "")
-
-get_property(svgIconPluginLocation TARGET Qt5::QSvgIconPlugin
-        PROPERTY LOCATION_RELEASE)
-list(APPEND plugins "${svgIconPluginLocation}")
-get_property(svgPluginLocation TARGET Qt5::QSvgPlugin
-        PROPERTY LOCATION_RELEASE)
-list(APPEND plugins "${svgPluginLocation}")
-
-set(sfx "")
-if(APPLE)
-    set(sfx ".app")
-elseif(WIN32)
-    set(sfx "${CMAKE_EXECUTABLE_SUFFIX}")
-endif()
-
-get_target_property(exe qBittorrent OUTPUT_NAME)
-install_qt5_executable("${exe}${sfx}" "${plugins}" "" "" "")

cmake/Modules/winconf.cmake

@@ -1,7 +1,5 @@
 # Settings for compiling qBittorrent on Windows
 
-list(APPEND CMAKE_LIBRARY_PATH "$ENV{LIB}")
-
 # We want to link with static version of
 # libtorrent
 set(LibtorrentRasterbar_USE_STATIC_LIBS True)
@@ -11,21 +9,18 @@ set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
     -DBOOST_EXCEPTION_DISABLE
     -DBOOST_SYSTEM_STATIC_LINK=1
     -DTORRENT_USE_OPENSSL
-    -D__USE_W32_SOCKETS
-    -D_FILE_OFFSET_BITS=64)
-
-add_definitions(-DUNICODE
+    -DUNICODE
     -D_UNICODE
     -DWIN32
     -D_WIN32
     -DWIN32_LEAN_AND_MEAN
-    -DNTDDI_VERSION=0x05010000
     -D_WIN32_WINNT=0x0501
-    -D_WIN32_IE=0x0501
+    -D_WIN32_IE=0x0500
     -D_CRT_SECURE_NO_DEPRECATE
     -D_SCL_SECURE_NO_DEPRECATE
-    -DNOMINMAX
-)
+    -D__USE_W32_SOCKETS
+    -D_FILE_OFFSET_BITS=64)
+
 # and boost
 set(Boost_USE_STATIC_LIBS  True)
 # set(Boost_USE_STATIC_RUNTIME True)
@@ -34,17 +29,16 @@ set(Boost_USE_STATIC_LIBS  True)
 # with usual unix subdirectories (bin, lib, include)
 # if so, we just need to set CMAKE_SYSTEM_PREFIX_PATH
 # If it is not the case, individual paths need to be specified manually (see below)
-set(COMMON_INSTALL_PREFIX "c:/usr" CACHE PATH "Prefix used to install all the required libraries")
+set(COMMON_INSTALL_PREFIX "c:/usr")
 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")
+set(QT4_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt4")
+set(QT5_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt5")
 
 # 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)
 

conf.pri.in

@@ -6,16 +6,8 @@ DATADIR = @EXPAND_DATADIR@
 MANPREFIX = @EXPAND_MANDIR@
 
 QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
-
-EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@
-EXTERNAL_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS
-# added /usr/local/include due to Qt 5.7.0 bug on macOS
-macx: EXTERNAL_INCLUDES += "/usr/local/include"
-INCLUDEPATH += $$EXTERNAL_INCLUDES
-
-EXTERNAL_LIBS = @LDFLAGS@ @LIBS@
-EXTERNAL_LIBS -= $$QMAKE_DEFAULT_LIBDIRS
-LIBS += $$EXTERNAL_LIBS
+INCLUDEPATH += @QBT_CONF_INCLUDES@
+LIBS += @LDFLAGS@ @LIBS@
 
 CONFIG += @QBT_ADD_CONFIG@
 CONFIG -= @QBT_REMOVE_CONFIG@

conf.pri.windows

@@ -1,61 +0,0 @@
-# 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

@@ -12,12 +12,24 @@ AM_INIT_AUTOMAKE
 
 # Define --wth-* and --enable-* arguments
 
+AC_ARG_WITH(qt4,
+            [AS_HELP_STRING([--with-qt4],
+                            [Compile using Qt4 (default=no)])],
+            [],
+            [with_qt4=no])
+
 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_WITH(qjson,
+            [AS_HELP_STRING([--with-qjson=@<:@system|shipped@:>@],
+                            [Use the shipped qjson library or the system one (default=shipped) (Qt4 only)])],
+            [],
+            [with_qjson=shipped])
+
 AC_ARG_ENABLE(debug,
               [AS_HELP_STRING([--enable-debug],
                               [Enable debug build])],
@@ -55,12 +67,6 @@ AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null],
       LIBS="-lexecinfo $LIBS"],
       [AC_MSG_RESULT([no])])
 
-AC_MSG_CHECKING([whether OS is macOS])
-AS_IF([expr "$host_os" : ".*darwin.*" > /dev/null],
-      [AC_MSG_RESULT([yes])
-      enable_qt_dbus=no],
-      [AC_MSG_RESULT([no])])
-
 # Require 0.23 pkg-config
 PKG_PROG_PKG_CONFIG([0.23])
 AS_IF([test "x$PKG_CONFIG" = "x"],
@@ -115,13 +121,20 @@ AS_CASE(["x$enable_webui"],
         [AC_MSG_RESULT([$enable_webui])
         AC_MSG_ERROR([Unknown option "$enable_webui". Use either "yes" or "no".])])
 
-FIND_QT5()
+AC_MSG_CHECKING([whether Qt4 should be enabled])
+AS_CASE(["x$with_qt4"],
+        ["xno"],
+              [AC_MSG_RESULT([no])
+              FIND_QT5()],
+        ["xyes"],
+               [AC_MSG_RESULT([yes])
+               FIND_QT4()],
+        [AC_MSG_RESULT([$with_qt4])
+        AC_MSG_ERROR([Unknown option "$with_qt4". Use either "yes" or "no".])])
 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"],
@@ -138,16 +151,22 @@ 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"])],
-              [AC_MSG_ERROR([Could not find Boost])])
-CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
-LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
+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 CPPFLGAS: $BOOST_CPPFLAGS])
+      CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
+      LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])
 
 AX_BOOST_SYSTEM()
-AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
-LIBS="$BOOST_SYSTEM_LIB $LIBS"
+# 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_CHECKING([which qtsingleapplication to use])
 AS_CASE(["x$with_qtsingleapplication"],
@@ -160,13 +179,30 @@ AS_CASE(["x$with_qtsingleapplication"],
         [AC_MSG_RESULT([$with_qtsingleapplication])
         AC_MSG_ERROR([Unknown option "$with_qtsingleapplication". Use either "system" or "shipped".])])
 
+AS_IF([test "x$with_qt4" = "xyes"],
+      [AC_MSG_CHECKING([which qjson to use])
+      AS_CASE(["x$with_qjson"],
+              ["xshipped"],
+                         [AC_MSG_RESULT([shipped])
+                         QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG usesystemqjson"],
+              ["xsystem"],
+                         [AC_MSG_RESULT([system])
+                         PKG_CHECK_MODULES(qjson,
+                                          [QJson >= 0.8.1],
+                                          [CPPFLAGS="$qjson_CFLAGS $CPPFLAGS"
+                                          LIBS="$qjson_LIBS $LIBS"])
+                         QBT_ADD_CONFIG="$QBT_ADD_CONFIG usesystemqjson"],
+              [AC_MSG_RESULT([$with_qjson])
+              AC_MSG_ERROR([Unknown option "$with_qjson". Use either "system" or "shipped".])])
+     ])
+
 PKG_CHECK_MODULES(libtorrent,
                   [libtorrent-rasterbar >= 1.0.6],
                   [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS"
                   LIBS="$libtorrent_LIBS $LIBS"])
 
 PKG_CHECK_MODULES(zlib,
-                 [zlib >= 1.2.5.2],
+                 [zlib],
                  [CPPFLAGS="$zlib_CFLAGS $CPPFLAGS"
                  LIBS="$zlib_LIBS $LIBS"])
 
@@ -218,7 +254,7 @@ AC_SUBST(QBT_REMOVE_DEFINES)
 
 AC_OUTPUT(conf.pri)
 AS_IF([test "x$enable_systemd" = "xyes"],
-      [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)])
+      [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox.service)])
 
 
 
@@ -234,3 +270,4 @@ 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

@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleName</key>
-	<string>@EXECUTABLE@</string>
+	<string>qBittorrent</string>
 	<key>CFBundleIconFile</key>
 	<string>qbittorrent_mac.icns</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -45,11 +45,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.1</string>
+	<string>3.3.4</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>
-	<string>@EXECUTABLE@</string>
+	<string>qbittorrent</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.qbittorrent</string>
 	<key>NSPrincipalClass</key>
@@ -59,7 +59,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2017 The qBittorrent project</string>
+	<string>Copyright © 2006-2016 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/mac/bundle.cmake

@@ -0,0 +1,2 @@
+include(BundleUtilities)
+fixup_bundle("$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/qbittorrent.app" "" "")

dist/unix/CMakeLists.txt

@@ -2,8 +2,8 @@ if (SYSTEMD)
     find_package(Systemd)
     if (SYSTEMD_FOUND)
         set(EXPAND_BINDIR ${CMAKE_INSTALL_FULL_BINDIR})
-        configure_file(systemd/qbittorrent-nox@.service.in ${CMAKE_CURRENT_BINARY_DIR}/qbittorrent-nox@.service @ONLY)
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qbittorrent-nox@.service
+        configure_file(systemd/qbittorrent-nox.service.in ${CMAKE_CURRENT_BINARY_DIR}/qbittorrent-nox.service @ONLY)
+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qbittorrent-nox.service
             DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
             COMPONENT data)
     endif(SYSTEMD_FOUND)
@@ -20,23 +20,18 @@ install(FILES ${MAN_FILES}
         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
         COMPONENT doc)
 
-if (GUI)
-    install(DIRECTORY menuicons/
+install(DIRECTORY menuicons/
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
         FILES_MATCHING PATTERN "*.png")
 
-    install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.desktop
+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)
 
-    install(FILES qbittorrent.appdata.xml
+install(FILES qBittorrent.appdata.xml
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/
         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
-        COMPONENT data)
-endif()

dist/unix/qBittorrent.appdata.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 sledgehammer999 <sledgehammer999@qbittorrent.org> -->
+<component type="desktop">
+ <id>qBittorrent.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0 and OpenSSL</project_license>
+ <name>qBittorrent</name>
+ <summary>A Bittorrent Client</summary>
+ <description>
+  <p>
+   Aiming to be a good alternative to all other bittorrent clients out
+   there, qBittorrent is fast, stable and provides unicode support as well
+   as many other features. Additionally, qBittorrent runs and provides those
+   same features on all major platforms (Linux, Mac OS X, Windows, OS/2, FreeBSD).
+  </p>
+  <p>
+   It is programmed in C++ / Qt and uses libtorrent (sometimes called
+   libtorrent-rasterbar) by Arvid Norberg. GeoLite data, created by MaxMind,
+   are included in qBittorrent. Its features include:
+  </p>
+  <ul>
+   <li>Polished µTorrent-like User Interface</li>
+   <li>Well-integrated and extensible Search Engine</li>
+   <li>All Bittorrent extensions (DHT, Peer Exchange, Full encryption, Magnet/BitComet URIs, ...)</li>
+   <li>Remote control through a Web user interface</li>
+   <li>Advanced control over trackers, peers and torrents</li>
+   <li>UPnP / NAT-PMP port forwarding support</li>
+   <li>Available in ~25 languages (Unicode support)</li>
+   <li>Torrent creation tool</li>
+   <li>Advanced RSS support with download filters (inc. regex)</li>
+   <li>Bandwidth scheduler</li>
+   <li>IP Filtering (eMule and PeerGuardian compatible)</li>
+   <li>IPv6 compliant</li>
+   <li>Sequential downloading (aka "Download in order")</li>
+  </ul>
+ </description>
+ <screenshots>
+  <screenshot type="default">
+   <image width="1200" height="675">
+    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_01.png
+   </image>
+  </screenshot>
+  <screenshot>
+   <image width="1200" height="675">
+    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_02.png
+   </image>
+  </screenshot>
+  <screenshot>
+   <image width="1200" height="675">
+    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_03.png
+   </image>
+  </screenshot>
+  <screenshot>
+   <image width="1200" height="675">
+    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_04.png
+   </image>
+  </screenshot>
+ </screenshots>
+ <url type="homepage">http://www.qbittorrent.org/</url>
+ <update_contact>sledgehammer999@qbittorrent.org</update_contact>
+</component>