Bump to 3.1.2

This reverts commit c74334669b.

.gitattributes

@@ -1,7 +0,0 @@
-core.eol=lf
-* text eol=lf
-*.zip binary
-*.png binary
-*.ico binary
-*.qm binary
-*.icns binary

.gitignore

@@ -1,32 +1,15 @@
-src/gui/geoip/GeoIP.dat
-src/gui/geoip/GeoIP.dat.gz
+src/geoip/GeoIP.dat
 src/qbittorrent
-src/qbittorrent-nox
-src/release
-src/debug
 qbittorrent.pro.user*
 conf.pri
-Makefile*
+Makefile
 *.pyc
 *.log
-
 # Compiled object files
 *.o
-*.pdb
-*.exe
-
 # Generated MOC, resource and UI files
 moc_*.cpp
 qrc_*.cpp
 ui_*.h
 *.moc
 src/lang/qbittorrent_*.qm
-.DS_Store
-.qmake.stash
-src/qbittorrent.app
-*.dmg
-
-#Autotools junk
-aclocal.m4
-autom4te.cache/*
-config.status

.travis.yml

@@ -1,17 +1,13 @@
-language: cpp
+language:
+  - cpp
 
 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_0_16 gui=true
-    - lt_branch=RC_0_16 gui=false
-    - lt_branch=RC_1_0  gui=true
-    - lt_branch=RC_1_0  gui=false
-  global:
-    - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
-    - coverity_branch: coverity_scan
+  # use libtorrent 0.15.10
+  - lt_source=from_dist gui=true
+  - lt_source=from_dist gui=false
+  # use libtorrent 0.16.X from RC_0_16 svn branch
+  - lt_source=from_svn gui=true
+  - lt_source=from_svn gui=false
 
 branches:
   except:
@@ -21,76 +17,37 @@ branches:
 notifications:
   email:
     on_success: change
-    on_failure: change
-
-# container-based builds
-sudo: false
-cache:
-  directories:
-    - $HOME/.ccache
-
-addons:
-  coverity_scan:
-    project:
-      name: "qbittorrent/qBittorrent"
-      description: "Build submitted via Travis CI"
-    build_command_prepend: "./bootstrap.sh && ./configure $qbtconf"
-    build_command: make
-    branch_pattern: $coverity_branch
-    notification_email: sledgehammer999@qbittorrent.org
-  apt:
-    packages:
-    # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
-    - autoconf
-    - automake
-    - colormake
-    - libssl-dev
-    - libboost-dev
-    - libboost-system-dev
-    - libgeoip-dev
-    - libqt4-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
-    #- libboost-filesystem-dev
+    on_failure: change 
 
 before_install:
-  # Only allow specific build for coverity scan, others will stop
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [[ "$lt_branch" == "RC_1_0" && "$gui" == "true" ]]; then exit ; fi
-
   - shopt -s expand_aliases
-  - if ! [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then dpkg-query -L ccache && export PATH="/usr/lib/ccache/:$PATH" ; fi
-  - alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system)
+  - alias sudo="sudo "
+  # Using nprocs/2 sometimes may fail (gcc is killed by system), just use two threads
+  - alias make="colormake -j2 "
 
-  - libt_path="$HOME/libt_install"
-  - qbt_path="$HOME/qbt_install"
-  - ltconf="$ltconf --prefix="$libt_path" --with-libgeoip=system"
-  - qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":$PKG_CONFIG_PATH"
-
-  # Options for specific branches
-  - if [[ "$lt_branch" == "RC_0_16" ]]; then qbtconf="$qbtconf --with-libtorrent-rasterbar0.16" ; fi
   # Also setup a virtual display for after_success target when gui == true
-  - if ! $gui; then qbtconf="$qbtconf --disable-gui" ; else 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
+  - if ! $gui; then qbtconf="$qbtconf --disable-gui"; else 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
+  - ltconf=" --with-libgeoip=system"
 
-  # Print settings
-  - echo $lt_branch
-  - echo $gui
+  - echo settings
+  - echo $lt_source
   - echo $ltconf
+  - echo $gui
   - echo $qbtconf
-  - ccache -V && ccache --show-stats && ccache --zero-stats
+
+  - sudo apt-get -qq update
+  # Travis can stall during heavy load if these packages are installed in one step - split the command
+  - sudo apt-get -qq install debhelper qconf colormake libssl-dev libgeoip-dev
+  - sudo apt-get -qq install libboost-dev libboost-filesystem-dev libboost-system-dev
+  - sudo apt-get -qq install libqt4-dev 
 
 install:
-  - if ! [ "$lt_branch" == "dist" ]; then cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch --single-branch ; fi
-  - if ! [ "$lt_branch" == "dist" ]; then cd libtorrent && ./autotool.sh && ./configure $ltconf && make install && cd "$TRAVIS_BUILD_DIR" ; fi
+  - if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
+  - if [[ "$lt_source" == "from_svn" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
 
 script:
-  - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # Skip usual build when running coverity scan
-  - ./bootstrap.sh && ./configure $qbtconf
-  - make install
-
+  - qt-qconf
+  - ./configure $qbtconf && sudo make install
+  
 after_success:
-  - cd "$qbt_path/bin"
-  - export LD_PRELOAD="$libt_path/lib/libtorrent-rasterbar.so:$LD_PRELOAD"
-  - if $gui ; then ./qbittorrent --version ; else ./qbittorrent-nox --version ; fi
-
-after_script:
-  - ccache --show-stats
+  - if $gui ; then qbittorrent --version ; else qbittorrent-nox --version ; fi

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[qbittorrent.qbittorrent_v3_2_x]
+[qbittorrent.qbittorrent_v3_1_x]
 file_filter = src/lang/qbittorrent_<lang>.ts
 source_file = src/lang/qbittorrent_en.ts
 source_lang = en
@@ -11,7 +11,7 @@ mode = developer
 
 
 [qbittorrent.qbittorrentdesktop_master]
-source_file = src/icons/qBittorrent.desktop
+source_file = src/Icons/qBittorrent.desktop
 source_lang = en
 type = DESKTOP
 minimum_perc = 23

AUTHORS

@@ -17,7 +17,7 @@ Contributors:
 * Nick Tiskov <daymansmail@gmail.com>
 
 Code from other projects:
-* files src/qtsingleapplication/* src/lineedit/*
+* files src/qtsingleapp/* src/lineedit/*
   copyright: Nokia Corporation
   license: LGPL
 
@@ -34,7 +34,7 @@ Code from other projects:
   license: GPLv2/3
 
 Images Authors:
-* files: src/icons/*.png
+* files: src/Icons/*.png
   copyright: Gnome Icon Theme
   license: GPLv2
   url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
@@ -44,21 +44,21 @@ Images Authors:
   license: LGPL
   url: http://www.oxygen-icons.org
 
-* files: src/icons/flags/*.png
+* 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/Icons/skin/*.png
   files: src/menuicons/YYxYY/*.png
   copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
   license: GPLv2
 
-* file: src/icons/skin/tabs.gif
+* file: src/Icons/skin/tabs.gif
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
-* file: src/icons/skin/qbittorrent_mono*
+* file: src/Icons/skin/qbittorrent_mono*
   copyright: Daniel Eguren <deguren@gmail.com>
   license: LGPL
 
@@ -77,12 +77,9 @@ Images Authors:
 * file: src/search_engine/engines/torrentreactor.png
   copyright: Downloaded from torrentreactor.net
 
-* file: src/icons/oxygen/checked.png
-  copyright: Victor Buinsky <allok.victor@gmail.com>
-
 Translations authors:
 * files: src/lang/*.ts
-* file: src/icons/qBittorrent.desktop
+* file: src/Icons/qBittorrent.desktop
   copyright:
   - Arabic: SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and  Ibrahim Saed ibraheem_alex(Transifex)
   - Armenian: Hrant Ohanyan (hrantohanyan@mail.am)

CODING_GUIDELINES.md

@@ -1,177 +0,0 @@
-All new code must follow the following coding guidelines.  
-If you make changes in a file that still uses another coding style, make sure that you follow these guidelines for your changes instead.  
-**Note:** I will now take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style.
-
-### 1. Curly braces ###
-#### a. Function blocks, class/struct definitions, namespaces ####
-```c++
-int myFunction(int a)
-{
-    //code
-}
-
-myClass::myClass(int *parent)
-    : m_parent(parent)
-{
-    //initialiaze
-}
-
-int myClass::myMethod(int a)
-{
-    //code
-}
-
-class myOtherClass
-{
-public:
-    //code
-protected:
-    //code
-private:
-    //code
-};
-
-namespace id
-{
-    //code
-}
-```
-
-#### b. Other code blocks ####
-```c++
-if (condition) {
-    //code
-}
-
-for (int a = 0; a < b; ++b) {
-    //code
-}
-
-switch (a) {
-case 1:
-    //blah
-case 2:
-    //blah
-default:
-    //blah
-}
-```
-
-#### c. Blocks in switch's case labels ####
-```c++
-switch (var) {
-case 1: {
-        //declare local variables
-        //code
-    }
-    break;
-case 2: {
-        //declare local variables
-        //code
-    }
-    break;
-default:
-    //code
-}
-```
-
-### 2. If blocks ###
-#### a. Multiple tests ####
-```c++
-if (condition) {
-    //code
-}
-else if (condition) {
-    //code
-}
-else {
-    //code
-}
-```
-The `else if`/`else` must be on their own lines.
-
-#### b. Single statement if blocks ####
-**Most** single statement if blocks should look like this:
-```c++
-if (condition)
-    a = a + b;
-```
-
-One acceptable exception to this **can be** `return`, `break` or `continue` statements, provided that the test condition isn't very long. However you can choose to use the first rule instead.
-```c++
-a = myFunction();
-b = a * 1500;
-
-if (b > 0) return;
-c = 100 / b;
-```
-
-#### c. Using curly braces for single statement if blocks ####
-
-However, there are cases where curly braces for single statement if blocks **should** be used.
-* If some branch needs braces then all others should use them. Unless you have multiple `else if` in a row and the one needing the braces is only for a very small sub-block of code.
-* Another exception would be when we have nested if blocks or generally multiple levels of code that affect code readability.
-
-Generally it will depend on the particular piece of code and would be determined on how readable that piece of code is. **If in doubt** always use braces if one of the above exceptions applies.
-
-### 3. Indentation###
-4 spaces.
-
-### 4. File encoding and line endings.###
-
-UTF-8 and Unix-like line ending (LF). Unless some platform speficic files need other encodings/line endings.
-
-### 5. Initialization lists.###
-Initialization lists should be vertical. This will allow for more easily readable diffs. The inilization colon should be indented and in its own line along with first argument. The rest of the arguments should be indented too and have the comma prepended.
-```c++
-myClass::myClass(int a, int b, int c, int d)
-    : priv_a(a)
-    , priv_b(b)
-    , priv_c(c)
-    , priv_d(d)
-{
-    //code
-}
-```
-
-### 6. Enums.###
-Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
-```c++
-enum days
-{
-    Monday,
-    Tuesday,
-    Wednesday,
-    Thursday,
-    Friday,
-    Saturday,
-    Sunday
-};
-```
-
-### 7. Misc.###
-
-* Line breaks for long lines with operation:
-
-```c++
-a += "b"
-  + "c"
-  + "d";
-```
-
-* Space around operations eg `a = b + c` or `a=b+c`:
-
-Before and after the assignment there should be a space. One exception could be: for loops.
-```c++
-for (int a=0; a<b; ++b) {
-}
-```
-
-* private/public/protected must not be indented
-
-* Preprocessor commands must go at line start
-
-* Method definitions aren't allowed in header files
-
-###8. Not covered above###
-If something isn't covered above, just follow the same style the file you are editing has. If that particular detail isn't present in the file you are editing, then use whatever the rest of the project uses.

INSTALL

@@ -14,7 +14,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.16.19 OR >= 1.0.6)
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.15.0)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 
@@ -44,7 +44,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.16.19 OR >= v1.0.6)
+    - libtorrent-rasterbar by Arvid Norberg (>= v0.15.0)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 

README

@@ -1,12 +1,10 @@
-qBittorrent - A BitTorrent client in Qt
+qBittorrent - A BitTorrent client in Qt4
 ------------------------------------------
 
-[![Build Status](https://travis-ci.org/qbittorrent/qBittorrent.svg?branch=v3_2_x)](https://travis-ci.org/qbittorrent/qBittorrent)
-[![Coverity Status](https://scan.coverity.com/projects/5494/badge.svg)](https://scan.coverity.com/projects/5494)
+Description:
 ********************************
-### Description:
-qBittorrent is a bittorrent client programmed in C++ / Qt that uses
-libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
+qBittorrent is a bittorrent client programmed in C++ / Qt4 that uses
+libtorrent (sometimes called rblibtorrent) by Arvid Norberg.
 
 It aims to be a good alternative to all other bittorrent clients
 out there. qBittorrent is fast, stable and provides unicode
@@ -15,14 +13,13 @@ support as well as many features.
 This product includes GeoLite data created by MaxMind, available from
 http://maxmind.com/
 
-### Installation:
+Installation:
+********************************
 For installation, follow the instructions from INSTALL file, but simple:
 
-```
 ./configure
 make && make install
 qbittorrent
-```
 
 will install and execute qBittorrent hopefully without any problem.
 
@@ -32,14 +29,12 @@ http://www.qbittorrent.org
 or our wiki here:
 http://wiki.qbittorrent.org
 
-Use the forum for troubleshooting before reporting bugs:
-http://forum.qbittorrent.org
-
 Please report any bug (or feature request) to:
 http://bugs.qbittorrent.org
 
-You can also meet me (sledgehammer_999) on IRC:
-`#qbittorrent on irc.freenode.net`
+You can also meet me (chris-qBT) on IRC:
+#qbittorrent on irc.freenode.net
 
 ------------------------------------------
-sledgehammer999 <sledgehammer999@qbittorrent.org>
+Christophe Dumez <chris@qbittorrent.org>
+

bootstrap.sh

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

build-aux/missing

@@ -1,215 +0,0 @@
-#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
-
-scriptversion=2013-10-28.13; # UTC
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
-  exit 1
-fi
-
-case $1 in
-
-  --is-lightweight)
-    # Used by our autoconf macros to check whether the available missing
-    # script is modern enough.
-    exit 0
-    ;;
-
-  --run)
-    # Back-compat with the calling convention used by older automake.
-    shift
-    ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
-  bison     yacc      flex         lex       help2man
-
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: unknown '$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Run the given program, remember its exit status.
-"$@"; st=$?
-
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
-
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch.  This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
-  msg="probably too old"
-elif test $st -eq 127; then
-  # Program was missing.
-  msg="missing on your system"
-else
-  # Program was found and executed, but failed.  Give up.
-  exit $st
-fi
-
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
-
-program_details ()
-{
-  case $1 in
-    aclocal|automake)
-      echo "The '$1' program is part of the GNU Automake package:"
-      echo "<$gnu_software_URL/automake>"
-      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/autoconf>"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-    autoconf|autom4te|autoheader)
-      echo "The '$1' program is part of the GNU Autoconf package:"
-      echo "<$gnu_software_URL/autoconf/>"
-      echo "It also requires GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-  esac
-}
-
-give_advice ()
-{
-  # Normalize program name to check for.
-  normalized_program=`echo "$1" | sed '
-    s/^gnu-//; t
-    s/^gnu//; t
-    s/^g//; t'`
-
-  printf '%s\n' "'$1' is $msg."
-
-  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-  case $normalized_program in
-    autoconf*)
-      echo "You should only need it if you modified 'configure.ac',"
-      echo "or m4 files included by it."
-      program_details 'autoconf'
-      ;;
-    autoheader*)
-      echo "You should only need it if you modified 'acconfig.h' or"
-      echo "$configure_deps."
-      program_details 'autoheader'
-      ;;
-    automake*)
-      echo "You should only need it if you modified 'Makefile.am' or"
-      echo "$configure_deps."
-      program_details 'automake'
-      ;;
-    aclocal*)
-      echo "You should only need it if you modified 'acinclude.m4' or"
-      echo "$configure_deps."
-      program_details 'aclocal'
-      ;;
-   autom4te*)
-      echo "You might have modified some maintainer files that require"
-      echo "the 'autom4te' program to be rebuilt."
-      program_details 'autom4te'
-      ;;
-    bison*|yacc*)
-      echo "You should only need it if you modified a '.y' file."
-      echo "You may want to install the GNU Bison package:"
-      echo "<$gnu_software_URL/bison/>"
-      ;;
-    lex*|flex*)
-      echo "You should only need it if you modified a '.l' file."
-      echo "You may want to install the Fast Lexical Analyzer package:"
-      echo "<$flex_URL>"
-      ;;
-    help2man*)
-      echo "You should only need it if you modified a dependency" \
-           "of a man page."
-      echo "You may want to install the GNU Help2man package:"
-      echo "<$gnu_software_URL/help2man/>"
-    ;;
-    makeinfo*)
-      echo "You should only need it if you modified a '.texi' file, or"
-      echo "any other file indirectly affecting the aspect of the manual."
-      echo "You might want to install the Texinfo package:"
-      echo "<$gnu_software_URL/texinfo/>"
-      echo "The spurious makeinfo call might also be the consequence of"
-      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-      echo "want to install GNU make:"
-      echo "<$gnu_software_URL/make/>"
-      ;;
-    *)
-      echo "You might have modified some files without having the proper"
-      echo "tools for further handling them.  Check the 'README' file, it"
-      echo "often tells you about the needed prerequisites for installing"
-      echo "this package.  You may also peek at any GNU archive site, in"
-      echo "case some other package contains this missing '$1' program."
-      ;;
-  esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
-                       -e '2,$s/^/         /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

conf.pri.in

@@ -1,16 +0,0 @@
-# @configure_input@
-
-PREFIX = @EXPAND_PREFIX@
-BINDIR = @EXPAND_BINDIR@
-DATADIR = @EXPAND_DATADIR@
-MANPREFIX = @EXPAND_MANDIR@
-
-QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
-INCLUDEPATH += @QBT_CONF_INCLUDES@
-LIBS += @LDFLAGS@ @LIBS@
-
-CONFIG += @QBT_ADD_CONFIG@
-CONFIG -= @QBT_REMOVE_CONFIG@
-
-DEFINES += @QBT_ADD_DEFINES@
-DEFINES -= @QBT_REMOVE_DEFINES@

dist/unix/qBittorrent.appdata.xml

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

dist/unix/systemd/qbittorrent-nox.service.in

@@ -1,11 +0,0 @@
-[Unit]
-Description=qBittorrent Daemon Service
-After=network.target
-
-[Service]
-Type=forking
-User=1000
-ExecStart=@EXPAND_BINDIR@/qbittorrent-nox -d
-
-[Install]
-WantedBy=multi-user.target