From daf33180fd7e39d16fd902a9886a406609df7efb Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Thu, 28 Apr 2016 18:05:34 +0300
Subject: [PATCH] [Qt] Add QtLocation to the buildsystem

Needed by the next patch.
---
 .travis.yml                            | 2 +-
 platform/qt/platform.gyp               | 2 ++
 platform/qt/qmlapp/qquickmapboxgl.gypi | 2 ++
 platform/qt/scripts/configure.sh       | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e4a5d8deb..5aab7ae1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
 
diff --git a/platform/qt/platform.gyp b/platform/qt/platform.gyp
index a94561569..53b3e5fa0 100644
--- a/platform/qt/platform.gyp
+++ b/platform/qt/platform.gyp
@@ -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)',
             ],
diff --git a/platform/qt/qmlapp/qquickmapboxgl.gypi b/platform/qt/qmlapp/qquickmapboxgl.gypi
index 63d6afeec..7b539a52f 100644
--- a/platform/qt/qmlapp/qquickmapboxgl.gypi
+++ b/platform/qt/qmlapp/qquickmapboxgl.gypi
@@ -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)',
diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh
index 4f068d841..aa5c7615d 100644
--- a/platform/qt/scripts/configure.sh
+++ b/platform/qt/scripts/configure.sh
@@ -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