summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/imports/location/location.cpp6
-rw-r--r--src/imports/location/plugins.qmltypes14
-rw-r--r--src/imports/location/qdeclarativegeomap.cpp6
-rw-r--r--src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp4
-rw-r--r--src/imports/positioning/plugins.qmltypes4
-rw-r--r--src/imports/positioning/positioning.cpp2
-rw-r--r--src/location/doc/qtlocation.qdocconf2
-rw-r--r--src/plugins/position/corelocation/qgeopositioninfosource_cl.mm2
-rw-r--r--src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp14
-rw-r--r--src/plugins/position/winrt/winrt.pro1
-rw-r--r--src/positioning/doc/qtpositioning.qdocconf2
11 files changed, 40 insertions, 17 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index f299d153..b42933f0 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -153,9 +153,6 @@ public:
// 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
- // Register the 5.5 types
- // Implicitly registers 5.3 & 5.4
-
minor = 5;
//TODO: this is broken QTBUG-50990
qmlRegisterUncreatableType<QDeclarativeGeoMapType, 1>(uri, major, minor, "MapType",
@@ -165,6 +162,9 @@ public:
qmlRegisterUncreatableType<QQuickGeoMapGestureArea, 1>(uri, major, minor, "MapGestureArea",
QStringLiteral("(Map)GestureArea is not intended instantiable by developer."));
+ // Register the 5.7 types
+ minor = 7;
+ qmlRegisterType<QDeclarativeGeoManeuver>(uri, major, minor, "RouteManeuver");
//registrations below are version independent
qRegisterMetaType<QPlaceCategory>();
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index 61a1cd28..4e8749da 100644
--- a/src/imports/location/plugins.qmltypes
+++ b/src/imports/location/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtLocation 5.6'
+// 'qmlplugindump -nonrelocatable QtLocation 5.7'
Module {
dependencies: ["QtQuick 2.0"]
@@ -93,8 +93,11 @@ Module {
Component {
name: "QDeclarativeGeoManeuver"
prototype: "QObject"
- exports: ["QtLocation/RouteManeuver 5.0"]
- exportMetaObjectRevisions: [0]
+ exports: [
+ "QtLocation/RouteManeuver 5.0",
+ "QtLocation/RouteManeuver 5.7"
+ ]
+ exportMetaObjectRevisions: [0, 0]
Enum {
name: "Direction"
values: {
@@ -144,6 +147,7 @@ Module {
Property { name: "error"; type: "QGeoServiceProvider::Error"; isReadonly: true }
Property { name: "errorString"; type: "string"; isReadonly: true }
Property { name: "visibleRegion"; type: "QGeoShape" }
+ Property { name: "copyrightsVisible"; type: "bool" }
Property { name: "color"; type: "QColor" }
Signal {
name: "pluginChanged"
@@ -162,6 +166,10 @@ Module {
Parameter { name: "link"; type: "string" }
}
Signal {
+ name: "copyrightsVisibleChanged"
+ Parameter { name: "visible"; type: "bool" }
+ }
+ Signal {
name: "colorChanged"
Parameter { name: "color"; type: "QColor" }
}
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index c72e5666..545ef608 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -684,7 +684,7 @@ void QDeclarativeGeoMap::setZoomLevel(qreal zoomLevel)
//small optiomatization to avoid double setCameraData
bool centerHasChanged = false;
- if (m_map) {
+ if (m_initialized) {
m_cameraData.setZoomLevel(qBound(minimumZoomLevel(), zoomLevel, maximumZoomLevel()));
m_maximumViewportLatitude = m_map->maximumLatitudeForZoom(m_cameraData.zoomLevel());
QGeoCoordinate coord = m_cameraData.center();
@@ -724,7 +724,7 @@ void QDeclarativeGeoMap::setCenter(const QGeoCoordinate &center)
if (!center.isValid())
return;
- if (m_map) {
+ if (m_initialized) {
QGeoCoordinate coord(center);
coord.setLatitude(qBound(-m_maximumViewportLatitude, center.latitude(), m_maximumViewportLatitude));
m_cameraData.setCenter(coord);
@@ -799,6 +799,8 @@ QGeoShape QDeclarativeGeoMap::visibleRegion() const
\note Many map providers require the notice to be visible as part of the terms and conditions.
Please consult the relevant provider documentation before turning this notice off.
+
+ \since 5.7
*/
void QDeclarativeGeoMap::setCopyrightsVisible(bool visible)
{
diff --git a/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp b/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp
index 8e0f3b1e..289ea3d9 100644
--- a/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp
+++ b/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp
@@ -50,8 +50,8 @@ QDeclarativeGeoMapCopyrightNotice::QDeclarativeGeoMapCopyrightNotice(QQuickItem
{
QQuickAnchors *anchors = property("anchors").value<QQuickAnchors *>();
if (anchors) {
- anchors->setLeft(QQuickAnchorLine(parent, QQuickAnchorLine::Left));
- anchors->setBottom(QQuickAnchorLine(parent, QQuickAnchorLine::Bottom));
+ anchors->setLeft(QQuickAnchorLine(parent, QQuickAnchors::LeftAnchor));
+ anchors->setBottom(QQuickAnchorLine(parent, QQuickAnchors::BottomAnchor));
}
}
diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index c3451c2a..55fcbba2 100644
--- a/src/imports/positioning/plugins.qmltypes
+++ b/src/imports/positioning/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtPositioning 5.6'
+// 'qmlplugindump -nonrelocatable QtPositioning 5.7'
Module {
dependencies: ["QtQuick 2.0"]
@@ -106,7 +106,7 @@ Module {
"QtPositioning/Position 5.0",
"QtPositioning/Position 5.3",
"QtPositioning/Position 5.4",
- "QtPositioning/Position 5.6"
+ "QtPositioning/Position 5.7"
]
exportMetaObjectRevisions: [0, 1, 2, 2]
Property { name: "latitudeValid"; type: "bool"; isReadonly: true }
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 8a4fef47..5137da22 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -553,7 +553,7 @@ public:
minor = 4;
qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
- minor = 6;
+ minor = 7;
qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
} else {
qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri);
diff --git a/src/location/doc/qtlocation.qdocconf b/src/location/doc/qtlocation.qdocconf
index abe48974..695860a0 100644
--- a/src/location/doc/qtlocation.qdocconf
+++ b/src/location/doc/qtlocation.qdocconf
@@ -41,7 +41,7 @@ sourcedirs += .. \
../../imports/location \
../../plugins/geoservices/nokia
-examplesinstallpath = qtlocation/location
+examplesinstallpath = location
exampledirs += ../../../examples/location \
snippets/
diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
index d94d3fe6..54a079a2 100644
--- a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
+++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
@@ -112,7 +112,7 @@ QGeoPositionInfoSourceCL::QGeoPositionInfoSourceCL(QObject *parent)
, m_started(false)
, m_updateTimer(0)
, m_updateTimeout(0)
- , m_positionError(QGeoPositionInfoSource::UnknownSourceError)
+ , m_positionError(QGeoPositionInfoSource::NoError)
{
}
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
index 5dbbacb5..245d855e 100644
--- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
+++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
@@ -39,7 +39,9 @@
#include <QCoreApplication>
#include <QMutex>
#include <qfunctions_winrt.h>
+#ifdef Q_OS_WINRT
#include <private/qeventdispatcher_winrt_p.h>
+#endif
#include <functional>
#include <windows.system.h>
@@ -64,6 +66,16 @@ QT_BEGIN_NAMESPACE
Q_DECLARE_METATYPE(QGeoPositionInfo)
+#ifndef Q_OS_WINRT
+namespace QEventDispatcherWinRT {
+HRESULT runOnXamlThread(const std::function<HRESULT ()> &delegate, bool waitForRun = true)
+{
+ Q_UNUSED(waitForRun);
+ return delegate();
+}
+}
+#endif
+
class QGeoPositionInfoSourceWinRTPrivate {
public:
ComPtr<IGeolocator> locator;
@@ -490,7 +502,7 @@ HRESULT QGeoPositionInfoSourceWinRT::onStatusChanged(IGeolocator*, IStatusChange
bool QGeoPositionInfoSourceWinRT::requestAccess() const
{
-#if _MSC_VER >= 1900
+#if _MSC_VER >= 1900 && defined(Q_OS_WINRT)
static GeolocationAccessStatus accessStatus = GeolocationAccessStatus_Unspecified;
static ComPtr<IGeolocatorStatics> statics;
diff --git a/src/plugins/position/winrt/winrt.pro b/src/plugins/position/winrt/winrt.pro
index bc740671..5e02ec9a 100644
--- a/src/plugins/position/winrt/winrt.pro
+++ b/src/plugins/position/winrt/winrt.pro
@@ -12,4 +12,5 @@ OTHER_FILES += \
PLUGIN_TYPE = position
PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryWinRT
+win32-msvc201*: LIBS += runtimeobject.lib
load(qt_plugin)
diff --git a/src/positioning/doc/qtpositioning.qdocconf b/src/positioning/doc/qtpositioning.qdocconf
index 1645c092..608b30a1 100644
--- a/src/positioning/doc/qtpositioning.qdocconf
+++ b/src/positioning/doc/qtpositioning.qdocconf
@@ -40,7 +40,7 @@ headerdirs += .. \
sourcedirs += .. \
../../imports/positioning
-examplesinstallpath = qtlocation/positioning
+examplesinstallpath = positioning
exampledirs += ../../../examples/positioning \
snippets/
View Lorry Controller Status