Bump to 4.1.3

And preselect the whole string for everything else.

.appveyor.yml

@@ -45,8 +45,7 @@ before_build:
   - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
   - SET PATH=%PATH%;c:\qbt\qt5_32\bin;%CACHE_DIR%\jom;
   # setup project
-  - COPY /Y "%CACHE_DIR%\winconf.pri" "%REPO_DIR%"
-  - COPY /Y "%CACHE_DIR%\winconf-msvc.pri" "%REPO_DIR%"
+  - COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"
   # workarounds
   - MKLINK /J "c:\qbt\base" "%CACHE_DIR%\base"
 

.github/ISSUE_TEMPLATE.md

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

.travis.yml

@@ -76,10 +76,13 @@ before_install:
 
   - 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"
+  - |
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH=/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH"
+    else
+      qbtconf="$qbtconf --prefix="$qbt_path""
+    fi
 
   # options for specific branches
   - if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; fi
@@ -131,14 +134,20 @@ install:
         cp "version" $HOME/hombebrew_cache
         cd "$HOME/hombebrew_cache"
         wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar.rb
-        wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.0.11+git20172003.8736a59adc.el_capitan.bottle.tar.gz
+        wget https://builds.shiki.hu/homebrew/5146d2df7e48f321511273fb9829ebdc3a6dc519f9ef36a344a343ae524c3ae6--libtorrent-rasterbar-1.1.9+git20180812.0bcf6cef23+patched-configure.el_capitan.bottle.tar.gz
       fi
 
-      # Copy custom libtorrent bottle to homebrew's cache so it can find and install it
+      # Copy custom libtorrent bottle to homebrew's download cache so it can find and install it
       # Also install our custom libtorrent formula by passing the local path to it
       # These 2 files are restored from Travis' cache.
-      cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.0.11+git20172003.8736a59adc.el_capitan.bottle.tar.gz" "$(brew --cache)"
+      cp "$HOME/hombebrew_cache/5146d2df7e48f321511273fb9829ebdc3a6dc519f9ef36a344a343ae524c3ae6--libtorrent-rasterbar-1.1.9+git20180812.0bcf6cef23+patched-configure.el_capitan.bottle.tar.gz" "$(brew --cache)/downloads"
       brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb"
+      
+      # NOTE about the bottle name
+      # The part before the "--" characters is a sha256 hash of the string
+      # of the URL homebrew itself would use to download the bottle.
+      # In this case the URL is the following:
+      # http://127.0.0.1/libtorrent-rasterbar-1.1.9+git20180812.0bcf6cef23+patched-configure.el_capitan.bottle.tar.gz
 
       if [ "$build_system" = "cmake" ]; then
         brew outdated cmake || brew upgrade cmake
@@ -163,16 +172,23 @@ script:
     if [ "$build_system" = "cmake" ]; then
       mkdir build
       cd build
-      cmake -DGUI=${gui} -DCMAKE_INSTALL_PREFIX="$qbt_path" "$MY_CMAKE_OPENSSL_HINT" \
+      if [ "$gui" = "false" ]; then
+        DISABLE_GUI_OPTION="-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=ON"
+      fi
+      cmake $DISABLE_GUI_OPTION -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
+        # For some reason for RC_1_1 we need to also specify the OpenSSL compiler/linker flags
+        # Homebrew doesn't symlink OpenSSL for security reasons
+        ./bootstrap.sh && ./configure $qbtconf CXXFLAGS="$(PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --cflags openssl)" LDFLAGS="$(PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --libs openssl)"
         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
+      else
+        ./bootstrap.sh && ./configure $qbtconf
       fi
       BUILD_TOOL="make"
     fi

.tx/config

@@ -12,7 +12,7 @@ mode = developer
 
 
 [qbittorrent.qbittorrentdesktop_master]
-source_file = src/icons/qBittorrent.desktop
+source_file = dist/unix/qbittorrent.desktop
 source_lang = en
 type = DESKTOP
 minimum_perc = 23

AUTHORS

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

CMakeLists.txt

@@ -1,5 +1,6 @@
-cmake_minimum_required(VERSION 3.5)
-cmake_policy(VERSION 3.5)
+cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
+
+message(WARNING "No official support for cmake build system. If it is broken, please submit patches!")
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 include(FunctionReadVersion)
@@ -22,40 +23,32 @@ add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
 add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
 add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
 
-# os2 {
-#     DEFINES += DQBT_VERSION=\'\"v$${PROJECT_VERSION}\"\'
-#     DEFINES += DQBT_VERSION_2=\'\"$${PROJECT_VERSION}\"\'
-# } else {
 add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
 add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
