diff options
| m--------- | .mason | 0 | ||||
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | platform/qt/app/qmapboxgl.gypi | 1 | ||||
| -rw-r--r-- | platform/qt/scripts/configure.sh | 5 |
4 files changed, 19 insertions, 1 deletions
diff --git a/.mason b/.mason -Subproject 014845da79d605fd455b1dbcd8d6f116661e322 +Subproject d914f75b43d64db226a449efc7dedfa3b6c129f diff --git a/.travis.yml b/.travis.yml index 4fbb04e7dd..19d358b106 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/platform/qt/app/qmapboxgl.gypi b/platform/qt/app/qmapboxgl.gypi index c864d7d19e..4a42d2c7a5 100644 --- a/platform/qt/app/qmapboxgl.gypi +++ b/platform/qt/app/qmapboxgl.gypi @@ -29,6 +29,7 @@ '<@(opengl_cflags)', '<@(qt_cflags)', '-Wno-error', # TODO: eliminate + '-fPIC', ], 'ldflags': [ '<@(opengl_ldflags)', diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index 66ee7f1471..eb9775b442 100644 --- a/platform/qt/scripts/configure.sh +++ b/platform/qt/scripts/configure.sh @@ -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 |