diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-05 10:27:16 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@digia.com> | 2014-05-05 10:27:16 +0200 |
commit | 8922ae1ef4f0cb01c15632dfe19ed514e0d49dbe (patch) | |
tree | 05435d06e51d4d4a3ebbbdaab6d550c634155beb /src/plugins/position/corelocation/corelocation.pro | |
parent | 56e80eb797b55458614599a82c2264c46e6e5eb0 (diff) | |
parent | d603bd03795b412fd7a20f4bd804e236560a90c6 (diff) | |
download | qtlocation-8922ae1ef4f0cb01c15632dfe19ed514e0d49dbe.tar.gz |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
src/src.pro
Change-Id: Ibc0a58c565aec37fb09b96e27309f50892340cac
Diffstat (limited to 'src/plugins/position/corelocation/corelocation.pro')
-rw-r--r-- | src/plugins/position/corelocation/corelocation.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/position/corelocation/corelocation.pro b/src/plugins/position/corelocation/corelocation.pro index 1a1a2a39..544d825a 100644 --- a/src/plugins/position/corelocation/corelocation.pro +++ b/src/plugins/position/corelocation/corelocation.pro @@ -2,7 +2,7 @@ TARGET = qtposition_cl QT = core positioning PLUGIN_TYPE = position -PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryCL +PLUGIN_CLASS_NAME = IOSPositionPlugin load(qt_plugin) INCLUDEPATH += $$QT.location.includes |