diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 12:59:03 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 12:59:03 +0100 |
| commit | 583697420c657c1813cb0f241d84663a2311fa99 (patch) | |
| tree | e253430115718b5e67d6a364f034bc0702667d0a | |
| parent | 9ccdcd9f883162783aa5d3d8e2e462e136fa2ca7 (diff) | |
| parent | 7791dd790d2b15751b703db70a5fceb31d3fd99f (diff) | |
| download | qtlocation-583697420c657c1813cb0f241d84663a2311fa99.tar.gz | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I3470a71b91db46ab803c2fb4de41a95ad430535e
| -rw-r--r-- | src/imports/location/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | src/imports/positioning/plugins.qmltypes | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes index d07df0f8..0a7c6334 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.4' +// 'qmlplugindump -nonrelocatable QtLocation 5.4' Module { Component { diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes index a956a786..bda2e48f 100644 --- a/src/imports/positioning/plugins.qmltypes +++ b/src/imports/positioning/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 QtPositioning 5.4' +// 'qmlplugindump -nonrelocatable QtPositioning 5.4' Module { Component { @@ -149,6 +149,8 @@ Module { Signal { name: "directionChanged"; revision: 1 } Signal { name: "verticalSpeedValidChanged"; revision: 1 } Signal { name: "verticalSpeedChanged"; revision: 1 } + Signal { name: "magneticVariationChanged"; revision: 2 } + Signal { name: "magneticVariationValidChanged"; revision: 2 } } Component { name: "QDeclarativePositionSource" |