diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-17 18:23:31 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-04-17 16:46:02 +0000 |
commit | 3d2281ccf7400a782f69b7b74cb45d0889708bcc (patch) | |
tree | 049703e99771e8cdb19abc33797fcb366d4b2df1 /src/plugins/geoservices/nokia/nokia.pro | |
parent | 572957bb1326190672ea138ccf475c0cf1893192 (diff) | |
parent | f57956599925dd9eefe70d1b0cc31cb033414a33 (diff) | |
download | qtlocation-3d2281ccf7400a782f69b7b74cb45d0889708bcc.tar.gz |
Merge remote-tracking branch 'origin/wip/navigation' into 5.11
Conflicts:
src/location/declarativemaps/qgeomapobject.cpp
src/location/declarativemaps/qgeomapobject_p_p.h
src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h
Change-Id: Iab847e16011b2095d307e2a3610bf9157ae7b92d
Diffstat (limited to 'src/plugins/geoservices/nokia/nokia.pro')
-rw-r--r-- | src/plugins/geoservices/nokia/nokia.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index c6dadd86..86a0665c 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -2,6 +2,9 @@ TARGET = qtgeoservices_nokia QT += location-private positioning-private network +QT_FOR_CONFIG += location-private +qtConfig(location-labs-plugin): DEFINES += LOCATIONLABS + HEADERS += \ qgeocodereply_nokia.h \ qgeocodejsonparser.h \ |