diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-10 14:33:12 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-10 14:33:17 +0200 |
commit | d90b2bffd76bf74ab4b6e6c0c68a26f6830c8d6f (patch) | |
tree | 3432628840d9ddb14dae7121d211d7e09bbad215 | |
parent | f46abef02cf5c883deba753afeff0042fa36b6e4 (diff) | |
parent | f1f876b353446ebb271d167482f5e0414f88e10f (diff) | |
download | qtlocation-d90b2bffd76bf74ab4b6e6c0c68a26f6830c8d6f.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I36abd2a91a470360c87f23a6d8084f908d93e7e0
-rw-r--r-- | dist/changes-5.6.1 | 38 | ||||
-rw-r--r-- | src/imports/location/qdeclarativegeomap.cpp | 5 | ||||
-rw-r--r-- | src/imports/location/qdeclarativegeomapitembase.cpp | 3 | ||||
-rw-r--r-- | src/imports/location/qdeclarativegeomapquickitem.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative_ui/tst_map_item_details.qml | 28 |
5 files changed, 66 insertions, 10 deletions
diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1 new file mode 100644 index 00000000..cd579b6a --- /dev/null +++ b/dist/changes-5.6.1 @@ -0,0 +1,38 @@ +Qt 5.6.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://doc.qt.io/qt-5.6/ + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + +QtLocation +---------- + + - Improved the example and class documentation + - Consolidated various qmake project files across the module + - [QTBUG-51541] Fixed compile issue on linux/gcc-4.8 when using C++98 + - Improved compression rate of various screenshots throughout the documentation + +QtPositioning +------------- + + - [QTBUG-38802] Added default capability (location) for WinRT + - [QTBUG-53059] Fixed crash on iOS/OS X due to incorrectly initialized member + variable in the positioning backend + diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 545ef608..7e000c06 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -411,6 +411,10 @@ QQuickGeoMapGestureArea *QDeclarativeGeoMap::gesture() void QDeclarativeGeoMap::populateMap() { QObjectList kids = children(); + QList<QQuickItem *> quickKids = childItems(); + for (int i=0; i < quickKids.count(); ++i) + kids.append(quickKids.at(i)); + for (int i = 0; i < kids.size(); ++i) { // dispatch items appropriately QDeclarativeGeoMapItemView *mapView = qobject_cast<QDeclarativeGeoMapItemView *>(kids.at(i)); @@ -462,7 +466,6 @@ QSGNode *QDeclarativeGeoMap::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa return root; } - /*! \qmlproperty Plugin QtLocation::Map::plugin diff --git a/src/imports/location/qdeclarativegeomapitembase.cpp b/src/imports/location/qdeclarativegeomapitembase.cpp index cde00abf..8e825f5b 100644 --- a/src/imports/location/qdeclarativegeomapitembase.cpp +++ b/src/imports/location/qdeclarativegeomapitembase.cpp @@ -133,6 +133,8 @@ void QDeclarativeGeoMapItemBase::setMap(QDeclarativeGeoMap *quickMap, QGeoMap *m if (map_ && quickMap_) { connect(map_, SIGNAL(cameraDataChanged(QGeoCameraData)), this, SLOT(baseCameraDataChanged(QGeoCameraData))); + connect(quickMap, SIGNAL(heightChanged()), this, SLOT(polishAndUpdate())); + connect(quickMap, SIGNAL(widthChanged()), this, SLOT(polishAndUpdate())); lastSize_ = QSizeF(quickMap_->width(), quickMap_->height()); lastCameraData_ = map_->cameraData(); } @@ -199,7 +201,6 @@ bool QDeclarativeGeoMapItemBase::childMouseEventFilter(QQuickItem *item, QEvent switch (event->type()) { case QEvent::MouseButtonPress: case QEvent::MouseButtonRelease: - case QEvent::MouseMove: if (contains(static_cast<QMouseEvent*>(event)->pos())) { return false; } else { diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/imports/location/qdeclarativegeomapquickitem.cpp index ca67b183..a66efb1d 100644 --- a/src/imports/location/qdeclarativegeomapquickitem.cpp +++ b/src/imports/location/qdeclarativegeomapquickitem.cpp @@ -157,8 +157,6 @@ void QDeclarativeGeoMapQuickItem::setMap(QDeclarativeGeoMap *quickMap, QGeoMap * { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map && quickMap) { - connect(quickMap, SIGNAL(heightChanged()), this, SLOT(polishAndUpdate())); - connect(quickMap, SIGNAL(widthChanged()), this, SLOT(polishAndUpdate())); connect(map, SIGNAL(cameraDataChanged(QGeoCameraData)), this, SLOT(polishAndUpdate())); polishAndUpdate(); diff --git a/tests/auto/declarative_ui/tst_map_item_details.qml b/tests/auto/declarative_ui/tst_map_item_details.qml index ef11ba6c..68e069d4 100644 --- a/tests/auto/declarative_ui/tst_map_item_details.qml +++ b/tests/auto/declarative_ui/tst_map_item_details.qml @@ -277,7 +277,7 @@ Item { Text {id: progressText} TestCase { - name: "MapItemDeatils" + name: "MapItemDetails" when: windowShown /* @@ -459,19 +459,22 @@ Item { verify(extMapCircleDateline.center.longitude === 180) map.center = datelineCoordinate point = map.fromCoordinate(extMapCircleDateline.center) - verify(point.x == map.width / 2.0) - extMapCircleDateline.center.longitude = datelineCoordinateRight.longitude + verify(point.x == map.width / 2.0) // center of the screen + visualInspectionPoint() + extMapCircleDateline.center.longitude = datelineCoordinateRight.longitude // -170, moving the circle to the right point = map.fromCoordinate(extMapCircleDateline.center) - verify(point.x > map.width / 2.0) verify(LocationTestHelper.waitForPolished(map)) + verify(point.x > map.width / 2.0) + visualInspectionPoint() mousePress(map, point.x, point.y) - for (i=0; i < 40; i += 4) { + for (i=0; i < 50; i += 4) { wait(1) mouseMove(map, point.x - i, point.y) } mouseRelease(map, point.x - i, point.y) verify(LocationTestHelper.waitForPolished(map)) point = map.fromCoordinate(extMapCircleDateline.center) + visualInspectionPoint() verify(point.x < map.width / 2.0) map.removeMapItem(extMapCircleDateline) @@ -481,18 +484,21 @@ Item { verify(extMapQuickItemDateline.coordinate.longitude === 175) point = map.fromCoordinate(extMapQuickItemDateline.coordinate) verify(point.x < map.width / 2.0) + visualInspectionPoint() extMapQuickItemDateline.coordinate.longitude = datelineCoordinateRight.longitude point = map.fromCoordinate(extMapQuickItemDateline.coordinate) verify(point.x > map.width / 2.0) verify(LocationTestHelper.waitForPolished(map)) + visualInspectionPoint() mousePress(map, point.x + 5, point.y + 5) - for (i=0; i < 50; i += 5) { + for (i=0; i < 64; i += 5) { wait(1) mouseMove(map, point.x + 5 - i, point.y + 5 ) } mouseRelease(map, point.x + 5 - i, point.y + 5) verify(LocationTestHelper.waitForPolished(map)) point = map.fromCoordinate(extMapQuickItemDateline.coordinate) + visualInspectionPoint() verify(point.x < map.width / 2.0) map.removeMapItem(extMapQuickItemDateline) @@ -585,5 +591,15 @@ Item { console.log('map fuzzy cmp returns false for value, ref, tolerance: ' + val + ', ' + ref + ', ' + tolerance) return false; } + // call to visualInspectionPoint testcase (for dev time visual inspection) + function visualInspectionPoint(time) { + var waitTime = 0 // 300 + if (time !== undefined) + waitTime = time + if (waitTime > 0) { + console.log('halting for ' + waitTime + ' milliseconds') + wait (waitTime) + } + } } } |