Bump to 3.3.13

Bump API version

.appveyor.yml

@@ -9,8 +9,8 @@ environment:
   REPO_DIR: &REPO_DIR c:\qbittorrent
   CACHE_DIR: &CACHE_DIR c:\qbt_cache
 
-  QBT_VER_URL: http://builds.shiki.hu/appveyor/version
+  QBT_VER_URL: https://builds.shiki.hu/appveyor/version
-  QBT_LIB_URL: http://builds.shiki.hu/appveyor/qbt_libraries.7z
+  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries.7z
 
 # project directory
 clone_folder: *REPO_DIR

.github/ISSUE_TEMPLATE.md

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

.gitignore

@@ -17,6 +17,7 @@ Makefile*
 
 # Generated MOC, resource and UI files
 moc_*.cpp
+moc_*.h
 qrc_*.cpp
 ui_*.h
 *.moc

.travis.yml

@@ -3,7 +3,7 @@ language: cpp
 os:
   - linux
   - osx
-osx_image: xcode7
+osx_image: xcode7.3
 
 env:
   matrix:
@@ -17,6 +17,12 @@ env:
   global:
     - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
     - coverity_branch: coverity_scan
+matrix:
+  allow_failures:
+    - os: osx
+      env: lt_branch=RC_1_0 qt=4 gui=true
+    - os: osx
+      env: lt_branch=RC_1_0 qt=4 gui=false
 
 branches:
   except:
@@ -28,16 +34,15 @@ notifications:
     on_success: change
     on_failure: change
 
-# container-based builds
+cache:
-#sudo: false
+  ccache: true
-# TODO: osx builder does not enable cache yet, see: https://github.com/travis-ci/travis-ci/issues/4011
+  directories:
-#cache:
+    - $HOME/hombebrew_cache
-  #directories:
-    #- $HOME/.ccache
 
 # opt-in Ubuntu Trusty
-sudo: required
 dist: trusty
+# container-based builds
+sudo: false
 
 addons:
   coverity_scan:
@@ -49,10 +54,12 @@ 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
       #- boost-latest
+      - sourceline: 'ppa:qbittorrent-team/qbittorrent-stable'
+      - sourceline: 'ppa:beineri/opt-qt551-trusty'
     packages:
       # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
       - autoconf
@@ -61,8 +68,13 @@ addons:
       - libssl-dev
       - 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-rasterbar-dev
-    #- libtorrent-rasterbar6
+      # Qt 5.5.1
+      - qt55base
+      - qt55tools
+      # Qt 4.8
+      - qt4-default
+      - libqt4-dev
 
 before_install:
   # only allow specific build for coverity scan, others will stop
@@ -73,25 +85,18 @@ before_install:
   #- 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":$PKG_CONFIG_PATH"
+  - qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":/opt/qt55/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 ;
-    fi
+
-  - |
+      # Qt 5
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      PATH=/opt/qt55/bin:${PATH}
-      qbtconf="$qbtconf --disable-qt-dbus" ;
     fi
 
   # print settings
@@ -101,43 +106,79 @@ before_install:
   - 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
-      # 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 install colormake libtorrent-rasterbar ;
+      brew update > /dev/null
+      brew install colormake ccache zlib
+      PATH="/usr/local/opt/ccache/libexec:$PATH"
+      brew link --force zlib
+      brew outdated "pkg-config" || brew upgrade "pkg-config"
+
+      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.10.el_capitan.bottle.tar.gz ;
+        wget https://builds.shiki.hu/homebrew/qt5.rb ;
+        wget https://builds.shiki.hu/homebrew/qt5-5.7.1_1.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.10.el_capitan.bottle.tar.gz" "$(brew --cache)" ;
+      brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb" ;
 
       # Qt
