1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00

Merge branch 'v2.0'

This commit is contained in:
David Rosca 2016-04-24 10:25:10 +02:00
commit f976d87192

View File

@ -5,6 +5,7 @@ cache: apt
env:
- QT=qt56
- QT=qt57
before_install:
- export DISPLAY=:99.0
@ -14,10 +15,12 @@ install:
- sudo apt-get -qq update
- sudo apt-get -qq install libssl-dev pkg-config libxcb-util0-dev
- if [[ "$QT" == "qt56" ]]; then sudo apt-add-repository -y ppa:beineri/opt-qt56-trusty; sudo apt-get update -qq; sudo apt-get install -qq qt56tools qt56script qt56webengine qt56webchannel qt56declarative qt56x11extras; fi
- if [[ "$QT" == "qt57" ]]; then sudo apt-add-repository -y ppa:beineri/opt-qt57-trusty; sudo apt-get update -qq; sudo apt-get install -qq qt57tools qt57script qt57webengine qt57webchannel qt57declarative qt57x11extras; fi
script:
- QMAKE="qmake"
- if [[ "$QT" == "qt56" ]]; then QMAKE="/opt/qt56/bin/qmake"; fi
- if [[ "$QT" == "qt57" ]]; then QMAKE="/opt/qt57/bin/qmake"; fi
- $QMAKE QMAKE_CXXFLAGS+="-Wextra -Werror"
- make || exit 1
- cd scripts && ./run_tests.sh $QMAKE