diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-02-22 16:30:23 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-03-23 08:43:33 +0000 |
| commit | 2f100373feff003b3a9f43c9314ea239f38b97b3 (patch) | |
| tree | c8a1c1bdf206185591f3579046f1aac1eb362997 /src/location/location.pro | |
| parent | 8f0d2a042458195cebe28f3e80fe9522945b1a14 (diff) | |
| download | qtlocation-2f100373feff003b3a9f43c9314ea239f38b97b3.tar.gz | |
Move locationlabs code into location
The labs feature will still be controlled by location-labs-plugin
config option. They will simply come from the QtLocation module, and
be exposed to QML via the additional qml plugin in
imports/locationlabs.
Change-Id: I133d625708e78ba5d8121a95e45142aae5ec274b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/location.pro')
| -rw-r--r-- | src/location/location.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/location/location.pro b/src/location/location.pro index 199c5bd2..89c1fdd5 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -6,6 +6,7 @@ android { } CONFIG += simd optimize_full +QT_FOR_CONFIG += location-private # 3rdparty headers produce warnings with MSVC msvc: CONFIG -= warning_clean @@ -38,6 +39,7 @@ include(maps/maps.pri) include(places/places.pri) include(declarativemaps/declarativemaps.pri) include(declarativeplaces/declarativeplaces.pri) +qtConfig(location-labs-plugin):include(labs/labs.pri) HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS |