diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-07-09 11:15:35 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-07-09 13:13:46 +0200 |
| commit | f2e3523e3fcec83845a0ec73ff682367202a84f6 (patch) | |
| tree | 6d77d1cb99a15efc9786b3a4ed1108c5d611bbcf | |
| parent | 181605809f658537c4d0c5e174c5dd3167eb818c (diff) | |
| download | qtlocation-f2e3523e3fcec83845a0ec73ff682367202a84f6.tar.gz | |
Register all QtLocation QML types for version 5.4
Change-Id: Idd345621b8f3069dc53008dfa99b33f1006cd5ce
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| -rw-r--r-- | src/imports/location/location.cpp | 6 | ||||
| -rw-r--r-- | src/imports/location/plugins.qmltypes | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 7bb37623..1adc80ad 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -151,10 +151,12 @@ public: "Only Place types have ContactDetails and they cannot " "be re-assigned (but can be modified)."); - // Register the 5.3 types // Introduction of 5.3 version; existing 5.0 exports automatically become available under 5.3 as well // 5.3 is committed QML API despite missing release of QtLocation 5.3 - minor = 3; + + // Register the 5.4 types + // Implicitly registers 5.3 + minor = 4; // For now there are no new types; just reregister one existing 5.0 type qmlRegisterType<QDeclarativeGeoServiceProvider >(uri, major, minor, "Plugin"); diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes index ffdbd7c8..64e8d145 100644 --- a/src/imports/location/plugins.qmltypes +++ b/src/imports/location/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.1 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -notrelocatable QtLocation 5.3' +// 'qmlplugindump -notrelocatable QtLocation 5.4' Module { Component { @@ -513,7 +513,7 @@ Module { name: "QDeclarativeGeoServiceProvider" defaultProperty: "parameters" prototype: "QObject" - exports: ["QtLocation/Plugin 5.0", "QtLocation/Plugin 5.3"] + exports: ["QtLocation/Plugin 5.0", "QtLocation/Plugin 5.4"] exportMetaObjectRevisions: [0, 0] Enum { name: "RoutingFeature" |