-# }
 
-if (UNIX AND NOT APPLE)
-    include(GNUInstallDirs)
-endif (UNIX AND NOT APPLE)
+include(GNUInstallDirs)
+include(FeatureSummary)
+
+# version requirements
+set(requiredBoostVersion 1.35)
+set(requiredQtVersion 5.5.1)
 
 if(WIN32)
     include(winconf)
 endif(WIN32)
 
-# we need options here, because they are used not only in "src" subdir, but in the "dist" dir too
-include(CMakeDependentOption)
 
-option(SYSTEM_QTSINGLEAPPLICATION
-    "Use the system qtsingleapplication library or shipped one otherwise")
-
-option(GUI "Allows to disable GUI for headless running. Disables QtDBus and the GeoIP Database" ON)
-
-option(WEBUI "Allows to disable the WebUI." ON)
-
-if (WIN32)
-    option(STACKTRACE_WIN "")
-else (WIN32)
-    cmake_dependent_option(SYSTEMD "Install the systemd service file (headless only)" OFF
-        "NOT GUI" OFF)
-    cmake_dependent_option(DBUS "Enable use of QtDBus (GUI only)" ON "GUI" OFF)
-endif(WIN32)
+# we need options here, at the top level, because they are used not only in "src" subdir, but in the "dist" dir too
+include(CompileFeature)
 
+optional_compile_definitions(COUNTRIES_RESOLUTION FEATURE DESCRIPTION "Enable resolving peers IP addresses to countries"
+    DEFAULT ON DISABLED DISABLE_COUNTRIES_RESOLUTION)
+optional_compile_definitions(STACKTRACE FEATURE DESCRIPTION "Enable stacktraces"
+    DEFAULT ON ENABLED STACKTRACE)
+optional_compile_definitions(WEBUI FEATURE DESCRIPTION "Enables built-in HTTP server for headless use"
+    DEFAULT ON DISABLED DISABLE_WEBUI)
 
 add_subdirectory(src)
 add_subdirectory(dist)
+
+feature_summary(DESCRIPTION "\nConfiguration results:" WHAT ALL)

CONTRIBUTING.md

@@ -1,35 +1,221 @@
-# Filing an issue
+# How to contribute to qBittorrent
 