-      if [ "$qt" = 4 ]; then brew install qt ; fi ;
+      if [ "$qt" = 4 ]; then brew install qt && ln -s /usr/local/Cellar/qt/4.8.7_2/plugins /usr/local ; fi ;
-      if [ "$qt" = 5 ]; then brew install qt5 && brew link --force qt5 ; fi ;
+      if [ "$qt" = 5 ]; then
+        # Copy custom qt5 bottle to homebrew's cache so it can find and install it
+        # Also install our custom qt5 formula by passing the local path to it
+        # These 2 files are restored from Travis' cache.
+        cp "$HOME/hombebrew_cache/qt5-5.7.1_1.el_capitan.bottle.tar.gz" "$(brew --cache)" ;
+        brew install "$HOME/hombebrew_cache/qt5.rb" ;
+        brew link --force qt5 ;
+      fi
+    fi
+  - |
+    if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
+      export use_ccache=true
+      ccache -V && ccache --show-stats && ccache --zero-stats
     fi
 
 script:
   - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # skip usual build when running coverity scan
   - 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
+  - |
+    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
   - 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 cd "$TRAVIS_BUILD_DIR/src/$qbt_exe.app/Contents/MacOS" ; fi
+  - |
+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      macdeployqt "$TRAVIS_BUILD_DIR/src/$qbt_exe.app" ;
+      cd "$TRAVIS_BUILD_DIR/src/$qbt_exe.app/Contents/MacOS" ;
+    fi
   - ./$qbt_exe --version
 
 after_script:

520EC6F6.asc

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

5B7CC9A2.asc

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

CMakeLists.txt

@@ -1,15 +1,14 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.5)
-cmake_policy(VERSION 3.2)
+cmake_policy(VERSION 3.5)
 
-project(qBittorrent VERSION 3.4.0.0)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
+include(FunctionReadVersion)
 
-set(VER_MAJOR ${qBittorrent_VERSION_MAJOR})
+read_version("${CMAKE_CURRENT_SOURCE_DIR}/version.pri" VER_MAJOR VER_MINOR VER_BUGFIX VER_BUILD VER_STATUS)
-set(VER_MINOR ${qBittorrent_VERSION_MINOR})
+# message(STATUS "Project version is: ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD} (${VER_STATUS})")
-set(VER_BUGFIX ${qBittorrent_VERSION_PATCH})
+
-set(VER_BUILD ${qBittorrent_VERSION_TWEAK})
+project(qBittorrent VERSION ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD})
-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)
@@ -18,19 +17,19 @@ endif()
 
 set(PROJECT_VERSION "${PROJECT_VERSION}${VER_STATUS}")
 
-add_definitions(-DVERSION_MAJOR=${VER_MAJOR})
+add_definitions(-DQBT_VERSION_MAJOR=${VER_MAJOR})
-add_definitions(-DVERSION_MINOR=${VER_MINOR})
+add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
-add_definitions(-DVERSION_BUGFIX=${VER_BUGFIX})
+add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
-add_definitions(-DVERSION_BUILD=${VER_BUILD})
+add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
 
 # os2 {
-#     DEFINES += VERSION=\'\"v$${PROJECT_VERSION}\"\'
+#     DEFINES += DQBT_VERSION=\'\"v$${PROJECT_VERSION}\"\'
+#     DEFINES += DQBT_VERSION_2=\'\"$${PROJECT_VERSION}\"\'
 # } else {
-add_definitions(-DVERSION="v${PROJECT_VERSION}")
+add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
+add_definitions(-DQBT_VERSION_2="${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)

CODING_GUIDELINES.md

@@ -29,8 +29,10 @@ class MyOtherClass
 {
 public:
     //code
+    
 protected:
     //code
+    
 private:
     //code
 };
@@ -87,10 +89,14 @@ default:
 }
 ```
 
-#### d. single-line blocks (lambdas, initializer lists etc.) ####
+#### 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.
 ```c++
- {} // empty - space before {
+Class obj {}; // empty
- { body } // spaces around { and before }
+Class obj {expr};
+Class obj {expr1, /*...,*/ exprN};
+QVariantMap map {{"key1", 5}, {"key2", 10}};
 ```
 
 ### 2. If blocks ###
@@ -173,11 +179,11 @@ 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;
 
@@ -201,7 +207,40 @@ class MyClass
 }
 ```
 
