diff options
| author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2013-03-20 19:34:17 +1000 |
|---|---|---|
| committer | Alex <ablasche@gmail.com> | 2013-04-08 02:14:29 +0200 |
| commit | 33f07da0e76b8eba12fbf2a1d193875be5046df4 (patch) | |
| tree | 5f39182c5c77cf6b14b19b58a6ad993d46194960 | |
| parent | 661698a967af2fb8d980245694b7bd40e7f72d7a (diff) | |
Fixes warning when using "QtLocation 5.0" import.
Declare the module name in the qmldir file.
Task-number: QTBUG-29728
Change-Id: I323eba9b17203cd56c843823576e82853b6c1aa7
Reviewed-by: Alex <ablasche@gmail.com>
| -rw-r--r-- | src/imports/location/location.cpp | 2 | ||||
| -rw-r--r-- | src/imports/location/location.pro | 3 | ||||
| -rw-r--r-- | src/imports/location/qmldir | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 0ce7edba..5a5fadd4 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -135,7 +135,7 @@ public: qmlRegisterSingletonType<LocationSingleton>(uri, 5, 0, "QtLocation", singleton_type_factory); QQml_addValueTypeProvider(getValueTypeProvider()); - qmlRegisterValueTypeEnums<GeoShapeValueType>("QtLocation", 5, 0, "GeoShape"); + qmlRegisterValueTypeEnums<GeoShapeValueType>(uri, 5, 0, "GeoShape"); qmlRegisterType<QDeclarativePosition>(uri, 5, 0, "Position"); qmlRegisterType<QDeclarativePositionSource>(uri, 5, 0, "PositionSource"); diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro index 2134c6fa..8d4e54c1 100644 --- a/src/imports/location/location.pro +++ b/src/imports/location/location.pro @@ -89,4 +89,5 @@ include(declarativeplaces/declarativeplaces.pri) load(qml_plugin) OTHER_FILES += \ - plugin.json + plugin.json \ + qmldir diff --git a/src/imports/location/qmldir b/src/imports/location/qmldir index 077bc7f2..a8fc95d2 100644 --- a/src/imports/location/qmldir +++ b/src/imports/location/qmldir @@ -1 +1,2 @@ +module QtLocation plugin declarative_location |