Merge remote-tracking branch 'gerrit/5.7' into 5.7.0

Change-Id: I6b00be91197a07a2f8d5680c4f9129a7b382510f

10 files changed, 26 insertions, 18 deletions

diff --git a/examples/positioning/geoflickr/geoflickr.pro b/examples/positioning/geoflickr/geoflickr.pro
index 97e8b57f..4bbb7959 100644
--- a/examples/positioning/geoflickr/geoflickr.pro
+++ b/examples/positioning/geoflickr/geoflickr.pro
@@ -11,5 +11,5 @@ OTHER_FILES += flickr.qml \
                flickrcommon/* \
                flickrmobile/*
 
-target.path = $$[QT_INSTALL_EXAMPLES]/positioning/flickr
+target.path = $$[QT_INSTALL_EXAMPLES]/positioning/geoflickr
 INSTALLS += target
diff --git a/examples/positioning/satelliteinfo/satelliteinfo.pro b/examples/positioning/satelliteinfo/satelliteinfo.pro
index fe4f728e..4aef9d0e 100644
--- a/examples/positioning/satelliteinfo/satelliteinfo.pro
+++ b/examples/positioning/satelliteinfo/satelliteinfo.pro
@@ -15,7 +15,7 @@ OTHER_FILES += \
 RESOURCES += \
     satelliteinfo.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/satelliteinfo
+target.path = $$[QT_INSTALL_EXAMPLES]/positioning/satelliteinfo
 INSTALLS += target
 
 
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/
diff --git a/tests/auto/declarative_ui/tst_map_item_details.qml b/tests/auto/declarative_ui/tst_map_item_details.qml
index 586d7018..1758c954 100644
--- a/tests/auto/declarative_ui/tst_map_item_details.qml
+++ b/tests/auto/declarative_ui/tst_map_item_details.qml
@@ -407,6 +407,8 @@ Item {
 
      */
         function test_yz_dateline() {
+            if (Qt.platform.os === "windows")
+                skip("QTBUG-53455");
             map.clearMapItems()
             clear_data()
             map.center = datelineCoordinate
@@ -588,6 +590,8 @@ Item {
 
      */
         function test_zz_border_drag() {
+            if (Qt.platform.os === "windows")
+                skip("QTBUG-53455");
             map.clearMapItems()
             clear_data()
             map.center = datelineCoordinate
diff --git a/tests/auto/qmlinterface/qmlinterface.pro b/tests/auto/qmlinterface/qmlinterface.pro
index c95547ed..9f1acad8 100644
--- a/tests/auto/qmlinterface/qmlinterface.pro
+++ b/tests/auto/qmlinterface/qmlinterface.pro
@@ -1,9 +1,3 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2011-11-09T15:45:51
-#
-#-------------------------------------------------
-
 QT       += location qml testlib
 
 #QT       -= gui
diff --git a/tests/plugins/imports.pri b/tests/plugins/imports.pri
index e7ff1d42..00f93330 100644
--- a/tests/plugins/imports.pri
+++ b/tests/plugins/imports.pri
@@ -1,8 +1,5 @@
 !contains(DESTDIR, $$[QT_INSTALL_QML]/$$TARGETPATH) {
-    copyimportfiles.input = IMPORT_FILES
-    copyimportfiles.output = $$DESTDIR/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
-    copyimportfiles.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-    copyimportfiles.CONFIG += no_link_no_clean
-    copyimportfiles.variable_out = PRE_TARGETDEPS
-    QMAKE_EXTRA_COMPILERS += copyimportfiles
+    importfiles.files = $$IMPORT_FILES
+    importfiles.path = $$DESTDIR
+    COPIES += importfiles
 }