-### 8. Misc.###
+### 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/session.h"
+#include "base/bittorrent/infohash.h"
+#include "base/utils/fs.h"
+#include "base/utils/misc.h"
+#include "base/utils/string.h"
+#include "ui_examplewidget.h"
+
+```
+
+### 9. Misc. ###
 
 * Line breaks for long lines with operation:
 
@@ -211,47 +250,18 @@ 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 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 />
+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/>
 Some valid use cases:
 ```c++
 template <typename List>
@@ -274,9 +284,17 @@ auto spinBox = static_cast<QSpinBox*>(sender());
 
 * 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.
+Before and after the assignment and other binary (and ternary) operators there should be a space.<br/>
+There should not be a space between increment/decrement and its operand.<br/>
+Some valid use cases:
 ```c++
+a += 20;
+a = (b <= MAX_B ? b : MAX_B);
+++a;
+b--;
+
 for (int a = 0; a < b; ++b) {
+    // code
 }
 ```
 
@@ -286,5 +304,5 @@ for (int a=0; a<b; ++b) {
 
 * Method definitions aren't allowed in header files
 
-### 9. Not covered above###
+### 10. 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.
@@ -11,7 +11,6 @@ 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,63 +292,3 @@ 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,3 +1,286 @@
+* 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)

README.md

@@ -29,8 +29,9 @@ 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/[520EC6F6](https://pgp.mit.edu/pks/lookup?op=get&search=0xA1ACCAE4520EC6F6) with fingerprint `F4A5FD201B117B1C2AB590E2A1ACCAE4520EC6F6`.<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/520EC6F6.asc).<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 />
 
 ### Misc:
 For more information please visit:

bootstrap.sh

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

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -14,6 +14,11 @@
 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()
@@ -62,19 +67,38 @@ endif()
 set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
 set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIR})
 
-if(NOT Boost_SYSTEM_FOUND OR NOT Boost_CHRONO_FOUND OR NOT Boost_RANDOM_FOUND)
+# Without pkg-config, we can't possibly figure out the correct boost dependencies
-    find_package(Boost REQUIRED COMPONENTS date_time system chrono random thread)
+if (LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-    set(LibtorrentRasterbar_LIBRARIES
+    set(_boost_components "${LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES}")
-        ${LibtorrentRasterbar_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+else(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-    set(LibtorrentRasterbar_INCLUDE_DIRS
+    if(PC_LIBTORRENT_RASTERBAR_FOUND)
-        ${LibtorrentRasterbar_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+        _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})
 
 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_LIBRARIES})
+    set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto)
-    set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS})
     set(LibtorrentRasterbar_OPENSSL_ENABLED ON)
 endif()
 
@@ -83,11 +107,21 @@ 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

@@ -79,3 +79,16 @@ 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,6 +3,9 @@
 # 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

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

@@ -0,0 +1,49 @@
+ ###############################################################
+ #
+ # 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,11 +5,23 @@
 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

@@ -0,0 +1,89 @@
+# 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=old-style-cast -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

@@ -0,0 +1,17 @@
+# a helper function which appends source to the main qBt target
+# the target name is read from QBT_TARGET_NAME variable
+# sources file names are relative to the the ${qbt_executable_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 (${QBT_TARGET_NAME} PRIVATE "${_sources_rel}")
+endfunction (qbt_target_sources)

cmake/Modules/winconf.cmake

@@ -1,5 +1,7 @@
 # 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)
@@ -9,18 +11,20 @@ set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
     -DBOOST_EXCEPTION_DISABLE
     -DBOOST_SYSTEM_STATIC_LINK=1
     -DTORRENT_USE_OPENSSL
-    -DUNICODE
+    -D__USE_W32_SOCKETS
+    -D_FILE_OFFSET_BITS=64)
+
+add_definitions(-DUNICODE
     -D_UNICODE
     -DWIN32
     -D_WIN32
     -DWIN32_LEAN_AND_MEAN
+    -DNTDDI_VERSION=0x05010000
     -D_WIN32_WINNT=0x0501
-    -D_WIN32_IE=0x0500
+    -D_WIN32_IE=0x0501
     -D_CRT_SECURE_NO_DEPRECATE
     -D_SCL_SECURE_NO_DEPRECATE
-    -D__USE_W32_SOCKETS
+)
-    -D_FILE_OFFSET_BITS=64)
-
 # and boost
 set(Boost_USE_STATIC_LIBS  True)
 # set(Boost_USE_STATIC_RUNTIME True)
