diff --git a/.travis.yml b/.travis.yml index 67f378b18..d318598d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,14 +43,19 @@ addons: branch_pattern: $coverity_branch notification_email: sledgehammer999@qbittorrent.org apt: + 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-whitelist/blob/master/ubuntu-precise - autoconf - automake - colormake + - g++-4.8 - libssl-dev - - libboost-dev - - libboost-system-dev + - libboost1.55-dev + - libboost-system1.55-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 @@ -60,6 +65,7 @@ before_install: - 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 + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CC=gcc-4.8 CXX=g++-4.8 ; fi - if [ "$TRAVIS_BRANCH" != "$coverity_branch" -a "$TRAVIS_OS_NAME" = "linux" ]; 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) @@ -90,6 +96,7 @@ install: script: - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # Skip usual build when running coverity scan - ./bootstrap.sh && ./configure $qbtconf + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then echo QMAKE_CC=$CC >> conf.pri && echo QMAKE_CXX=$CXX >> conf.pri ; fi - make && make install after_success: diff --git a/unixconf.pri b/unixconf.pri index f26fba4f7..cc59b43dd 100644 --- a/unixconf.pri +++ b/unixconf.pri @@ -10,17 +10,13 @@ exists($$OUT_PWD/../conf.pri) { } # C++11 support -lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++0x +lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11 # COMPILATION SPECIFIC -!nogui:dbus { - QT += dbus -} +!nogui:dbus: QT += dbus QMAKE_CXXFLAGS += -Wformat -Wformat-security -!haiku { - QMAKE_LFLAGS_APP += -rdynamic -} +!haiku: QMAKE_LFLAGS_APP += -rdynamic # Man page nogui {