diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-05-22 10:16:25 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-05-22 10:16:25 +0200 |
| commit | 52969e957df3db332e6d95105a2600ab8f5f0ec6 (patch) | |
| tree | 5bcaade2883125c9c18904062d8da7dfff150546 /src/imports | |
| parent | cb424d26eac75a14316726b4687758fd10c85563 (diff) | |
| parent | 25596443e11aa9fdfe124fe390a44474dfb715c7 (diff) | |
| download | qtlocation-52969e957df3db332e6d95105a2600ab8f5f0ec6.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp
Change-Id: I2bf1657c6dd3b73e654e7db8bdadadfb293e2180
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/location/location.cpp | 2 | ||||
| -rw-r--r-- | src/imports/location/qmldir | 1 | ||||
| -rw-r--r-- | src/imports/positioning/positioning.cpp | 2 | ||||
| -rw-r--r-- | src/imports/positioning/qmldir | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 8af789b8..7bb37623 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE -class QLocationDeclarativeModule: public QQmlExtensionPlugin +class QtLocationDeclarativeModule: public QQmlExtensionPlugin { Q_OBJECT diff --git a/src/imports/location/qmldir b/src/imports/location/qmldir index f802a4a1..37ecf66c 100644 --- a/src/imports/location/qmldir +++ b/src/imports/location/qmldir @@ -1,3 +1,4 @@ module QtLocation plugin declarative_location +classname QtLocationDeclarativeModule typeinfo plugins.qmltypes diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp index 36a731db..7b213960 100644 --- a/src/imports/positioning/positioning.cpp +++ b/src/imports/positioning/positioning.cpp @@ -85,7 +85,7 @@ static LocationValueTypeProvider *getValueTypeProvider() return &provider; } -class QLocationDeclarativeModule: public QQmlExtensionPlugin +class QtPositioningDeclarativeModule: public QQmlExtensionPlugin { Q_OBJECT diff --git a/src/imports/positioning/qmldir b/src/imports/positioning/qmldir index 4143e0d5..fc4ebf85 100644 --- a/src/imports/positioning/qmldir +++ b/src/imports/positioning/qmldir @@ -1,3 +1,4 @@ module QtPositioning plugin declarative_positioning +classname QtPositioningDeclarativeModule typeinfo plugins.qmltypes |