@@ -29,16 +33,17 @@ 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")
+set(COMMON_INSTALL_PREFIX "c:/usr" CACHE PATH "Prefix used to install all the required libraries")
 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")
+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")
+set(QT5_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt5" CACHE PATH "Prefix where Qt5 is installed")
 
 # it is safe to set Qt dirs even if their files are directly in the prefix
 # Qt4
 if(NOT QT5)
+    # for qt 4 we need qmake, Qt5 provides cmake config files
     LIST(APPEND CMAKE_PROGRAM_PATH  "${QT4_INSTALL_PREFIX}/bin/")
 endif(NOT QT5)
 

conf.pri.in

@@ -6,8 +6,16 @@ DATADIR = @EXPAND_DATADIR@
 MANPREFIX = @EXPAND_MANDIR@
 
 QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
-INCLUDEPATH += @QBT_CONF_INCLUDES@
+
-LIBS += @LDFLAGS@ @LIBS@
+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
 
 CONFIG += @QBT_ADD_CONFIG@
 CONFIG -= @QBT_REMOVE_CONFIG@

configure

@@ -4257,6 +4257,17 @@ else
 $as_echo "no" >&6; }
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is macOS" >&5
+$as_echo_n "checking whether OS is macOS... " >&6; }
+if expr "$host_os" : ".*darwin.*" > /dev/null; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      enable_qt_dbus=no
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
 # Require 0.23 pkg-config
 
 
@@ -4493,53 +4504,17 @@ fi
 
 fi
 
-as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake" | $as_tr_sh`
+if test -f "$QT_QMAKE/qmake"; then :
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake" >&5
-$as_echo_n "checking for $QT_QMAKE/qmake... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$QT_QMAKE/qmake"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   QT_QMAKE="$QT_QMAKE/qmake"
 else
-  as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake-qt5" | $as_tr_sh`
+  if test -f "$QT_QMAKE/qmake-qt5"; then :
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake-qt5" >&5
-$as_echo_n "checking for $QT_QMAKE/qmake-qt5... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$QT_QMAKE/qmake-qt5"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   QT_QMAKE="$QT_QMAKE/qmake-qt5"
 else
   QT_QMAKE=""
 fi
 
-
 fi
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 qmake >= 5.2.0" >&5
 $as_echo_n "checking for Qt5 qmake >= 5.2.0... " >&6; }
 if test "x$QT_QMAKE" != "x"; then :
@@ -4610,53 +4585,17 @@ fi
 
 fi
 
-as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake" | $as_tr_sh`
+if test -f "$QT_QMAKE/qmake"; then :
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake" >&5
-$as_echo_n "checking for $QT_QMAKE/qmake... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$QT_QMAKE/qmake"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   QT_QMAKE="$QT_QMAKE/qmake"
 else
-  as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake-qt4" | $as_tr_sh`
+  if test -f "$QT_QMAKE/qmake-qt4"; then :
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake-qt4" >&5
-$as_echo_n "checking for $QT_QMAKE/qmake-qt4... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$QT_QMAKE/qmake-qt4"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   QT_QMAKE="$QT_QMAKE/qmake-qt4"
 else
   QT_QMAKE=""
 fi
 
-
 fi
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 qmake >= 4.8.0" >&5
 $as_echo_n "checking for Qt4 qmake >= 4.8.0... " >&6; }
 if test "x$QT_QMAKE" != "x"; then :
@@ -5033,8 +4972,8 @@ fi
 if test "x$BOOST_CPPFLAGS" = "x"; then :
   as_fn_error $? "Could not find Boost" "$LINENO" 5
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost CPPFLGAS: $BOOST_CPPFLAGS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost CPPFLAGS: $BOOST_CPPFLAGS" >&5
-$as_echo "$as_me: Boost CPPFLGAS: $BOOST_CPPFLAGS" >&6;}
+$as_echo "$as_me: Boost CPPFLAGS: $BOOST_CPPFLAGS" >&6;}
       CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
       LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
 fi
