[Qt] Add QtLocation to the buildsystem

Needed by the next patch.
This commit is contained in:
Thiago Marcos P. Santos
2016-04-28 18:05:34 +03:00
parent 133f71dd01
commit daf33180fd
4 changed files with 7 additions and 1 deletions

View File

@@ -116,7 +116,7 @@ matrix:
env: FLAVOR=qt5 BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5
addons: *qt5
before_install:
- sudo apt-get install -y qtpositioning5-dev
- sudo apt-get install -y qtpositioning5-dev qtlocation5-dev
script:
- make qt-app qt-qml-app

View File

@@ -126,10 +126,12 @@
['<(qt_version_major) == 5', {
'variables': {
'cflags': [
'<@(qt_location_cflags)',
'<@(qt_positioning_cflags)',
'<@(qt_quick_cflags)',
],
'ldflags': [
'<@(qt_location_ldflags)',
'<@(qt_positioning_ldflags)',
'<@(qt_quick_ldflags)',
],

View File

@@ -27,6 +27,7 @@
'<@(opengl_cflags)',
'<@(qt_core_cflags)',
'<@(qt_gui_cflags)',
'<@(qt_location_cflags)',
'<@(qt_positioning_cflags)',
'<@(qt_qml_cflags)',
'<@(qt_quick_cflags)',
@@ -36,6 +37,7 @@
'<@(opengl_ldflags)',
'<@(qt_core_ldflags)',
'<@(qt_gui_ldflags)',
'<@(qt_location_ldflags)',
'<@(qt_positioning_ldflags)',
'<@(qt_qml_ldflags)',
'<@(qt_quick_ldflags)',

View File

@@ -45,10 +45,12 @@ function print_qt_flags {
CONFIG+=" 'qt_network_ldflags%': $(quote_flags $(mason ldflags Qt system "QtNetwork")),"$LN
if [ ${QT_VERSION_MAJOR} -gt 4 ]; then
CONFIG+=" 'qt_location_cflags%': $(quote_flags $(mason cflags Qt system "QtLocation")),"$LN
CONFIG+=" 'qt_qml_cflags%': $(quote_flags $(mason cflags Qt system "QtQml")), "$LN
CONFIG+=" 'qt_quick_cflags%': $(quote_flags $(mason cflags Qt system "QtQuick")), "$LN
CONFIG+=" 'qt_positioning_cflags%': $(quote_flags $(mason cflags Qt system "QtPositioning")),"$LN
CONFIG+=" 'qt_location_ldflags%': $(quote_flags $(mason ldflags Qt system "QtLocation")),"$LN
CONFIG+=" 'qt_qml_ldflags%': $(quote_flags $(mason ldflags Qt system "QtQml")), "$LN
CONFIG+=" 'qt_quick_ldflags%': $(quote_flags $(mason ldflags Qt system "QtQuick")), "$LN
CONFIG+=" 'qt_positioning_ldflags%': $(quote_flags $(mason ldflags Qt system "QtPositioning")),"$LN