diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-14 12:39:55 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-14 12:39:56 +0200 |
| commit | 25596443e11aa9fdfe124fe390a44474dfb715c7 (patch) | |
| tree | b5daff646ecd9c7e042409c5871ca800569b2950 | |
| parent | 4603bf1bdcf20307398838e9435d18f1a4442983 (diff) | |
| parent | 73c42e6ef76301c18a36bc0265773f84c9d375ba (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I05aa3988ce01f01bf987e259dcac0144e52cdf89
| -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 4314582d..30ca6ffb 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 |