diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-04-21 11:02:00 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@users.noreply.github.com> | 2016-04-21 11:02:00 +0300 |
| commit | d46982be2b97b47ee14bb3adaae155fa7fec05f7 (patch) | |
| tree | 0dc35592b9f8301a0edecbc70565c12dedaa90a3 /platform | |
| parent | c625dd0f7e57e88acf9d988b84e48bdb99ffe4aa (diff) | |
| download | qtlocation-mapboxgl-d46982be2b97b47ee14bb3adaae155fa7fec05f7.tar.gz | |
Merge pull request #4773 from mapbox/travis-qt5
[build] Added Qt 5 build for Travis CI
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/qt/app/qmapboxgl.gypi | 1 | ||||
| -rw-r--r-- | platform/qt/scripts/configure.sh | 5 |
2 files changed, 5 insertions, 1 deletions
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 |