diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-04-13 14:11:20 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-04-14 09:02:15 +0000 |
| commit | d92dec953b0d98fff42836ae75ae8585887611b9 (patch) | |
| tree | 010151a18bbb4bf6ab3d79bd933fc4fff8e3cf11 | |
| parent | c546b09cd8bb69d4a07c9a26c907157fc9793351 (diff) | |
Update QtLocation qmltypes
At the same time document a small API addition which was highlighted while
the qmltypes were updated
Change-Id: I935b18330e4d5a9d81ccbf3223387603b076a3dd
Reviewed-by: Wolfgang Bremer <wolfgang.bremer@pelagicore.com>
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| -rw-r--r-- | src/imports/location/plugins.qmltypes | 5 | ||||
| -rw-r--r-- | src/imports/location/qdeclarativegeomapgesturearea.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes index 9858cb3e..b8daa8d0 100644 --- a/src/imports/location/plugins.qmltypes +++ b/src/imports/location/plugins.qmltypes @@ -148,10 +148,6 @@ Module { Property { name: "error"; type: "QGeoServiceProvider::Error"; isReadonly: true } Property { name: "errorString"; type: "string"; isReadonly: true } Signal { - name: "wheelAngleChanged" - Parameter { name: "angleDelta"; type: "QPoint" } - } - Signal { name: "pluginChanged" Parameter { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true } } @@ -235,6 +231,7 @@ Module { Property { name: "activeGestures"; type: "ActiveGestures" } Property { name: "maximumZoomLevelChange"; type: "double" } Property { name: "flickDeceleration"; type: "double" } + Signal { name: "panActiveChanged" } Signal { name: "pinchActiveChanged" } Signal { name: "pinchStarted" diff --git a/src/imports/location/qdeclarativegeomapgesturearea.cpp b/src/imports/location/qdeclarativegeomapgesturearea.cpp index 2f0a7b73..60e5ad06 100644 --- a/src/imports/location/qdeclarativegeomapgesturearea.cpp +++ b/src/imports/location/qdeclarativegeomapgesturearea.cpp @@ -219,6 +219,8 @@ QT_BEGIN_NAMESPACE \qmlproperty bool QtLocation::MapGestureArea::isPanActive This read-only property holds whether any pan gesture (panning or flicking) is active. + + \note Change notifications for this property were introduced in Qt 5.5. */ /*! |