Bump to 3.3.7

Adds log messages for a number of situations where sending an email will silently fail, in particular when attempting to create an unencrypted connection to an SMTP server that requires SSL

.editorconfig

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

.github/ISSUE_TEMPLATE.md

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

.gitignore

@@ -17,12 +17,10 @@ Makefile*
 
 # Generated MOC, resource and UI files
 moc_*.cpp
-moc_*.h
 qrc_*.cpp
 ui_*.h
 *.moc
 src/lang/qbittorrent_*.qm
-src/webui/www/translations/webui_*.qm
 .DS_Store
 .qmake.stash
 src/qbittorrent.app
@@ -32,6 +30,3 @@ src/qbittorrent.app
 aclocal.m4
 autom4te.cache/*
 config.status
-src/icons/qbt-theme/build-icons/node_modules/
-src/icons/skin/build-icons/node_modules/
-src/icons/skin/build-icons/icons/*.png

.travis.yml

@@ -3,27 +3,21 @@ language: cpp
 os:
   - linux
   - osx
-
-dist: xenial
+osx_image: xcode7
 
 env:
   matrix:
     # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
     #- lt_branch=dist gui=true
     #- lt_branch=dist gui=false
-    - lt_branch=RC_1_0 gui=true build_system=cmake
-    - lt_branch=RC_1_0 gui=false build_system=cmake
-    - lt_branch=RC_1_0 gui=true build_system=qmake
-    - lt_branch=RC_1_0 gui=false build_system=qmake
+    - lt_branch=RC_1_0 qt=5 gui=true
+    - lt_branch=RC_1_0 qt=5 gui=false
+    - lt_branch=RC_1_0 qt=4 gui=true
+    - lt_branch=RC_1_0 qt=4 gui=false
   global:
     - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
     - coverity_branch: coverity_scan
 
-matrix:
-  allow_failures:
-    - env: lt_branch=RC_1_0 gui=true build_system=cmake
-    - env: lt_branch=RC_1_0 gui=false build_system=cmake
-
 branches:
   except:
     - search_encoding_windows
@@ -34,10 +28,13 @@ notifications:
     on_success: change
     on_failure: change
 
-cache:
-  ccache: true
-  directories:
-    - $HOME/hombebrew_cache
+# container-based builds
+#sudo: false
+cache: ccache
+
+# opt-in Ubuntu Trusty
+sudo: required
+dist: trusty
 
 addons:
   coverity_scan:
@@ -49,115 +46,110 @@ addons:
     branch_pattern: $coverity_branch
     notification_email: sledgehammer999@qbittorrent.org
   apt:
-    sources:
-      # sources list: https://github.com/travis-ci/apt-source-safelist/blob/master/ubuntu.json
-      - sourceline: 'ppa:qbittorrent-team/qbittorrent-stable'
+    #sources:
+    # sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
+    #- ubuntu-toolchain-r-test
+    #- boost-latest
     packages:
-      # packages list: https://github.com/travis-ci/apt-package-safelist/blob/master/ubuntu-trusty
-      - [autoconf, automake, colormake]
-      - [ninja-build]
-      - libssl-dev
-      - [libboost-dev, libboost-system-dev]
-      - libtorrent-rasterbar-dev
-      - [qtbase5-dev, qttools5-dev-tools, libqt5svg5-dev]
+    # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
+    - autoconf
+    - automake
+    - colormake
+    - 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-rasterbar6
 
 before_install:
   # only allow specific build for coverity scan, others will stop
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true -a "$build_system" = "qmake" ]; then exit ; fi
+  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true ]; then exit ; fi
 
   - shopt -s expand_aliases
-  - alias make="colormake -j2" # Using nprocs/2 sometimes may fail (gcc is killed by system)
+  - 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"
-  - |
-    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" PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
-      CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedefs -Wno-inconsistent-missing-override"
-    fi
+  - qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":$PKG_CONFIG_PATH"
 
   # options for specific branches
+  - if [ "$qt" = 4 ]; then qbtconf="$qbtconf --with-qt4" ; fi
   - if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; fi
   - |
     if [ "$TRAVIS_OS_NAME" = "linux" ]; then
       # 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
+  - |
+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      qbtconf="$qbtconf --disable-qt-dbus" ;
+    fi
 
   # print settings
   - echo $lt_branch
   - echo $gui
-  - echo $build_system
   - echo $ltconf
   - echo $qbtconf
 
 install:
-  #- |
-    #if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+  - |
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      # libtorrent
+      sudo add-apt-repository --yes ppa:qbittorrent-team/qbittorrent-stable ;
+      sudo apt-get update -qq ;
+      sudo apt-get install -qq libtorrent-rasterbar-dev ;
+
       # build libtorrent from source
       #if [ "$lt_branch" != "dist" ]; then
-        #cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch
-        #cd libtorrent && ./autotool.sh && ./configure $ltconf && make install
-      #fi
-    #fi
+        #cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch ;
+        #cd libtorrent && ./autotool.sh && ./configure $ltconf && make install ;
+      #fi ;
+
+      # Qt
+      if [ "$qt" = 4 ]; then sudo apt-get -qq install qt4-default libqt4-dev ; fi ;
+      if [ "$qt" = 5 ]; then sudo apt-get -qq install qt5-default qtbase5-dev qttools5-dev-tools ; fi ;
+
+      # ccache
+      if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
+        dpkg-query -L ccache && export use_ccache=true ;
+        ccache -V && ccache --show-stats && ccache --zero-stats ;
+      fi ;
+    fi
   - |
     if [ "$TRAVIS_OS_NAME" = "osx" ]; then
       # dependencies
-      brew update > /dev/null
-      brew outdated "pkg-config" || brew upgrade "pkg-config"
-      brew install colormake ccache zlib qt openssl libtorrent-rasterbar
-      PATH="/usr/local/opt/ccache/libexec:$PATH"
-      brew link --force zlib qt
+      brew update > /dev/null ;
+      brew install colormake ccache ;
+      brew outdated "pkg-config" || brew upgrade "pkg-config" ;
+      # libtorrent-rasterbar 1.0.9
+      brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/477d5060fa093883204d70323965375353e03084/Formula/libtorrent-rasterbar.rb ;
 
-      if [ "$build_system" = "cmake" ]; then
-        brew outdated cmake || brew upgrade cmake
-        brew install ninja
+      # Qt
+      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 && ln -s /usr/local/Cellar/qt5/5.6.0/plugins /usr/local ; fi ;
 
-        sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
-        sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins
-        
-        MY_CMAKE_OPENSSL_HINT="-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/"
-      fi
-    fi
-  - |
-    if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
-      export use_ccache=true
-      ccache -M 512M
-      ccache -V && ccache --show-stats && ccache --zero-stats
+      # ccache
+      if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
+        export PATH="/usr/local/opt/ccache/libexec:$PATH" && export use_ccache=true ;
+        ccache -V && ccache --show-stats && ccache --zero-stats ;
+      fi ;
     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
   - |
-    cd "$TRAVIS_BUILD_DIR"
-    if [ "$build_system" = "cmake" ]; then
-      mkdir build
-      cd build
-      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"
+    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
-    if [ "$build_system" = "qmake" ]; then
-      ./bootstrap.sh && ./configure $qbtconf CXXFLAGS="$CXXFLAGS"
-      BUILD_TOOL="make"
-    fi
-  - $BUILD_TOOL && $BUILD_TOOL install
+  - make && make install
 
 after_success:
   - if [ "$gui" = true ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd "$qbt_path/bin" ; fi
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      if [ "$build_system" = "qmake" ]; then
-        macdeployqt "$TRAVIS_BUILD_DIR/src/$qbt_exe.app"
-        cd "$TRAVIS_BUILD_DIR/src/$qbt_exe.app/Contents/MacOS"
-      else
-        cd "$qbt_path/$qbt_exe.app/Contents/MacOS"
-      fi
-    fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cd "$TRAVIS_BUILD_DIR/src/" && macdeployqt "$qbt_exe.app" && cd "$qbt_exe.app/Contents/MacOS" ; fi
   - ./$qbt_exe --version
 
 after_script:

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[qbittorrent.qbittorrent_master]
+[qbittorrent.qbittorrent_v3_3_x]
 file_filter = src/lang/qbittorrent_<lang>.ts
 lang_map = pt: pt_PT
 source_file = src/lang/qbittorrent_en.ts
@@ -10,18 +10,10 @@ type = QT
 minimum_perc = 23
 mode = developer
 
+
 [qbittorrent.qbittorrentdesktop_master]
-source_file = dist/unix/org.qbittorrent.qBittorrent.desktop
+source_file = src/icons/qBittorrent.desktop
 source_lang = en
 type = DESKTOP
 minimum_perc = 23
 mode = developer
-
-[qbittorrent.qbittorrent_webui]
-file_filter = src/webui/www/translations/webui_<lang>.ts
-lang_map = pt: pt_PT
-source_file = src/webui/www/translations/webui_en.ts
-source_lang = en
-type = QT
-minimum_perc = 23
-mode = developer

5B7CC9A2.asc

@@ -26,67 +26,28 @@ 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
-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
-xdpwp07LYo2ilhMI8RnzmtoRmg==
-=UBeB
+EDwWxtTS0a7Rfx3DxLkCDQRXDSCMARAAqMIVJizEJp205c546IN75xeYiFszNXcs
+3768IY8bOoWj+rTwt2wIwtL/3O5K2dG79CSt2H5o6BPKmq43tOO60YW3Yk3m9BB/
+gnAVqk0QOPr5O8+yeBzdElU8CZh6y6zZMWugSkNmTDm6jZzPhgNjcjrit/dl9+0D
+GqJQcqoD8WzEWNcWrMHVz9cDewnLSVkwR758mZMaIiL7R10MZ++tNrC0j69UINqx
++9z1r1J07+NNnxqSTxVRcbjPYtM9E+tUiVFS2HPWN9ShVDkBAEdoWh90qzRaMiFl
+2NGNGOD1iHx/xr06RMeGEEXt2vhSlhfMW2YQW+UD2jzlFbARf53v39MUKKscGuIp
+BhxGw3JCq4l6qLW/bDkgnoXlOhZDmhQm6OpsjAyk9IEdd3ponSc7yYD3mUkJKR9e
+TaALD5t6TQGyNHakb4UfoXtE2RR78cbPlLIwag7eQ8GsNA+dfjowmOZdojx3ROsH
+ZdGQwb0YFLjuKAusA3TY+lCfbS6kzE2iI2DuaW+3dICcLrYuibbVb0CBNHyD+8KE
+tczdur/wm0lhqyVJkGyZKZT8C2cPxywKgy1Rn6F8Yfmj0Lna3nvtaZu0ZUS4/8Li
+t5PcOso1lSmYBuD6yq+GEAMCnUmn1Pm8eZRMlxxQuTPvyJKQrRDhbtAAr472MSno
+JKlS4SfaUF0AEQEAAYkCHwQYAQgACQUCVw0gjAIbDAAKCRBuSi0CW3zJomZDD/9I
+Jmzd5hiEzntlp84pyIJcfyIRe4KImvldAy6T02OSIbF1HzCNnwmqIPob6MOdMZ+K
+NwMK0htRkrRr/zM034+lBiWKZt+tVYHu49ioTYXEjAc5qDJE09Sq7HceQnhgE48f
+1n54XGT5G2w5gw+/a8Qn1SceE44VwXafL3E1gKaOrrsb1UH/AJhp+W4VMu+7bLXu
+7h1tN6v2PhvCYvBt3zyy8Q8xfJ2x7/D1lbF8ATJAiZ/km9x5bRm7OGRliVYaUe1n
+yR42fZOj3CBmAR0+lZLgjriqdMXrs+qlBbrmAhkn0XPQXAeaPifKoKIGDAUWIsqD
+HqM7imMGT+MR9APfSw8M4enOJWL+HnKpVBEARCEDpaFpJ3u7QRucFybpEhvIymoN
+ftyw+urId2Eg2K33NypeZo3M1K2LC65f2Ta7f/sZcIDUTbgW+m334fgVl1KptDA5
+DX3U9lTci7mi4uPuAFtbWrB1di4jYrxXYuzFm5g4xTb0Hw3kYIB6WXF+I7i0JaGO
+THxPC5X5lIAZrYrkxh+1n1Y1CY+TC8JcTzwORJIbFFm9tD/BHXa4849k4DVvFYCZ
+khq+/56FKZfoVByhB+x+2GaMlsBm1uPniO4lAakFPpIi0kaap4UVayQ/7ak+Bhsc
+AIHZUy6NtgZkuvW3xdpwp07LYo2ilhMI8RnzmtoRmg==
+=tDGM
 -----END PGP PUBLIC KEY BLOCK-----

AUTHORS

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

CMakeLists.txt

@@ -1,15 +1,15 @@
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5)
+cmake_policy(VERSION 3.5)
 
-message(AUTHOR_WARNING "If the build fails, please try the autotools/qmake method.")
+project(qBittorrent VERSION 3.4.0.0)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
-include(FunctionReadVersion)
-
-read_version("${CMAKE_CURRENT_SOURCE_DIR}/version.pri" VER_MAJOR VER_MINOR VER_BUGFIX VER_BUILD VER_STATUS)
-# message(STATUS "Project version is: ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD} (${VER_STATUS})")
-
-project(qBittorrent VERSION ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD})
+set(VER_MAJOR ${qBittorrent_VERSION_MAJOR})
+set(VER_MINOR ${qBittorrent_VERSION_MINOR})
+set(VER_BUGFIX ${qBittorrent_VERSION_PATCH})
+set(VER_BUILD ${qBittorrent_VERSION_TWEAK})
+set(VER_STATUS "alpha") # Should be empty for stable releases!
 
+# Don't touch the rest part
 set(PROJECT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}")
 
 if (NOT VER_BUILD EQUAL 0)
@@ -18,37 +18,48 @@ endif()
 
 set(PROJECT_VERSION "${PROJECT_VERSION}${VER_STATUS}")
 
-add_definitions(-DQBT_VERSION_MAJOR=${VER_MAJOR})
-add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
-add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
-add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
+add_definitions(-DVERSION_MAJOR=${VER_MAJOR})
+add_definitions(-DVERSION_MINOR=${VER_MINOR})
+add_definitions(-DVERSION_BUGFIX=${VER_BUGFIX})
+add_definitions(-DVERSION_BUILD=${VER_BUILD})
 
-add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
-add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
+# os2 {
+#     DEFINES += VERSION=\'\"v$${PROJECT_VERSION}\"\'
+# } else {
+add_definitions(-DVERSION="v${PROJECT_VERSION}")
+# }
+list(APPEND CMAKE_MODULE_PATH ${qBittorrent_SOURCE_DIR}/cmake/Modules)
 
-include(GNUInstallDirs)
-include(FeatureSummary)
-
-# version requirements
-set(requiredBoostVersion 1.35)
-set(requiredQtVersion 5.5.1)
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og")
+if (UNIX AND NOT APPLE)
+    include(GNUInstallDirs)
+endif (UNIX AND NOT APPLE)
 
 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)
 
-# 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)
+option(QT5 "Compile using Qt5" ON)
+option(SYSTEM_QTSINGLEAPPLICATION
+    "Use the system qtsingleapplication library or shipped one otherwise")
+cmake_dependent_option(SYSTEM_QJSON
+    "Use the shipped qjson library or the system one (Qt4 only)" OFF "NOT QT5" OFF)
+
+option(GUI "Allows to disable GUI for headless running. Disables QtDBus and the GeoIP Database" ON)
+
+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)
 
-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,221 +1,36 @@
-# How to contribute to qBittorrent
+# 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.
+* 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)
+
+### 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:
 
-There are three main ways to contribute to the project.
-Read the respective section to find out more.
-
-### 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**][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].
+* 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).
 
 ### Good to know
-*   **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/
+* **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).

INSTALL

@@ -1,49 +1,54 @@
-qBittorrent - A BitTorrent client in C++ / Qt
+qBittorrent - A BitTorrent client in C++ / Qt4
 ------------------------------------------
 
-1) Compile and install qBittorrent with Qt graphical interface
+1) Compile and install qBittorrent with Qt4 Graphical Interface
 
   $ ./configure
   $ make && make install
   $ qbittorrent
 
-  will install and execute qBittorrent.
+  will install and execute qBittorrent hopefully without any problems.
 
   Dependencies:
-    - Qt >= 5.5.1
+    - Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)
 
-    - pkg-config
+    - pkg-config executable
 
-    - 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
+    - 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.
 
-    - Boost >= 1.35
+    - libboost >= 1.35.x (libboost-system)
 
-    - Python >= 2.7.9 / 3.3.0 (optional, runtime only)
-        * Required by the internal search engine
+    - python >= 2.3 (needed by search engine)
+        * Run time only dependency
 
-2) Compile and install qBittorrent without Qt graphical interface
+    - 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
 
   $ ./configure --disable-gui
   $ make && make install
-  $ qbittorrent-nox
+  $ qbittorrent
 
-  will install and execute qBittorrent.
+  will install and execute qBittorrent hopefully without any problems.
 
   Dependencies:
-    - Qt >= 5.5.1
+    - Qt >= 4.4.0 (libqt-devel, libqtcore, libqtnetwork)
 
-    - pkg-config
+    - pkg-config executable
 
-    - 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
+    - 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
 
-    - Boost >= 1.35
 
 DOCUMENTATION:
-Please note that there is a "Compilation" section at http://wiki.qbittorrent.org.
+Please note that there is a documentation with a "compiling howto" at http://wiki.qbittorrent.org.
 
 ------------------------------------------
-sledgehammer999 <sledgehammer999@qbittorrent.org>
+Christophe Dumez <chris@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:
-https://www.qbittorrent.org
+http://www.qbittorrent.org
 
 or our wiki here:
 http://wiki.qbittorrent.org

README.os2

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

appveyor.yml

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

cmake/Modules/CompileFeature.cmake

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

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

cmake/Modules/FindQtSingleApplication.cmake

@@ -1,79 +1,94 @@
 # - 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 (Qt5Widgets_FOUND)
-    set(_includeFileName qtsingleapplication.h)
-else()
-    set(_includeFileName qtsinglecoreapplication.h)
-endif()
+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
+    )
 
-FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
-    FIND_PATH(QtSingleApplication_INCLUDE_DIR ${_includeFileName} ${TOP_INCLUDE_PATH}/QtSolutions)
+    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)
 
-    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_CORELIBRARY Qt5::Core LOCATION)
-GET_FILENAME_COMPONENT(_QT5_CORELIBRARYPATH ${_QT5_CORELIBRARY} 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_WIDGETSLIBRARY Qt5::Widgets LOCATION)
+    GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
 
-FIND_LIBRARY(QtSingleApplication_LIBRARY
-    NAMES ${QtSingleApplication_NAMES}
-    PATHS ${_QT5_CORELIBRARYPATH}
-)
+    FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
+        NAMES ${QTSINGLEAPPLICATION_NAMES}
+        PATHS ${QT5_WIDGETSLIBRARYPATH}
+    )
+ENDIF()
 
-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)
-    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_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_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)
+MARK_AS_ADVANCED(QTSINGLEAPPLICATION_INCLUDE_DIR QTSINGLEAPPLICATION_LIBRARY)
+
+if(NOT TARGET QtSingleApplication::QtSingleApplication)
+    add_library(QtSingleApplication::QtSingleApplication UNKNOWN IMPORTED)
+    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}"
+        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}"
+    )
+    if(EXISTS "${QTSINGLEAPPLICATION_LIBRARY}")
+    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${QTSINGLEAPPLICATION_LIBRARY}")
+    endif()
+endif(NOT TARGET QtSingleApplication::QtSingleApplication)

cmake/Modules/FindSystemd.cmake

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

cmake/Modules/FunctionReadVersion.cmake

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

cmake/Modules/MacroGlibcDetect.cmake

@@ -1,49 +0,0 @@
- ###############################################################
- #
- # Copyright 2011 Red Hat, Inc.
- #
- # Licensed under the Apache License, Version 2.0 (the "License"); you
- # may not use this file except in compliance with the License.  You may
- # obtain a copy of the License at
- #
- #    http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
- #
- ###############################################################
-
-MACRO (GLIBC_DETECT _VERSION)
-
-# there are multiple ways to detect glibc, but given nmi's
-# cons'd up paths I will trust only gcc.  I guess I could also use
-# ldd --version to detect.
-
-    set(_GLIB_SOURCE_DETECT "
-#include <limits.h>
-#include <stdio.h>
-int main()
-{
-  printf(\"%d%d\",__GLIBC__, __GLIBC_MINOR__);
-  return 0;
-}
-")
-
-file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/build/cmake/glibc.cpp "${_GLIB_SOURCE_DETECT}\n")
-
-try_run(POST26_GLIBC_DETECTED
-        POST26_GLIBC_COMPILE
-        ${CMAKE_CURRENT_BINARY_DIR}/build/cmake
-        ${CMAKE_CURRENT_BINARY_DIR}/build/cmake/glibc.cpp
-        RUN_OUTPUT_VARIABLE GLIBC_VERSION )
-
-if (GLIBC_VERSION AND POST26_GLIBC_COMPILE )
-    set(${_VERSION} ${GLIBC_VERSION})
-else()
-    message(STATUS "NOTE: Could not detect GLIBC_VERSION from compiler")
-endif()
-
-ENDMACRO (GLIBC_DETECT)

cmake/Modules/MacroLinkQtComponents.cmake

@@ -1,27 +1,15 @@
 # - macro similar to target_link_libraries, which links Qt components
-# names of the components are passed in Qt4/Qt5 agnostic way (Core, DBus, Xml...)
+# names of the components are pased 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)
 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()
+        list(APPEND _QT_CMPNTS "Qt4::Qt${_cmp}")
     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()
+        list(APPEND _QT_CMPNTS "Qt5::${_cmp}")
     endforeach()
 endif (QT4_FOUND)
     target_link_libraries(${target} ${_QT_CMPNTS})

cmake/Modules/MacroQbtCompilerSettings.cmake

@@ -1,102 +0,0 @@
-# Sets cache variable QBT_ADDITONAL_FLAGS and QBT_ADDITONAL_CXX_FLAGS to list of additional
-# compiler flags for C and C++ (QBT_ADDITONAL_FLAGS) and for C++ only (QBT_ADDITONAL_CXX_FLAGS)
-# and appends them to CMAKE_XXX_FLAGS variables.
-
-# It could use add_compile_options(), but then it is needed to use generator expressions,
-# and most interesting of them are not compatible with Visual Studio :(
-
-macro(qbt_set_compiler_options)
-# if (NOT QBT_ADDITONAL_FLAGS)
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        #-Wshadow -Wconversion ?
-        set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra"
-            "-Wfloat-equal -Wcast-qual -Wcast-align"
-            "-Wsign-conversion -Winvalid-pch -Wno-long-long"
-            #"-fstack-protector-all"
-            #"-Werror -Wno-error=deprecated-declarations"
-        )
-        set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti"
-            "-Woverloaded-virtual -Wold-style-cast"
-            "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align"
-            #"-Weffc++"
-            #"-Werror -Wno-error=cpp"
-            # we should modify code to make these ones obsolete
-            #"-Wno-error=sign-conversion -Wno-error=float-equal"
-        )
-
-        if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
-            # GCC 4.8 has problems with std::array and its initialization
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=missing-field-initializers")
-        endif()
-
-        include(CheckCXXCompilerFlag)
-        # check for -pedantic
-        check_cxx_compiler_flag(-pedantic _PEDANTIC_IS_SUPPORTED)
-        if (_PEDANTIC_IS_SUPPORTED)
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-pedantic -pedantic-errors")
-        else (_PEDANTIC_IS_SUPPORTED)
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wpedantic")
-        endif (_PEDANTIC_IS_SUPPORTED)
-
-        if (CMAKE_SYSTEM_NAME MATCHES Linux)
-            # if Glibc version is 2.20 or higher, set -D_DEFAULT_SOURCE
-            include(MacroGlibcDetect)
-            message(STATUS "Detecting Glibc version...")
-            glibc_detect(GLIBC_VERSION)
-            if(${GLIBC_VERSION})
-                if(GLIBC_VERSION LESS "220")
-                    message(STATUS "Glibc version is ${GLIBC_VERSION}")
-                else(GLIBC_VERSION LESS "220")
-                    message(STATUS "Glibc version is ${GLIBC_VERSION}, adding -D_DEFAULT_SOURCE")
-                    add_definitions(-D_DEFAULT_SOURCE)
-                endif(GLIBC_VERSION LESS "220")
-            endif(${GLIBC_VERSION})
-        endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-
-        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}")
-
-        string(APPEND CMAKE_C_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING}")
-        string(APPEND CMAKE_CXX_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING} ${_GCC_COMMON_CXX_FLAGS_STRING}")
-
-        set(QBT_ADDITONAL_FLAGS "${_GCC_COMMON_C_AND_CXX_FLAGS_STRING}" CACHE STRING
-            "Additional qBittorent compile flags" FORCE)
-        set(QBT_ADDITONAL_CXX_FLAGS "${_GCC_COMMON_CXX_FLAGS_STRING}" CACHE STRING
-            "Additional qBittorent C++ compile flags" FORCE)
-
-        # check whether we can enable -Og optimization for debug build
-        # also let's enable -march=native for debug builds
-        check_cxx_compiler_flag(-Og _DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-
-        if (_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-            string(APPEND CMAKE_C_FLAGS_DEBUG " -Og -g3 -march=native -pipe" )
-            string(APPEND CMAKE_CXX_FLAGS_DEBUG " -Og -g3 -march=native -pipe" )
-        else(_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-            string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g3 -march=native -pipe" )
-            string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g3 -march=native -pipe" )
-        endif (_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED)
-    endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-
-    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-        set(QBT_ADDITONAL_FLAGS "-wd4290 -wd4275 -wd4251 /W4" CACHE STRING "Additional qBittorent compile flags")
-        string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITONAL_FLAGS}")
-        string(APPEND CMAKE_CXX_FLAGS " ${QBT_ADDITONAL_FLAGS}")
-    endif ()
-
-# endif (NOT QBT_ADDITONAL_FLAGS)
-endmacro(qbt_set_compiler_options)
-

cmake/Modules/QbtTargetSources.cmake

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

cmake/Modules/QbtTranslations.cmake

@@ -1,48 +0,0 @@
-# macros to handle translation files
-
-# qbt_add_translations(<target> QRC_FILE <filename> TS_FILES <filenames>)
-# handles out of source builds for Qt resource files that include translations
-# The function generates translations out of the supplied list of .ts files in the build directory,
-# copies the .qrc file there, calls qt5_add_resources() adds its output to the target sources list.
-function(qbt_add_translations _target)
-    set(oneValueArgs QRC_FILE)
-    set(multiValueArgs TS_FILES)
-    cmake_parse_arguments(QBT_TR "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    get_target_property(_binaryDir ${_target} BINARY_DIR)
-
-    if (NOT QBT_TR_QRC_FILE)
-        message(FATAL_ERROR "QRC file is empty")
-    endif()
-    if (NOT QBT_TR_TS_FILES)
-        message(FATAL_ERROR "TS_FILES files are empty")
-    endif()
-
-    if(IS_ABSOLUTE "${QBT_TR_QRC_FILE}")
-        file(RELATIVE_PATH _qrcToTs "${CMAKE_CURRENT_SOURCE_DIR}" "${QBT_TR_QRC_FILE}")
-    else()
-        set(_qrcToTs "${QBT_TR_QRC_FILE}")
-    endif()
-
-    get_filename_component(_qrcToTsDir "${_qrcToTs}" DIRECTORY)
-
-    get_filename_component(_qmFilesBinaryDir "${CMAKE_CURRENT_BINARY_DIR}/${_qrcToTsDir}" ABSOLUTE)
-    # to make qt5_add_translation() work as we need
-    set_source_files_properties(${QBT_TR_TS_FILES} PROPERTIES OUTPUT_LOCATION "${_qmFilesBinaryDir}")
-    qt5_add_translation(_qmFiles ${QBT_TR_TS_FILES})
-
-    set(_qrc_dest_dir "${_binaryDir}/${_qrcToTsDir}")
-    set(_qrc_dest_file "${_binaryDir}/${QBT_TR_QRC_FILE}")
-
-    message(STATUS "copying ${QBT_TR_QRC_FILE} to ${_qrc_dest_dir}")
-    file(COPY ${QBT_TR_QRC_FILE} DESTINATION ${_qrc_dest_dir})
-
-    set_source_files_properties("${_qrc_dest_file}" PROPERTIES
-        GENERATED True
-        OBJECT_DEPENDS "${_qmFiles}")
-
-    # With AUTORCC enabled rcc is ran by cmake before language files are generated,
-    # and thus we call rcc explicitly
-    qt5_add_resources(_resources "${_qrc_dest_file}")
-    target_sources(${_target} PRIVATE "${_resources}")
-endfunction()

cmake/Modules/bundle.cmake

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

cmake/Modules/winconf-mingw.cmake

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

cmake/Modules/winconf.cmake

@@ -1,31 +1,26 @@
 # 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)
-set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
+set(LibtorrentRasterbar_CUSTOM_DEFINITIONS 
     -DBOOST_ALL_NO_LIB -DBOOST_ASIO_HASH_MAP_BUCKETS=1021
     -DBOOST_ASIO_SEPARATE_COMPILATION
     -DBOOST_EXCEPTION_DISABLE
     -DBOOST_SYSTEM_STATIC_LINK=1
     -DTORRENT_USE_OPENSSL
-    -D__USE_W32_SOCKETS
-    -D_FILE_OFFSET_BITS=64)
-
-add_definitions(-DUNICODE
+    -DUNICODE
     -D_UNICODE
     -DWIN32
     -D_WIN32
     -DWIN32_LEAN_AND_MEAN
-    -DNTDDI_VERSION=0x05010000
     -D_WIN32_WINNT=0x0501
-    -D_WIN32_IE=0x0501
+    -D_WIN32_IE=0x0500
     -D_CRT_SECURE_NO_DEPRECATE
     -D_SCL_SECURE_NO_DEPRECATE
-    -DNOMINMAX
-)
+    -D__USE_W32_SOCKETS
+    -D_FILE_OFFSET_BITS=64)
+
 # and boost
 set(Boost_USE_STATIC_LIBS  True)
 # set(Boost_USE_STATIC_RUNTIME True)
@@ -34,17 +29,16 @@ set(Boost_USE_STATIC_LIBS  True)
 # with usual unix subdirectories (bin, lib, include)
 # if so, we just need to set CMAKE_SYSTEM_PREFIX_PATH
 # If it is not the case, individual paths need to be specified manually (see below)
-set(COMMON_INSTALL_PREFIX "c:/usr" CACHE PATH "Prefix used to install all the required libraries")
+set(COMMON_INSTALL_PREFIX "c:/usr")
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH "${COMMON_INSTALL_PREFIX}")
 
 # If two version of Qt are installed, separate prefixes are needed most likely
-set(QT4_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt4" CACHE PATH "Prefix where Qt4 is installed")
-set(QT5_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt5" CACHE PATH "Prefix where Qt5 is installed")
+set(QT4_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt4")
+set(QT5_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt5")
 
 # it is safe to set Qt dirs even if their files are directly in the prefix
 # Qt4
 if(NOT QT5)
-    # for qt 4 we need qmake, Qt5 provides cmake config files
     LIST(APPEND CMAKE_PROGRAM_PATH  "${QT4_INSTALL_PREFIX}/bin/")
 endif(NOT QT5)
 

conf.pri.in

@@ -5,14 +5,10 @@ BINDIR = @EXPAND_BINDIR@
 DATADIR = @EXPAND_DATADIR@
 MANPREFIX = @EXPAND_MANDIR@
 
-QMAKE_CC = @QBT_CC@
-QMAKE_CXX = @QBT_CXX@
 QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
 
 EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@
 EXTERNAL_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS
-# added /usr/local/include due to Qt 5.7.0 bug on macOS
-macx: EXTERNAL_INCLUDES += "/usr/local/include"
 INCLUDEPATH += $$EXTERNAL_INCLUDES
 
 EXTERNAL_LIBS = @LDFLAGS@ @LIBS@

conf.pri.windows

@@ -1,69 +0,0 @@
-# Adapt these paths
-# Point these to the include folders
-INCLUDEPATH += $$quote(C:/qBittorrent/boost)
-INCLUDEPATH += $$quote(C:/qBittorrent/libtorrent/include)
-INCLUDEPATH += $$quote(C:/qBittorrent/zlib/include)
-INCLUDEPATH += $$quote(C:/qBittorrent/openssl/include)
-# Point these to the lib folders
-LIBS += $$quote(-LC:/qBittorrent/boost/stage/lib)
-LIBS += $$quote(-LC:/qBittorrent/libtorrent/lib)
-LIBS += $$quote(-LC:/qBittorrent/zlib/lib)
-LIBS += $$quote(-LC:/qBittorrent/openssl/lib)
-
-# Adapt the lib names/versions accordingly
-# If you want to use Boost auto-linking then disable
-# BOOST_ALL_NO_LIB below and omit Boost libraries here
-CONFIG(debug, debug|release) {
-    LIBS += libtorrentd.lib \
-            libboost_system-vc140-mt-sgd-1_64.lib
-}
-else {
-    LIBS += libtorrent.lib \
-            libboost_system-vc140-mt-s-1_64.lib
-}
-LIBS += libeay32.lib ssleay32.lib
-LIBS += zlib.lib
-# ...or if you use MinGW
-#CONFIG(debug, debug|release) {
-#    LIBS += libtorrent-rasterbar \
-#            libboost_system-mt
-#}
-#else {
-#    LIBS += libtorrent-rasterbar \
-#            libboost_system-mt
-#}
-#LIBS += libcrypto libssl
-#LIBS += libz
-
-DEFINES += NTDDI_VERSION=0x05010000
-DEFINES += _WIN32_WINNT=0x0501
-DEFINES += _WIN32_IE=0x0501
-
-# Disable to use Boost auto-linking
-DEFINES += BOOST_ALL_NO_LIB
-# Use one of the following options
-DEFINES += BOOST_SYSTEM_STATIC_LINK
-#DEFINES += BOOST_SYSTEM_DYN_LINK
-# Boost 1.60+ defaults to Vista+ support. The define below enables XP support again.
-DEFINES += BOOST_USE_WINAPI_VERSION=0x0501
-# Enable if building against libtorrent 1.0.x (RC_1_0) (static linking)
-#DEFINES += BOOST_ASIO_SEPARATE_COMPILATION
-# Enable if building against libtorrent 1.0.x (RC_1_0) (dynamic linking)
-#DEFINES += BOOST_ASIO_DYN_LINK
-# Enable if 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"
-}