diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-10-26 15:24:02 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-28 20:31:27 +0000 |
| commit | b0246e6695e9bb69f87994363635174a7841b58c (patch) | |
| tree | da0abe6fe504c52bdf6e2e2a894f827f55786a2c /src/plugins/position | |
| parent | 8aabdb0975c3532324d299dfa62aa333a56d2d3b (diff) | |
Convert qtlocation to the new configure system
And clean up the code detecting gypsy and the WinRT
positioning API.
Change-Id: Ic561d565d6fc733703ef6c0dc164e737e0b3d4fd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/plugins/position')
| -rw-r--r-- | src/plugins/position/gypsy/gypsy.pro | 5 | ||||
| -rw-r--r-- | src/plugins/position/position.pro | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro index be65f183..c7b74325 100644 --- a/src/plugins/position/gypsy/gypsy.pro +++ b/src/plugins/position/gypsy/gypsy.pro @@ -1,6 +1,6 @@ TARGET = qtposition_gypsy -QT = core positioning +QT = core positioning-private HEADERS += \ qgeosatelliteinfosource_gypsy_p.h \ @@ -10,8 +10,7 @@ SOURCES += \ qgeosatelliteinfosource_gypsy.cpp \ qgeopositioninfosourcefactory_gypsy.cpp -CONFIG += link_pkgconfig -PKGCONFIG += gypsy gconf-2.0 +QMAKE_USE_PRIVATE += gypsy OTHER_FILES += \ plugin.json diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro index 4df733b9..1687a9d2 100644 --- a/src/plugins/position/position.pro +++ b/src/plugins/position/position.pro @@ -1,8 +1,10 @@ TEMPLATE = subdirs +QT_FOR_CONFIG += positioning-private + qtHaveModule(dbus):SUBDIRS += geoclue -config_gypsy:SUBDIRS += gypsy -config_winrt:SUBDIRS += winrt +qtConfig(gypsy):SUBDIRS += gypsy +qtConfig(winrt_geolocation):SUBDIRS += winrt qtHaveModule(simulator):SUBDIRS += simulator osx|ios|tvos:SUBDIRS += corelocation android:SUBDIRS += android |