@@ -5083,6 +5022,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 			 CXXFLAGS_SAVE=$CXXFLAGS
+			 CXXFLAGS=
 
 			 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5090,7 +5030,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 int
 main ()
 {
-boost::system::system_category
+boost::system::error_category *a = 0;
   ;
   return 0;
 }
@@ -5521,12 +5461,12 @@ if test -n "$zlib_CFLAGS"; then
     pkg_cv_zlib_CFLAGS="$zlib_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.5.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
+  ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null`
+  pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.5.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5538,12 +5478,12 @@ if test -n "$zlib_LIBS"; then
     pkg_cv_zlib_LIBS="$zlib_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.5.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
+  ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null`
+  pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.5.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5564,14 +5504,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib" 2>&1`
+	        zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib >= 1.2.5.2" 2>&1`
         else
-	        zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib" 2>&1`
+	        zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib >= 1.2.5.2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$zlib_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (zlib) were not met:
+	as_fn_error $? "Package requirements (zlib >= 1.2.5.2) were not met:
 
 $zlib_PKG_ERRORS
 

configure.ac

@@ -67,6 +67,12 @@ 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"],
@@ -156,7 +162,7 @@ AX_BOOST_BASE([1.35])
 # 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])
+      [AC_MSG_NOTICE([Boost CPPFLAGS: $BOOST_CPPFLAGS])
       CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
       LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])
 
@@ -202,7 +208,7 @@ PKG_CHECK_MODULES(libtorrent,
                   LIBS="$libtorrent_LIBS $LIBS"])
 
 PKG_CHECK_MODULES(zlib,
-                 [zlib],
+                 [zlib >= 1.2.5.2],
                  [CPPFLAGS="$zlib_CFLAGS $CPPFLAGS"
                  LIBS="$zlib_LIBS $LIBS"])
 

dist/mac/Info.plist

@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleName</key>
-	<string>qBittorrent</string>
+	<string>@EXECUTABLE@</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>3.3.4</string>
+	<string>3.3.13</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>
-	<string>qbittorrent</string>
+	<string>@EXECUTABLE@</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-2016 The qBittorrent project</string>
+	<string>Copyright © 2006-2017 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/mac/bundle.cmake

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

dist/unix/CMakeLists.txt

@@ -20,6 +20,7 @@ install(FILES ${MAN_FILES}
         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
         COMPONENT doc)
 
+if (GUI)
     install(DIRECTORY menuicons/
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
             FILES_MATCHING PATTERN "*.png")
@@ -28,10 +29,11 @@ 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
+    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)
+endif()

dist/unix/qBittorrent.appdata.xml

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

dist/unix/qbittorrent.appdata.xml

@@ -0,0 +1,66 @@
+<?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 height="675" width="1200">
+    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_01.png
+   </image>
+    </screenshot>
+    <screenshot>
+      <image height="675" width="1200">
+    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_02.png
+   </image>
+    </screenshot>
+    <screenshot>
+      <image height="675" width="1200">
+    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_03.png
+   </image>
+    </screenshot>
+    <screenshot>
+      <image height="675" width="1200">
+    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>
+  <developer_name>The qBittorrent Project</developer_name>
+  <url type="bugtracker">http://bugs.qbittorrent.org/</url>
+  <url type="donation">https://www.qbittorrent.org/donate</url>
+  <url type="help">http://forum.qbittorrent.org/</url>
+  <url type="translate">https://github.com/qbittorrent/qBittorrent/wiki/How-to-translate-qBittorrent</url>
+</component>

dist/windows/README.txt

@@ -16,17 +16,13 @@ TRANSLATORS:
 PACKAGERS:
 
 You will need NSIS and upx to make the installer. You need a unicode version of NSIS.
-I tested with NSIS 3.0a0. 
+I tested with NSIS 3.0 (final).
 
 1. Open the options.nsi file in an editor and change line that contains
    "!define PROG_VERSION "3.0.3"" to the version of qbittorrent you just built.
 2. Extract the plugins found in the folder "nsis plugins" into your
    NSIS's unicode Plugin directory(usually C:\Program Files\NSIS\Plugins\x86-unicode).
