1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00

Try to enable Qt 5.4 builds on Travis

This commit is contained in:
David Rosca 2015-01-27 12:29:17 +01:00
parent 81639ea923
commit ebdea578aa

View File

@ -1,28 +1,25 @@
#language: cpp
#cache: apt
#
#env:
# - QT=qt4
# - QT=qt5
#
#branches:
# only:
# - 'master'
# - 'v1.8'
#
#before_install:
# - export DISPLAY=:99.0
# - sh -e /etc/init.d/xvfb start
#
#install:
# - sudo apt-get -qq update
# - sudo apt-get -qq install libssl-dev pkg-config libhunspell-dev
# - if [[ "$QT" == "qt4" ]]; then sudo apt-get -qq install libqt4-dev libqt4-webkit libqt4-sql-sqlite; fi
# - if [[ "$QT" == "qt5" ]]; then sudo apt-add-repository -y ppa:beineri/opt-qt511; sudo apt-get update -qq; sudo apt-get install -qq qt51base qt51webkit qt51tools qt51script libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev; fi
#
#script:
# - QMAKE="qmake"
# - if [[ "$QT" == "qt5" ]]; then QMAKE="/opt/qt51/bin/qmake"; fi
language: cpp
cache: apt
env:
- QT=qt54
branches:
only:
- 'master'
before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install:
- sudo apt-get -qq update
- sudo apt-get -qq install libssl-dev pkg-config libhunspell-dev
- if [[ "$QT" == "qt54" ]]; then sudo apt-add-repository -y ppa:beineri/opt-qt54; sudo apt-get update -qq; sudo apt-get install -qq qt54tools qt54webengine; fi
script:
- QMAKE="qmake"
- if [[ "$QT" == "qt54" ]]; then QMAKE="/opt/qt54/bin/qmake"; fi
# - $QMAKE QMAKE_CXXFLAGS+="-Wextra -Werror"
# - make || exit 1
- make || exit 1
# - cd scripts && ./run_tests.sh $QMAKE