1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +01:00

Merge branch 'v2.0'

This commit is contained in:
David Rosca 2016-06-19 12:04:30 +02:00
commit cf8e9830b7

View File

@ -14,8 +14,8 @@ before_install:
install: install:
- sudo apt-get -qq update - sudo apt-get -qq update
- sudo apt-get -qq install libssl-dev pkg-config libxcb-util0-dev - 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" == "qt56" ]]; then sudo apt-add-repository -y ppa:beineri/opt-qt561-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-beta-trusty; sudo apt-get update -qq; sudo apt-get install -qq qt57tools qt57script qt57webengine qt57webchannel qt57declarative qt57x11extras; 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: script:
- QMAKE="qmake" - QMAKE="qmake"