-### 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.
-* Do a quick **search**. Others might already reported the issue.
-* Write in **English**!
-* Provide **version** information: (You can find version numbers at menu `Help -> About -> Libraries`)
-  ```
-  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)
+There are three main ways to contribute to the project.
+Read the respective section to find out more.
 
-### Good to know
-* **Be patient**. The dev team is small and resource limited. Devs finding their free time, analyzing the problem and fixing the issue, it all takes time. :clock3:
-* If you can code, why not become a **contributor** by fixing the issue and open a pull request? :wink:
-* Harsh words or threats won't help your situation. What's worse, your complain will (very likely) to be **ignored**. :fearful:
+### Table Of Contents
 
+*   **[Bug reporting etiquette](#bug-reporting-etiquette)**
+
+
+*   **[Submitting an issue/bug report](#submitting-an-issuebug-report)**
+    *   [What is an actual bug report?](#what-is-an-actual-bug-report)
+    *   [Before submitting a bug report](#before-submitting-a-bug-report)
+    *   [Steps to ensure a good bug report](#steps-to-ensure-a-good-bug-report)
+
+
+*   **[Suggesting enhancements/feature requests](#suggesting-enhancementsfeature-requests)**
+    *   [Before submitting an enhancement/feature request](#before-submitting-an-enhancementfeature-request)
+    *   [Steps to ensure a good enhancement/feature suggestion](#steps-to-ensure-a-good-enhancementfeature-suggestion)
+
+
+*   **[Opening a pull request](#opening-a-pull-request)**
+    *   [Must read](#must-read)
+    *   [Good to know](#good-to-know)
+
+# Bug reporting etiquette
+
+*   Issues, pull requests, and comments must always be in **English.**
+
+*   This project is supported by volunteers, do not expect "customer support"-style interaction.
+
+*   **Be patient.** The development team is small and resource limited. Developers and contributors take from their free time to analyze the problem and fix the issue. :clock3:
+
+*   Harsh words or threats won't help your situation. What's worse, your complain will (very likely) be **ignored.** :fearful:
+
+# Submitting an issue/bug report
+
+This section guides you through submitting an issue/bug report for qBittorrent.
+
+Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports.
+
+Make sure to follow these rules carefully when submitting a bug report. Failure to do so will result in the issue being closed.
+
+## What is an actual bug report?
+
+Developers and contributors are not supposed to deal with issues for which little to no investigation to find the actual cause of a purported issue was made by the reporter.
+
+Positive contributions are those which are reported with efforts to find the actual cause of an issue, or at the very least efforts were made to narrow it as much as possible.
+
+Requiring people to investigate as much as possible before opening an issue will more than likely avoid burdening the project with invalid issues or issues unrelated to qBittorrent.
+
+The following are _not_ bug reports. **Check the [wiki][wiki-url], [forum][forum-url] or other places for help and support for issues like these**:
+
+-   Explanation of qBittorrent options (see [wiki][wiki-url]).
+-   Help with WebUI setup.
+-   Help with embedded tracker setup.
+-   Help about BitTorrent in general.
+-   Issues with specific search plugins.
+-   Asking for specific builds of qBittorrent other than the current one. You can install older releases at your own risk or for regression testing purposes. Previous Windows and macOS builds are available [here][builds-url].
+    -   If you want older Linux builds, you will have to compile them yourself from the corresponding commits, or ask someone on the [forum][forum-url] to do it for you.
+-   Possibly others. Read on and use common sense.
+
+The issue tracker is for provable issues only: You will have to make the case that the issue is really with qBittorrent and not something else on your side.
+
+To make a case means to provide detailed steps so that anybody can reproduce the issue.
+Be sure to rule out that the issue is not caused by something specific on your side.
+
+Issue reports for bugs that apparently aren't easily reproducible or that you can't figure out what triggers it even though you tried are OK.
+
+Any issue opened without effort to provide the required details for developers, contributors or anybody else to reproduce the problem will be closed as invalid.
+For example:
+-   Crash reports with just a stack trace.
+-   Speculated performance issues that do not come with actual profiling data + analysis supporting the claim.
+
+## Before submitting a bug report
+
+-   **Do some basic troubleshooting (examples)**:
+    -   Restart qBittorrent.
+    -   Restart your PC.
+    -   Update your OS (e.g. Windows updates).
+    -   Update your network card drivers.
+    -   Fully reinstall qBittorrent.
+    -   etc...
+-   Make sure the problem is not caused by anti-virus or other program messing with your files.
+-   Check if you can reproduce the problem in the latest version of qBittorrent.
+-   **Check [forum][forum-url] and [wiki][wiki-url].** You might be able to find the cause of the problem and fix things yourself.
+-   **Check if the issue exists already in the issue tracker.**
+    -   If it does and the issue is still open, add a comment to the existing issue instead of opening a new one.
+    -   If you find a Closed issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
+-   If the issue is with the search functionality:
+    -   **Make sure you have [`python`][python-url] installed correctly (remember the search functionality requires a working python installation).**
+    -   Make sure it is in fact a problem with the search functionality itself, and not a problem with the plugins. If something does not work properly with the search functionality, the first step is to rule out search plugin-related issues.
+        -   For search plugin issues, report on the respective search plugin support page, or at [qbittorrent/search-plugins][search-plugins-url].
+
+## Steps to ensure a good bug report
+
+**Follow these guidelines** in order to provide as much useful information as possible right away. Not all of them are applicable to all issues, but you are expected to follow most of these steps (use common sense).
+Otherwise, we've noticed that a lot of your time (and the developers') gets thrown away on exchanging back and forth to get this information.
+
+*   Use a **clear and descriptive title** for the issue to identify the problem.
+
+*   Post only **one specific issue per submission.**
+
+*   **Fill out the issue template properly.**
+
+-   **Make sure you are using qBittorrent on a supported platform.** Do not submit issues which can only be reproduced on beta/unsupported releases of supported operating systems (e.g. Windows 10 Insider, Ubuntu 12.04 LTS, etc).
+These are unstable/unsupported platforms, and in all likelihood, whatever the issue is, it is not related to qBittorrent.
+
+*   **Specify the OS you're using, its version and architecture.**
+    *   Examples: Windows 8.1 32-bit, Linux Mint 17.1 64-bit, Windows 10 Fall creators Update 64-bit, etc.
+
+
+*   **Report only if you run into the issue with an official stable release, a beta release, or with the most recent upstream changes (in this last case specify the specific commit you are on).** (beta testing is encouraged :smile:). We do not provide support for bugs on unofficial Windows builds.
+
+*   **Specify the version of qBittorrent** you are using, as well as its **architecture** (x86 or x64) and its **libraries' versions** (Help -> About -> Libraries).
+
+*   Specify **how you installed**:
+    -   Linux: either from the PPA, your distribution's repositories, or compiled from source, or even possibly third-party repositories.
+    -   Windows: either from the installer, or compiled from source, or even possibly third-party repositories.
+    -   macOS: either from the installer, or compiled from source, or even possibly third-party repositories.
+
+
+*   **Describe the exact steps which reproduce the problem in as many details as possible.**
+    -   For example, start by explaining how you started qBittorrent, e.g. was it via the terminal? Desktop icon? Did you start it as root or normal user?
+    -   **When listing steps, don't just say what you did, but explain how you did it.**
+        -   For example, if you added a torrent for download, did you do so via a `.torrent` file or via a magnet link? If it was with a torrent file did you do so by dragging the torrent file from the file manager to the transfer list, or did you use the "Add Torrent File" in the Top Bar?
+    -   Describe the behavior you observed after following the steps and point out what exactly is the problem with that behavior; this is what we'll be looking for after executing the steps.
+
+
+*   **Explain which behavior you expected to see instead** and why.
+
+*   Use **screenshots/animated GIFs to help describe the issue** whenever appropriate [(How?)][attachments-howto-url].
+
+*   If the problem wasn't triggered by a specific action, describe what you were doing before the problem happened.
+
+*   **If you are reporting that qBittorrent crashes**, include the stack trace in the report; include it in a code block, a file attachment, or put it in a gist and provide link to that gist.
+
+*   **For performance-related issues**, include as much profiling data as you can (resource usage graphs, etc).
+
+*   Paste the **qBittorrent log** (or put the contents of the log in a gist and provide a link to the gist). The log can be viewed in the GUI (View -> Log -> tick all boxes). If you can't do that, the file is at:
+    -   Linux: `~/.local/share/data/qBittorrent/logs/qBittorrent.log`
+    -   Windows: `%LocalAppData%\qBittorrent\logs`
+    -   macOS: `~/Library/Application Support/qBittorrent/qBittorrent.log`
+
+
+*   **Do NOT post comments like "+1" or "me too!"** without providing new relevant info on the issue. Using the built-in reactions is OK though. Remember that you can use the "subscribe" button to receive notifications of that report without having to comment first.
+
+*   If there seems to be an **issue with specific torrent files/magnet links**:
+    -   Don't post private `.torrent` files/magnet links, or ones that point to copyrighted content. If you are willing, offer to email a link or the `.torrent` file itself to whoever developer is debugging it and requests it.
+    -   Make sure you can't reproduce the problem with another client, to rule out the possibility that the issue is with the `.torrent` file/magnet link itself.
+
+
+*   A screenshot, transcription or file upload of any of **qBittorrent's preferences that differ from the defaults.** Please include everything different from the defaults whether or not it seems relevant to your issue.
+
+*   **Attachment rules**:
+    -   Short logs and error messages can be pasted as quotes/code whenever small enough; otherwise make a gist with the contents and post the link to the gist.
+    -   Avoid linking/attaching impractical file formats such as PDFs/Word documents with images. If you want to post an image, just post the image.
+
+### Provide more context by answering these questions (if applicable):
+
+-   Can you **reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens (e.g. only happens with extremely large torrents/only happens after qBittorrent is open for more than 2 days/etc...)
+
+-   Did the problem start happening recently (e.g. after updating to a new version of qBittorrent) or was this always a problem?
+
+-   If the problem started happening recently, can you reproduce the problem in an older version of qBittorrent?
+
+-   Are you saving files locally (in a disk in your machine), or are you saving them remotely (e.g. network drives)?
+
+-   Are you using qBittorrent with multiple monitors? If so, can you reproduce the problem when you use a single monitor?
+
+Good read: [How to Report Bugs Effectively][howto-report-bugs-url]
+
+# Suggesting enhancements/feature requests
+
+This section guides you through submitting an enhancement suggestion for qBittorrent, including completely new features and minor improvements to existing functionality.
+
+Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions.
+
+## Before submitting an enhancement/feature request
+
+*   Check the [wiki][wiki-url] and [forum][forum-url] for tips — you might discover that the enhancement is already available.
+*   Most importantly, check if you're using the latest version of qBittorrent and if you can get the desired behavior by changing qBittorrent's settings.
+*   Check in the [releases][releases-url] page or on the [forum][forum-url], see if there's already a alpha/beta version with that enhancement.
+*   Perform a cursory search to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
+
+## Steps to ensure a good enhancement/feature suggestion
+
+-   Specify which version of qBittorrent you're using.
+-   Specify the name and version of the OS you're using.
+-   Provide a step-by-step description of the suggested enhancement in as many details as possible.
+-   Describe the current behavior and explain which behavior you expected to see instead and why.
+-   Include screenshots and animated GIFs which help you demonstrate the steps or point out the part of qBittorrent which the suggestion is related to.
+-   If this enhancement exists in other BitTorrent clients, list those clients.
 
 # Opening a pull request
 
 ### Must read
-* Read our [**coding guidelines**](https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md). There are some scripts to help you: [uncrustify script](https://raw.githubusercontent.com/qbittorrent/qBittorrent/master/uncrustify.cfg), [astyle script](https://gist.github.com/Chocobo1/539cee860d1eef0acfa6), [(related thread)](https://github.com/qbittorrent/qBittorrent/issues/2192).
-* Keep the title **short** and provide a **clear** description about what your pull request does.
-* Provide **screenshots** for UI related changes.
-* Keep your git commit history **clean** and **precise**. Commits like `xxx fixup` should not appear.
-* If your commit fix a reported issue (for example #4134), add the following message to the commit `Closes #4134.`. Example [here](https://github.com/qbittorrent/qBittorrent/commit/a74bac20c4e8de9776bf9bb77fdc7526135d1988).
+*   Read our [**coding guidelines**][coding-guidelines-url]. There are some scripts to help you: [uncrustify script][uncrustify-script-url], [astyle script][astyle-script-url], [(related thread)][coding-guidelines-thread-url].
+*   Keep the title **short** and provide a **clear** description about what your pull request does.
+*   Provide **screenshots** for UI related changes.
+*   Keep your git commit history **clean** and **precise.** Refer to the section about "Git commit messages" in the [**coding guidelines**][coding-guidelines-url].
+*   If your commit fixes a reported issue (for example #4134), add the following message to the commit `Closes #4134.`. Example [here][commit-message-fix-issue-example-url].
 
 ### Good to know
-* **Search** pull request history! Others might already implemented your idea and is waiting to be merged (or got rejected already). Save your precious time by doing a search first.
-* When resolving merge conflicts, do `git rebase <target_branch_name>`, don't do `git pull`. Then you can start fixing the conflicts. Here is a good explanation: [link](https://www.atlassian.com/git/tutorials/merging-vs-rebasing).
+*   **Search** pull request history! Others might have already implemented your idea and it is waiting to be merged (or got rejected already). Save your precious time by doing a search first.
+*   When resolving merge conflicts, do `git rebase <target_branch_name>`, don't do `git pull`. Then you can start fixing the conflicts. Here is a good explanation: [link][merging-vs-rebasing-url].
+
+[astyle-script-url]: https://gist.github.com/Chocobo1/539cee860d1eef0acfa6
+[attachments-howto-url]: https://help.github.com/articles/file-attachments-on-issues-and-pull-requests
+[coding-guidelines-url]: https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md
+[coding-guidelines-thread-url]: https://github.com/qbittorrent/qBittorrent/issues/2192
+[commit-message-fix-issue-example-url]: https://github.com/qbittorrent/qBittorrent/commit/c07cd440cd46345297debb47cb260f8688975f50
+[forum-url]: http://forum.qbittorrent.org/
+[howto-report-bugs-url]: https://www.chiark.greenend.org.uk/~sgtatham/bugs.html
+[merging-vs-rebasing-url]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing
+[python-url]: https://www.python.org/
+[releases-url]: https://github.com/qbittorrent/qBittorrent/releases
+[search-plugins-url]: https://github.com/qbittorrent/search-plugins
+[uncrustify-script-url]: https://raw.githubusercontent.com/qbittorrent/qBittorrent/master/uncrustify.cfg
+[wiki-url]: https://github.com/qbittorrent/qBittorrent/wiki
+[builds-url]: https://sourceforge.net/projects/qbittorrent/files/

INSTALL

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

README.md

@@ -35,7 +35,7 @@ You can also download it from [here](https://github.com/qbittorrent/qBittorrent/
 
 ### Misc:
 For more information please visit:
-http://www.qbittorrent.org
+https://www.qbittorrent.org
 
 or our wiki here:
 http://wiki.qbittorrent.org

README.os2

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

cmake/Modules/CompileFeature.cmake

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

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -99,6 +99,7 @@ list(FIND LibtorrentRasterbar_DEFINITIONS -DTORRENT_USE_OPENSSL LibtorrentRaster
 if(LibtorrentRasterbar_ENCRYPTION_INDEX GREATER -1)
     find_package(OpenSSL REQUIRED)
     set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto)
+    list(APPEND LibtorrentRasterbar_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
     set(LibtorrentRasterbar_OPENSSL_ENABLED ON)
 endif()
 
@@ -113,10 +114,10 @@ mark_as_advanced(LibtorrentRasterbar_INCLUDE_DIR LibtorrentRasterbar_LIBRARY
     LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES
     LibtorrentRasterbar_ENCRYPTION_INDEX)
 
-if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::LibTorrent)
-    add_library(LibtorrentRasterbar::LibTorrent UNKNOWN IMPORTED)
+if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::torrent-rasterbar)
+    add_library(LibtorrentRasterbar::torrent-rasterbar UNKNOWN IMPORTED)
 
-    set_target_properties(LibtorrentRasterbar::LibTorrent PROPERTIES
+    set_target_properties(LibtorrentRasterbar::torrent-rasterbar PROPERTIES
         IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
         IMPORTED_LOCATION "${LibtorrentRasterbar_LIBRARY}"
         INTERFACE_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"

cmake/Modules/FindQtSingleApplication.cmake

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

cmake/Modules/MacroLinkQtComponents.cmake

@@ -1,5 +1,5 @@
 # - macro similar to target_link_libraries, which links Qt components
-# names of the components are pased in Qt4/Qt5 agnostic way (Core, DBus, Xml...)
+# names of the components are passed in Qt4/Qt5 agnostic way (Core, DBus, Xml...)
 # and the macro links Qt4 ones if QT4_FOUND is set or Qt5 ones if not
 
 macro (target_link_qt_components target)

cmake/Modules/MacroQbtCompilerSettings.cmake

@@ -11,18 +11,17 @@ macro(qbt_set_compiler_options)
         #-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"
+            "-Wsign-conversion -Winvalid-pch -Wno-long-long"
+            #"-fstack-protector-all"
+            #"-Werror -Wno-error=deprecated-declarations"
         )
-        set (_GCC_COMMON_CXX_FLAGS  "-fexceptions -frtti"
-            "-Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel"
+        set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti"
+            "-Woverloaded-virtual -Wold-style-cast"
             "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align"
-            "-Werror=overloaded-virtual"
-    # 		"-Weffc++"
-            "-Werror -Wno-error=cpp"
+            #"-Weffc++"
+            #"-Werror -Wno-error=cpp"
             # we should modify code to make these ones obsolete
-            "-Wno-error=sign-conversion -Wno-error=float-equal"
+            #"-Wno-error=sign-conversion -Wno-error=float-equal"
         )
 
         if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
@@ -54,6 +53,20 @@ macro(qbt_set_compiler_options)
             endif(${GLIBC_VERSION})
         endif (CMAKE_SYSTEM_NAME MATCHES Linux)
 
+        if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+            # Clang 5.0 still doesn't support -Wstrict-null-sentinel
+            check_cxx_compiler_flag(-Wstrict-null-sentinel _STRICT_NULL_SENTINEL_IS_SUPPORTED)
+            if (_STRICT_NULL_SENTINEL_IS_SUPPORTED)
+                list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
+            endif (_STRICT_NULL_SENTINEL_IS_SUPPORTED)
+
+            # Code should be improved to render this not needed
+            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=unused-function -Wno-error=inconsistent-missing-override")
+        else ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+            # GCC supports it
+            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
+        endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+
         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}")
 

cmake/Modules/QbtTargetSources.cmake

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

cmake/Modules/winconf-mingw.cmake

@@ -1,9 +1,9 @@
-if (STACKTRACE_WIN)
+if (STACKTRACE)
     if ("${WINXXBITS}" NOT STREQUAL "Win64")
         add_compile_options(-fno-omit-frame-pointer)
     endif ("${WINXXBITS}" NOT STREQUAL "Win64")
     link_libraries(libdbghelp  -Wl,--export-all-symbols)
-endif (STACKTRACE_WIN)
+endif (STACKTRACE)
 
 if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
     link_libraries(-Wl,--dynamicbase)

cmake/Modules/winconf-msvc.cmake

@@ -1,4 +1,4 @@
-if (STACKTRACE_WIN)
+if (STACKTRACE)
     if ("${WINXXBITS}" STREQUAL "Win64")
         add_compile_options(-Zi)
     else ("${WINXXBITS}" STREQUAL "Win64")
@@ -6,7 +6,7 @@ if (STACKTRACE_WIN)
         add_compile_options(-Oy-)
     endif ("${WINXXBITS}" STREQUAL "Win64")
     link_libraries(dbghelp.lib)
-endif (STACKTRACE_WIN)
+endif (STACKTRACE)
 
 # Enable Wide characters
 add_definitions(-DTORRENT_USE_WPATH)

cmake/Modules/winconf.cmake

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

conf.pri.windows

@@ -0,0 +1,69 @@
+# 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 encountered build error with boost version <= 1.59
+#DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES
+
+# Enable if building against libtorrent 1.1.x (RC_1_1)
+# built with this flag defined
+#DEFINES += TORRENT_NO_DEPRECATE
+# Enable if linking dynamically against libtorrent
+#DEFINES += TORRENT_LINKING_SHARED
+
+# Enable stack trace support
+CONFIG += stacktrace
+
+win32-msvc* {
+    QMAKE_CXXFLAGS += "/guard:cf"
+    QMAKE_LFLAGS += "/guard:cf"
+    QMAKE_LFLAGS_RELEASE += "/OPT:REF /OPT:ICF"
+}

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v3.2.0alpha], [bugs.qbittorrent.org], [], [http://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.1.3], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
@@ -24,6 +24,12 @@ AC_ARG_ENABLE(debug,
               [],
               [enable_debug=no])
 
+AC_ARG_ENABLE(stacktrace,
+              [AS_HELP_STRING([--enable-stacktrace],
+                              [Enable stacktrace feature (default=auto)])],
+              [],
+              [enable_stacktrace=auto])
+
 AC_ARG_ENABLE(gui,
               [AS_HELP_STRING([--disable-gui],
                               [Disable the GUI for headless running. Disables QtDBus and the GeoIP Database.])],
@@ -80,6 +86,23 @@ AS_CASE(["x$enable_debug"],
         [AC_MSG_RESULT([$enable_debug])
         AC_MSG_ERROR([Unknown option "$enable_debug". Use either "yes" or "no".])])
 
+AC_MSG_CHECKING([whether to enable the stacktrace feature])
+AS_CASE(["x$enable_stacktrace"],
+        ["xno"],
+              [AC_MSG_RESULT([no])
+              QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG stacktrace"],
+        ["xyes"],
+               [AC_MSG_RESULT([yes])
+               QBT_ADD_CONFIG="$QBT_ADD_CONFIG stacktrace"],
+        ["xauto"],
+                [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <execinfo.h>]])],
+                [AC_MSG_RESULT([yes])
+                QBT_ADD_CONFIG="$QBT_ADD_CONFIG stacktrace"],
+                [AC_MSG_RESULT([no])
+                QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG stacktrace"])],
+        [AC_MSG_RESULT([$enable_stacktrace])
+        AC_MSG_ERROR([Unknown option "$enable_stacktrace". Use either "yes" or "no".])])
+
 AC_MSG_CHECKING([whether to enable the GUI])
 AS_CASE(["x$enable_gui"],
         ["xyes"],
@@ -116,6 +139,12 @@ AS_CASE(["x$enable_webui"],
         AC_MSG_ERROR([Unknown option "$enable_webui". Use either "yes" or "no".])])
 
 FIND_QT5()
+AS_IF([test "x$QT_QMAKE" = "x"],
+      [AC_MSG_ERROR([Could not find qmake])
+      ])
+AS_IF([test "x$enable_gui" = "xyes"],
+      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.5.1])
+      ])
 AC_MSG_CHECKING([whether QtDBus should be enabled])
 AS_CASE(["x$enable_qt_dbus"],
         ["xyes"],
@@ -132,22 +161,27 @@ AS_CASE(["x$enable_qt_dbus"],
         AC_MSG_ERROR([Unknown option "$enable_qt_dbus". Use either "yes" or "no".])])
 
 