-   Only the *.dll files are needed. Don't use the .dll from UAC.zip, use the one from "UAC Unicode.zip".
+   Only the *.dll files are needed. Use the unicode version of the dlls.
-   NOTE: To build the unicode version of UAC with MSVC2008 you need:
-    a) the sources from UAC.zip
-    b) apply the util.cpp.diff from "UAC Unicode.zip" to util.cpp
-    c) in a msvc command prompt issue: cl.exe /O1s /GS- /GR- /EHs-c- /Zl /LD /DUNICODE RunAs.cpp uac.cpp util.cpp /link kernel32.lib user32.lib shell32.lib advapi32.lib ole32.lib /DLL /MANIFEST:NO /OUT:uac.dll 
 3. The script you need to compile is "qbittorrent.nsi". It includes all other necessary scripts.
 4. The script expects the following file tree:
 
@@ -53,6 +49,7 @@ qbittorrent.exe
 qbittorrent.nsi
 qt.conf
 translations.nsi
+UAC.nsh
 uninstaller.nsi
 
 

dist/windows/UAC.nsh

@@ -228,6 +228,8 @@ pop $_LOGICLIB_TEMP
 !undef _UAC_ParseDefineFlags_orin_this
 !ifdef _UAC_ParseDefineFlags_orin_f1
 	!undef _UAC_ParseDefineFlags_orin_f1
+!endif
+!ifdef _UAC_ParseDefineFlags_orin_f2
 	!undef _UAC_ParseDefineFlags_orin_f2
 !endif
 !macroend

dist/windows/installer-translations/afrikaans.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_AFRIKAANS} "A previous installation wa
 LangString inst_unist ${LANG_AFRIKAANS} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_AFRIKAANS} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_AFRIKAANS} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/albanian.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ALBANIAN} "A previous installation was
 LangString inst_unist ${LANG_ALBANIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ALBANIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ALBANIAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/arabic.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ARABIC} "A previous installation was d
 LangString inst_unist ${LANG_ARABIC} "جاري ازالة النسخة السابقة من البرنامج"
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ARABIC} "تشغيل البرنامج"
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ARABIC} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/basque.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BASQUE} "A previous installation was d
 LangString inst_unist ${LANG_BASQUE} "Aurreko bertsioa kentzen."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_BASQUE} "Abiarazi qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_BASQUE} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/belarusian.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BELARUSIAN} "A previous installation w
 LangString inst_unist ${LANG_BELARUSIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_BELARUSIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_BELARUSIAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/bosnian.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BOSNIAN} "A previous installation was
 LangString inst_unist ${LANG_BOSNIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_BOSNIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_BOSNIAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/breton.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BRETON} "A previous installation was d
 LangString inst_unist ${LANG_BRETON} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_BRETON} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_BRETON} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/bulgarian.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BULGARIAN} "A previous installation wa
 LangString inst_unist ${LANG_BULGARIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_BULGARIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_BULGARIAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/catalan.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_CATALAN} "A previous installation was
 LangString inst_unist ${LANG_CATALAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_CATALAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_CATALAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/croatian.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_CROATIAN} "A previous installation was
 LangString inst_unist ${LANG_CROATIAN} "Deinstaliraj prethodnu verziju."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_CROATIAN} "Pokreni qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_CROATIAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/czech.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_CZECH} "A previous installation was de
 LangString inst_unist ${LANG_CZECH} "Odebírání předchozí verze."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_CZECH} "Spustit qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_CZECH} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/danish.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_DANISH} "A previous installation was d
 LangString inst_unist ${LANG_DANISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_DANISH} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_DANISH} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/dutch.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_DUTCH} "A previous installation was de
 LangString inst_unist ${LANG_DUTCH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_DUTCH} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_DUTCH} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/english.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was
 LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/esperanto.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ESPERANTO} "A previous installation wa
 LangString inst_unist ${LANG_ESPERANTO} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ESPERANTO} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ESPERANTO} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/estonian.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ESTONIAN} "A previous installation was
 LangString inst_unist ${LANG_ESTONIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ESTONIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ESTONIAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/farsi.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_FARSI} "A previous installation was de
 LangString inst_unist ${LANG_FARSI} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_FARSI} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_FARSI} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------