Merge pull request #4773 from mapbox/travis-qt5

[build] Added Qt 5 build for Travis CI
This commit is contained in:
Bruno de Oliveira Abinader
2016-04-21 11:02:00 +03:00
committed by Thiago Marcos P. Santos
parent c625dd0f7e
commit d46982be2b
4 changed files with 20 additions and 2 deletions

2
.mason

Submodule .mason updated: 014845da79...d914f75b43

View File

@@ -20,6 +20,12 @@ addons_shortcuts:
sources: [ 'ubuntu-toolchain-r-test', 'ubuntu-sdk-team' ]
packages: [ 'gdb', 'g++-4.9', 'gcc-4.9', 'libllvm3.4', 'xutils-dev',
'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils', 'qt4-default' ]
addons_qt5: &qt5
apt:
sources: [ 'ubuntu-toolchain-r-test', 'ubuntu-sdk-team' ]
packages: [ 'gdb', 'g++-4.9', 'gcc-4.9', 'libllvm3.4', 'xutils-dev',
'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils',
'qt5-default', 'libqt5opengl5-dev' ]
env:
global:
@@ -94,6 +100,14 @@ matrix:
script:
- make test-qt
# Qt 5 - Release
- language: cpp
compiler: ": linux-gcc49-release"
env: FLAVOR=qt5 BUILDTYPE=Release _CXX=g++-4.9 _CC=gcc-4.9
addons: *qt5
script:
- make test-qt
cache:
directories:
- $HOME/.ccache

View File

@@ -29,6 +29,7 @@
'<@(opengl_cflags)',
'<@(qt_cflags)',
'-Wno-error', # TODO: eliminate
'-fPIC',
],
'ldflags': [
'<@(opengl_ldflags)',

View File

@@ -31,7 +31,10 @@ function print_qt_flags {
CONFIG+=" 'qt_ldflags%': $(quote_flags $(mason ldflags Qt system "QtCore QtGui QtOpenGL QtNetwork")),"$LN
QT_VERSION_MAJOR=$(qmake -query QT_VERSION | cut -d. -f1)
if [ ${QT_VERSION_MAJOR} -gt 4 ] ; then
if hash moc 2>/dev/null && hash rcc 2>/dev/null; then
CONFIG+=" 'qt_moc%': '$(which moc)',"$LN
CONFIG+=" 'qt_rcc%': '$(which rcc)',"$LN
elif [ ${QT_VERSION_MAJOR} -gt 4 ] ; then
CONFIG+=" 'qt_moc%': '$(pkg-config Qt${QT_VERSION_MAJOR}Core --variable=host_bins)/moc',"$LN
CONFIG+=" 'qt_rcc%': '$(pkg-config Qt${QT_VERSION_MAJOR}Core --variable=host_bins)/rcc',"$LN
else