From cc02a7a580968125717fe682c738a2dfc7adc471 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 28 Apr 2016 16:03:40 +0200 Subject: A new QGeoPositionInfoSourceCL should be initialized with NoError. Change-Id: Ide4ccacd9d7d6a8fe86d190723fcd94ddab9f6d6 Task-number: QTBUG-53059 Reviewed-by: Alex Blasche --- src/plugins/position/corelocation/qgeopositioninfosource_cl.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm index 0e5e261b..07b595eb 100644 --- a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm +++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm @@ -103,7 +103,7 @@ QGeoPositionInfoSourceCL::QGeoPositionInfoSourceCL(QObject *parent) , m_started(false) , m_updateTimer(0) , m_updateTimeout(0) - , m_positionError(QGeoPositionInfoSource::UnknownSourceError) + , m_positionError(QGeoPositionInfoSource::NoError) { } -- cgit v1.2.1 From 683b36f957d10e1282b81247681f81f49f46e2d2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 20:43:56 +0200 Subject: fix example installs Change-Id: Ie482e84b0552608239a032ec95b44665997a0c01 Reviewed-by: Alex Blasche --- examples/positioning/geoflickr/geoflickr.pro | 2 +- examples/positioning/satelliteinfo/satelliteinfo.pro | 2 +- 2 files changed, 2 insertions(+), 2 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 -- cgit v1.2.1 From e4d81901b3dcbd6ce4a9ea4fc4bd32d75d9e0aef Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 22 Apr 2016 20:54:25 +0200 Subject: make use of COPIES Change-Id: Ie1fe505d7b07a66e41ed7968275feaa98abe46d2 Reviewed-by: Joerg Bornemann --- tests/plugins/imports.pri | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 } -- cgit v1.2.1 From 5dcd3d8526c7b8c7ac59a743f82130008d254d14 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 May 2016 19:44:46 +0200 Subject: decruft project file the "created by qt creator" header is not supposed to be checked in. Change-Id: Ib5cc25c57d3d096f818d67169ec98c9f3cb75c47 Reviewed-by: Joerg Bornemann --- tests/auto/qmlinterface/qmlinterface.pro | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/auto/qmlinterface/qmlinterface.pro b/tests/auto/qmlinterface/qmlinterface.pro index 882ef737..dbe3f7d9 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 -- cgit v1.2.1 From ee6a7e5da5f2f7423beeb9de8150ae1be3a7b309 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 18 May 2016 09:53:04 +0200 Subject: Windows: Skip flaky tests in declarative_ui. Task-number: QTBUG-53455 Change-Id: Ib65496de7e59341fe4ed8a443aed10fe4b2a63d4 Reviewed-by: Liang Qi Reviewed-by: Alex Blasche --- tests/auto/declarative_ui/tst_map_item_details.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/auto/declarative_ui/tst_map_item_details.qml b/tests/auto/declarative_ui/tst_map_item_details.qml index 20849079..b29b3a82 100644 --- a/tests/auto/declarative_ui/tst_map_item_details.qml +++ b/tests/auto/declarative_ui/tst_map_item_details.qml @@ -412,6 +412,8 @@ Item { */ function test_yz_dateline() { + if (Qt.platform.os === "windows") + skip("QTBUG-53455"); map.clearMapItems() clear_data() map.center = datelineCoordinate @@ -593,6 +595,8 @@ Item { */ function test_zz_border_drag() { + if (Qt.platform.os === "windows") + skip("QTBUG-53455"); map.clearMapItems() clear_data() map.center = datelineCoordinate -- cgit v1.2.1 From 95aba99a384728c9deaa349929508bcafb898505 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 10 May 2016 14:54:27 +0200 Subject: Doc: Remove repository name from examplesinstallpath Examples in binary packages now directly match the install path. Change-Id: I9315d395c4546adfa58e264f66d98fb443ab1e72 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko --- src/location/doc/qtlocation.qdocconf | 2 +- src/positioning/doc/qtpositioning.qdocconf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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/ -- cgit v1.2.1 From 1ca6bf3bdef8c95e12a5ee93ed69e4983a1df017 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 17 May 2016 11:01:39 +0200 Subject: winrt: Enable compilation with desktop mkspec The GeoPosition API is functional for desktop builds as well, running on Windows 8 and later. While the plugin builds for desktop, do not enable its compilation by default as support is experimental. Change-Id: I5ccd3f857ff3f0cfd1e220875c39883b89f5f2ce Reviewed-by: Friedemann Kleint Reviewed-by: Oliver Wolff Reviewed-by: Alex Blasche --- .../position/winrt/qgeopositioninfosource_winrt.cpp | 14 +++++++++++++- src/plugins/position/winrt/winrt.pro | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) 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 #include #include +#ifdef Q_OS_WINRT #include +#endif #include #include @@ -64,6 +66,16 @@ QT_BEGIN_NAMESPACE Q_DECLARE_METATYPE(QGeoPositionInfo) +#ifndef Q_OS_WINRT +namespace QEventDispatcherWinRT { +HRESULT runOnXamlThread(const std::function &delegate, bool waitForRun = true) +{ + Q_UNUSED(waitForRun); + return delegate(); +} +} +#endif + class QGeoPositionInfoSourceWinRTPrivate { public: ComPtr 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 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) -- cgit v1.2.1