-AX_BOOST_BASE([1.35])
-# HAVE_BOOST is set to an empty value when Boost is found. I don't know
-# how to test for a set vs unset variable.
-AS_IF([test "x$BOOST_CPPFLAGS" = "x"],
-      [AC_MSG_ERROR([Could not find Boost])],
-      [AC_MSG_NOTICE([Boost CPPFLAGS: $BOOST_CPPFLAGS])
-      CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
-      LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])
+AX_BOOST_BASE([1.35],
+              [AC_MSG_NOTICE([Boost CPPFLAGS: "$BOOST_CPPFLAGS"
+                Boost LDFLAGS: "$BOOST_LDFLAGS"])],
+              [AC_MSG_ERROR([Could not find Boost])])
+CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
+LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
+
+# add workaround for problematic boost version
+AC_LANG_PUSH(C++)
+# taken from ax_boost_base.m4
+m4_define([DETECT_BOOST_VERSION_PROGRAM],
+    [AC_LANG_PROGRAM([[#include <boost/version.hpp>]],
+                     [[(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($1))]));]])])
+
+AC_COMPILE_IFELSE([DETECT_BOOST_VERSION_PROGRAM(106000)], [],
+    [QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"])
+AC_LANG_POP([C++])
 
 AX_BOOST_SYSTEM()
-# HAVE_BOOST_SYSTEM is set to an empty value when Boost.System is found.
-# I don't know how to test for a set vs unset variable.
-AS_IF([test "x$BOOST_SYSTEM_LIB" = "x"],
-      [AC_MSG_ERROR([Could not find Boost.System])],
-      [AC_MSG_NOTICE([Boost.System LIB: $BOOST_SYSTEM_LIB])
-      LIBS="$BOOST_SYSTEM_LIB $LIBS"])
+AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
+LIBS="$BOOST_SYSTEM_LIB $LIBS"
 
 AC_MSG_CHECKING([which qtsingleapplication to use])
 AS_CASE(["x$with_qtsingleapplication"],
@@ -190,7 +224,7 @@ extract() {
   new_line='
 '
   # Convert " -" to "\n" if not between quotes and remove possible leading white spaces
-  string=$(echo " $*" | $SED -e "s: -:\\${new_line}:g" -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[[:space:]]*//')
+  string=$(echo " $*" | $SED -e "s: -:\\${new_line}:g" -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[[[:space:]]]*//')
   SAVEIFS=$IFS
   IFS=$(printf "\n\b")
   for i in $string; do
@@ -204,9 +238,8 @@ extract() {
   IFS=$SAVEIFS
 }
 
-extract $CPPFLAGS
+extract "$CFLAGS $CPPFLAGS $CXXFLAGS"
 QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
-QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS $CXXFLAGS"
 
 # Substitute the values of these vars in conf.pri.in
 AC_SUBST(QBT_CONF_INCLUDES)
@@ -234,4 +267,3 @@ AS_IF([test "x$ret" = "x0"],
       [AC_MSG_NOTICE([Good, your configure finished.])],
       [AC_MSG_ERROR([Failed running $QT_QMAKE to generate the makefile])])
 AS_ECHO()
-

dist/CMakeLists.txt

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

dist/mac/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
+	<string>4.1.3</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</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-2018 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/unix/CMakeLists.txt

@@ -1,35 +1,37 @@
-if (SYSTEMD)
-    find_package(Systemd)
-    if (SYSTEMD_FOUND)
+if (NOT Qt5Widgets_FOUND)
+    feature_option(SYSTEMD "Install systemd service file (headless only)" OFF)
+    if (SYSTEMD)
+        if (NOT Systemd_SERVICES_INSTALL_DIR)
+            find_package(Systemd)
+            if (NOT Systemd_FOUND)
+                message(FATAL_ERROR "Could not locate systemd services install dir."
+                " Either pass -DSystemd_SERVICES_INSTALL_DIR=/path/to/systemd/services option or install systemd pkg-config")
+            endif(NOT Systemd_FOUND)
+        endif(NOT Systemd_SERVICES_INSTALL_DIR)
         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
-            DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
+            DESTINATION ${Systemd_SERVICES_INSTALL_DIR}
             COMPONENT data)
-    endif(SYSTEMD_FOUND)
-endif(SYSTEMD)
+    endif(SYSTEMD)
+endif()
 
-
-if (GUI)
+if (Qt5Widgets_FOUND)
     list(APPEND MAN_FILES ${qBittorrent_SOURCE_DIR}/doc/qbittorrent.1)
-else (GUI)
+else (Qt5Widgets_FOUND)
     list(APPEND MAN_FILES ${qBittorrent_SOURCE_DIR}/doc/qbittorrent-nox.1)
-endif (GUI)
+endif (Qt5Widgets_FOUND)
 
 install(FILES ${MAN_FILES}
         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
         COMPONENT doc)
 
-if (GUI)
+if (Qt5Widgets_FOUND)
     install(DIRECTORY menuicons/
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
             FILES_MATCHING PATTERN "*.png")
 
-    install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.png
-            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/
-            COMPONENT data)
-
-    install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.desktop
+    install(FILES qbittorrent.desktop
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/
             COMPONENT data)
 
@@ -38,6 +40,7 @@ if (GUI)
             COMPONENT data)
 
     install(FILES
+            ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray.svg
             ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-dark.svg
             ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-light.svg
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status