Imported Upstream version 3.2.2

parent a4112ddf

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

core.eol=lf
* text eol=lf
*.zip binary
*.png binary
*.ico binary
*.qm binary
*.icns binary
language: language: cpp
- cpp
env: env:
# use libtorrent 0.15.10 matrix:
- lt_source=from_dist gui=true # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
- lt_source=from_dist gui=false #- lt_branch=dist gui=true
# use libtorrent 0.16.X from RC_0_16 svn branch #- lt_branch=dist gui=false
- lt_source=from_svn gui=true - lt_branch=RC_0_16 gui=true
- lt_source=from_svn gui=false - 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
branches: branches:
except: except:
...@@ -17,37 +21,76 @@ branches: ...@@ -17,37 +21,76 @@ branches:
notifications: notifications:
email: email:
on_success: change on_success: change
on_failure: 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
before_install: 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 - shopt -s expand_aliases
- alias sudo="sudo " - if ! [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then dpkg-query -L ccache && export PATH="/usr/lib/ccache/:$PATH" ; fi
# Using nprocs/2 sometimes may fail (gcc is killed by system), just use two threads - alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system)
- 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 # 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"
- echo settings # Print settings
- echo $lt_source - echo $lt_branch
- echo $ltconf
- echo $gui - echo $gui
- echo $ltconf
- echo $qbtconf - 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: install:
- if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi - 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_source" == "from_svn" ]]; then cd .. && svn co http://libtorrent.googlecode.com/svn/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi - if ! [ "$lt_branch" == "dist" ]; then cd libtorrent && ./autotool.sh && ./configure $ltconf && make install && cd "$TRAVIS_BUILD_DIR" ; fi
script: script:
- qt-qconf - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # Skip usual build when running coverity scan
- ./configure $qbtconf && sudo make install - ./bootstrap.sh && ./configure $qbtconf
- make install
after_success: after_success:
- if $gui ; then qbittorrent --version ; else qbittorrent-nox --version ; fi - 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
[main] [main]
host = https://www.transifex.com host = https://www.transifex.com
[qbittorrent.qbittorrent_v3_1_x] [qbittorrent.qbittorrent_v3_2_x]
file_filter = src/lang/qbittorrent_<lang>.ts file_filter = src/lang/qbittorrent_<lang>.ts
source_file = src/lang/qbittorrent_en.ts source_file = src/lang/qbittorrent_en.ts
source_lang = en source_lang = en
...@@ -11,7 +11,7 @@ mode = developer ...@@ -11,7 +11,7 @@ mode = developer
[qbittorrent.qbittorrentdesktop_master] [qbittorrent.qbittorrentdesktop_master]
source_file = src/Icons/qBittorrent.desktop source_file = src/icons/qBittorrent.desktop
source_lang = en source_lang = en
type = DESKTOP type = DESKTOP
minimum_perc = 23 minimum_perc = 23
......
...@@ -17,7 +17,7 @@ Contributors: ...@@ -17,7 +17,7 @@ Contributors:
* Nick Tiskov <daymansmail@gmail.com> * Nick Tiskov <daymansmail@gmail.com>
Code from other projects: Code from other projects:
* files src/qtsingleapp/* src/lineedit/* * files src/qtsingleapplication/* src/lineedit/*
copyright: Nokia Corporation copyright: Nokia Corporation
license: LGPL license: LGPL
...@@ -34,7 +34,7 @@ Code from other projects: ...@@ -34,7 +34,7 @@ Code from other projects:
license: GPLv2/3 license: GPLv2/3
Images Authors: Images Authors:
* files: src/Icons/*.png * files: src/icons/*.png
copyright: Gnome Icon Theme copyright: Gnome Icon Theme
license: GPLv2 license: GPLv2
url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
...@@ -44,21 +44,21 @@ Images Authors: ...@@ -44,21 +44,21 @@ Images Authors:
license: LGPL license: LGPL
url: http://www.oxygen-icons.org url: http://www.oxygen-icons.org
* files: src/Icons/flags/*.png * files: src/icons/flags/*.png
copyright: Mark James <mjames@gmail.com> copyright: Mark James <mjames@gmail.com>
license: Public Domain license: Public Domain
url: http://www.famfamfam.com url: http://www.famfamfam.com
* files: src/Icons/skin/*.png * files: src/icons/skin/*.png
files: src/menuicons/YYxYY/*.png files: src/menuicons/YYxYY/*.png
copyright: Mateusz Tobola <tobejodok@qbittorrent.org> copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
license: GPLv2 license: GPLv2
* file: src/Icons/skin/tabs.gif * file: src/icons/skin/tabs.gif
copyright: Greg Houston <gregory.houston@gmail.com> copyright: Greg Houston <gregory.houston@gmail.com>
license: MIT license: MIT
* file: src/Icons/skin/qbittorrent_mono* * file: src/icons/skin/qbittorrent_mono*
copyright: Daniel Eguren <deguren@gmail.com> copyright: Daniel Eguren <deguren@gmail.com>
license: LGPL license: LGPL
...@@ -77,9 +77,12 @@ Images Authors: ...@@ -77,9 +77,12 @@ Images Authors:
* file: src/search_engine/engines/torrentreactor.png * file: src/search_engine/engines/torrentreactor.png
copyright: Downloaded from torrentreactor.net copyright: Downloaded from torrentreactor.net
* file: src/icons/oxygen/checked.png
copyright: Victor Buinsky <allok.victor@gmail.com>
Translations authors: Translations authors:
* files: src/lang/*.ts * files: src/lang/*.ts
* file: src/Icons/qBittorrent.desktop * file: src/icons/qBittorrent.desktop
copyright: copyright:
- Arabic: SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and Ibrahim Saed ibraheem_alex(Transifex) - Arabic: SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and Ibrahim Saed ibraheem_alex(Transifex)
- Armenian: Hrant Ohanyan (hrantohanyan@mail.am) - Armenian: Hrant Ohanyan (hrantohanyan@mail.am)
......
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