diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-11 07:47:32 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-11 06:48:58 +0000 |
commit | 26f91fcec40d1bd50febb6ca6853489115f58a3b (patch) | |
tree | 2f6265e26fa9482746e0efb32ef2f693b0d21cff | |
parent | e79664336f35f55a0241fdc0a45c7f15911e4da5 (diff) | |
parent | 4a6807bca5f4452ea7a9d6ed2ff19b8e4259a372 (diff) | |
download | qtlocation-26f91fcec40d1bd50febb6ca6853489115f58a3b.tar.gz |
Merge remote-tracking branch 'gerrit/5.4' into dev
Change-Id: I5ef7649f02455269a8e2caa2f2d2241503586be3
71 files changed, 110 insertions, 75 deletions
@@ -44,7 +44,7 @@ qrc_*.cpp doc/src/snippets/cpp/cppsnippet doc/src/snippets/places/placescppsnippet examples/location/places_list/places_list -examples/positioning/flickr/qml_position_flickr +examples/positioning/geoflickr/geoflickr examples/location/places_map/places_map examples/positioning/logfilepositionsource/logfilepositionsource examples/positioning/weatherinfo/weatherinfo diff --git a/dist/changes-5.4.1 b/dist/changes-5.4.1 new file mode 100644 index 00000000..4876ab3e --- /dev/null +++ b/dist/changes-5.4.1 @@ -0,0 +1,29 @@ +Qt 5.4.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.4.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.4 + +The Qt version 5.4 series is binary compatible with the 5.3.x series. +Applications compiled for 5.3 will continue to run with 5.4. + +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 * +**************************************************************************** + +QtPositioning +------------- + + - PositionSource: + * Fixed a case where an NMEA source file, which is integrated + using qrc, was not loaded. diff --git a/examples/positioning/flickr/flickr-90.qml b/examples/positioning/geoflickr/flickr-90.qml index 24e61c04..24e61c04 100644 --- a/examples/positioning/flickr/flickr-90.qml +++ b/examples/positioning/geoflickr/flickr-90.qml diff --git a/examples/positioning/flickr/flickr.qml b/examples/positioning/geoflickr/flickr.qml index 0960b4c9..0960b4c9 100644 --- a/examples/positioning/flickr/flickr.qml +++ b/examples/positioning/geoflickr/flickr.qml diff --git a/examples/positioning/flickr/flickr.qrc b/examples/positioning/geoflickr/flickr.qrc index 1019f7d8..1019f7d8 100644 --- a/examples/positioning/flickr/flickr.qrc +++ b/examples/positioning/geoflickr/flickr.qrc diff --git a/examples/positioning/flickr/flickrcommon/Progress.qml b/examples/positioning/geoflickr/flickrcommon/Progress.qml index 33dfadf7..33dfadf7 100644 --- a/examples/positioning/flickr/flickrcommon/Progress.qml +++ b/examples/positioning/geoflickr/flickrcommon/Progress.qml diff --git a/examples/positioning/flickr/flickrcommon/RestModel.qml b/examples/positioning/geoflickr/flickrcommon/RestModel.qml index 26bdf1e4..26bdf1e4 100644 --- a/examples/positioning/flickr/flickrcommon/RestModel.qml +++ b/examples/positioning/geoflickr/flickrcommon/RestModel.qml diff --git a/examples/positioning/flickr/flickrcommon/ScrollBar.qml b/examples/positioning/geoflickr/flickrcommon/ScrollBar.qml index fd67f557..fd67f557 100644 --- a/examples/positioning/flickr/flickrcommon/ScrollBar.qml +++ b/examples/positioning/geoflickr/flickrcommon/ScrollBar.qml diff --git a/examples/positioning/flickr/flickrcommon/Slider.qml b/examples/positioning/geoflickr/flickrcommon/Slider.qml index f01ed53a..f01ed53a 100644 --- a/examples/positioning/flickr/flickrcommon/Slider.qml +++ b/examples/positioning/geoflickr/flickrcommon/Slider.qml diff --git a/examples/positioning/flickr/flickrmobile/Button.qml b/examples/positioning/geoflickr/flickrmobile/Button.qml index c24877ea..c24877ea 100644 --- a/examples/positioning/flickr/flickrmobile/Button.qml +++ b/examples/positioning/geoflickr/flickrmobile/Button.qml diff --git a/examples/positioning/flickr/flickrmobile/GeoTab.qml b/examples/positioning/geoflickr/flickrmobile/GeoTab.qml index 53066190..53066190 100644 --- a/examples/positioning/flickr/flickrmobile/GeoTab.qml +++ b/examples/positioning/geoflickr/flickrmobile/GeoTab.qml diff --git a/examples/positioning/flickr/flickrmobile/GridDelegate.qml b/examples/positioning/geoflickr/flickrmobile/GridDelegate.qml index 54f6b0eb..54f6b0eb 100644 --- a/examples/positioning/flickr/flickrmobile/GridDelegate.qml +++ b/examples/positioning/geoflickr/flickrmobile/GridDelegate.qml diff --git a/examples/positioning/flickr/flickrmobile/ImageDetails.qml b/examples/positioning/geoflickr/flickrmobile/ImageDetails.qml index a06d66a5..a06d66a5 100644 --- a/examples/positioning/flickr/flickrmobile/ImageDetails.qml +++ b/examples/positioning/geoflickr/flickrmobile/ImageDetails.qml diff --git a/examples/positioning/flickr/flickrmobile/ListDelegate.qml b/examples/positioning/geoflickr/flickrmobile/ListDelegate.qml index baec7205..baec7205 100644 --- a/examples/positioning/flickr/flickrmobile/ListDelegate.qml +++ b/examples/positioning/geoflickr/flickrmobile/ListDelegate.qml diff --git a/examples/positioning/flickr/flickrmobile/TitleBar.qml b/examples/positioning/geoflickr/flickrmobile/TitleBar.qml index f304d88f..4ebc438e 100644 --- a/examples/positioning/flickr/flickrmobile/TitleBar.qml +++ b/examples/positioning/geoflickr/flickrmobile/TitleBar.qml @@ -66,7 +66,7 @@ Item { verticalCenter: parent.verticalCenter } elide: Text.ElideLeft - text: "Declarative location Flickr" + text: "GeoFlickr (QML)" font.bold: true; color: "White"; style: Text.Raised; styleColor: "Black" } } diff --git a/examples/positioning/flickr/flickrmobile/ToolBar.qml b/examples/positioning/geoflickr/flickrmobile/ToolBar.qml index bdc53ef7..bdc53ef7 100644 --- a/examples/positioning/flickr/flickrmobile/ToolBar.qml +++ b/examples/positioning/geoflickr/flickrmobile/ToolBar.qml diff --git a/examples/positioning/flickr/flickrmobile/images/gloss.png b/examples/positioning/geoflickr/flickrmobile/images/gloss.png Binary files differindex 5d370cd9..5d370cd9 100644 --- a/examples/positioning/flickr/flickrmobile/images/gloss.png +++ b/examples/positioning/geoflickr/flickrmobile/images/gloss.png diff --git a/examples/positioning/flickr/flickrmobile/images/lineedit.png b/examples/positioning/geoflickr/flickrmobile/images/lineedit.png Binary files differindex 2cc38dc3..2cc38dc3 100644 --- a/examples/positioning/flickr/flickrmobile/images/lineedit.png +++ b/examples/positioning/geoflickr/flickrmobile/images/lineedit.png diff --git a/examples/positioning/flickr/flickrmobile/images/lineedit.sci b/examples/positioning/geoflickr/flickrmobile/images/lineedit.sci index 054bff78..054bff78 100644 --- a/examples/positioning/flickr/flickrmobile/images/lineedit.sci +++ b/examples/positioning/geoflickr/flickrmobile/images/lineedit.sci diff --git a/examples/positioning/flickr/flickrmobile/images/moon.png b/examples/positioning/geoflickr/flickrmobile/images/moon.png Binary files differindex 9407b2b4..9407b2b4 100644 --- a/examples/positioning/flickr/flickrmobile/images/moon.png +++ b/examples/positioning/geoflickr/flickrmobile/images/moon.png diff --git a/examples/positioning/flickr/flickrmobile/images/quit.png b/examples/positioning/geoflickr/flickrmobile/images/quit.png Binary files differindex 5bda1b6e..5bda1b6e 100644 --- a/examples/positioning/flickr/flickrmobile/images/quit.png +++ b/examples/positioning/geoflickr/flickrmobile/images/quit.png diff --git a/examples/positioning/flickr/flickrmobile/images/star.png b/examples/positioning/geoflickr/flickrmobile/images/star.png Binary files differindex 27ef9242..27ef9242 100644 --- a/examples/positioning/flickr/flickrmobile/images/star.png +++ b/examples/positioning/geoflickr/flickrmobile/images/star.png diff --git a/examples/positioning/flickr/flickrmobile/images/stripes.png b/examples/positioning/geoflickr/flickrmobile/images/stripes.png Binary files differindex 9f36727e..9f36727e 100644 --- a/examples/positioning/flickr/flickrmobile/images/stripes.png +++ b/examples/positioning/geoflickr/flickrmobile/images/stripes.png diff --git a/examples/positioning/flickr/flickrmobile/images/sun.png b/examples/positioning/geoflickr/flickrmobile/images/sun.png Binary files differindex 7713ca5c..7713ca5c 100644 --- a/examples/positioning/flickr/flickrmobile/images/sun.png +++ b/examples/positioning/geoflickr/flickrmobile/images/sun.png diff --git a/examples/positioning/flickr/flickrmobile/images/titlebar.png b/examples/positioning/geoflickr/flickrmobile/images/titlebar.png Binary files differindex 51c90082..51c90082 100644 --- a/examples/positioning/flickr/flickrmobile/images/titlebar.png +++ b/examples/positioning/geoflickr/flickrmobile/images/titlebar.png diff --git a/examples/positioning/flickr/flickrmobile/images/titlebar.sci b/examples/positioning/geoflickr/flickrmobile/images/titlebar.sci index 0418d94c..0418d94c 100644 --- a/examples/positioning/flickr/flickrmobile/images/titlebar.sci +++ b/examples/positioning/geoflickr/flickrmobile/images/titlebar.sci diff --git a/examples/positioning/flickr/flickrmobile/images/toolbutton.png b/examples/positioning/geoflickr/flickrmobile/images/toolbutton.png Binary files differindex 11310013..11310013 100644 --- a/examples/positioning/flickr/flickrmobile/images/toolbutton.png +++ b/examples/positioning/geoflickr/flickrmobile/images/toolbutton.png diff --git a/examples/positioning/flickr/flickrmobile/images/toolbutton.sci b/examples/positioning/geoflickr/flickrmobile/images/toolbutton.sci index 9e4f9653..9e4f9653 100644 --- a/examples/positioning/flickr/flickrmobile/images/toolbutton.sci +++ b/examples/positioning/geoflickr/flickrmobile/images/toolbutton.sci diff --git a/examples/positioning/flickr/flickrmobile/nmealog.txt b/examples/positioning/geoflickr/flickrmobile/nmealog.txt index 8c8286dd..8c8286dd 100644 --- a/examples/positioning/flickr/flickrmobile/nmealog.txt +++ b/examples/positioning/geoflickr/flickrmobile/nmealog.txt diff --git a/examples/positioning/flickr/flickr.pro b/examples/positioning/geoflickr/geoflickr.pro index 1d7cce50..97e8b57f 100644 --- a/examples/positioning/flickr/flickr.pro +++ b/examples/positioning/geoflickr/geoflickr.pro @@ -1,5 +1,5 @@ -TEMPLATE=app -TARGET = qml_position_flickr +TEMPLATE = app +TARGET = geoflickr QT += qml quick network positioning SOURCES += qmllocationflickr.cpp diff --git a/examples/positioning/flickr/flickr.qmlproject b/examples/positioning/geoflickr/geoflickr.qmlproject index d4909f86..d4909f86 100644 --- a/examples/positioning/flickr/flickr.qmlproject +++ b/examples/positioning/geoflickr/geoflickr.qmlproject diff --git a/examples/positioning/flickr/qmllocationflickr.cpp b/examples/positioning/geoflickr/qmllocationflickr.cpp index 6ecd727a..6ecd727a 100644 --- a/examples/positioning/flickr/qmllocationflickr.cpp +++ b/examples/positioning/geoflickr/qmllocationflickr.cpp diff --git a/examples/positioning/positioning.pro b/examples/positioning/positioning.pro index 2f40d326..0e436b46 100644 --- a/examples/positioning/positioning.pro +++ b/examples/positioning/positioning.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs qtHaveModule(widgets): SUBDIRS += logfilepositionsource -qtHaveModule(quick): SUBDIRS += flickr weatherinfo satelliteinfo +qtHaveModule(quick): SUBDIRS += geoflickr weatherinfo satelliteinfo diff --git a/src/imports/positioning/qdeclarativeposition.cpp b/src/imports/positioning/qdeclarativeposition.cpp index 04b42cbc..ee971c01 100644 --- a/src/imports/positioning/qdeclarativeposition.cpp +++ b/src/imports/positioning/qdeclarativeposition.cpp @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE \section2 Example Usage See the example given for the \l{PositionSource} type, or the - \l{flickr}{Flickr} example application. + \l{geoflickr}{GeoFlickr} example application. \sa PositionSource, coordinate */ diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp index a770e664..f42518f3 100644 --- a/src/imports/positioning/qdeclarativepositionsource.cpp +++ b/src/imports/positioning/qdeclarativepositionsource.cpp @@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE } \endcode - The \l{flickr}{Flickr} example application shows how to use + The \l{geoflickr}{GeoFlickr} example application shows how to use a PositionSource in your application to retrieve local data for users from a REST web service. @@ -243,7 +243,7 @@ void QDeclarativePositionSource::setNmeaSource(const QUrl &nmeaSource) } else if (localFileName.startsWith("qrc:/")) { localFileName.remove(0, 5); } - if (!QFile::exists(localFileName) && localFileName.startsWith("/")) { + if (!QFile::exists(localFileName) && localFileName.startsWith('/')) { localFileName.remove(0,1); } } diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h index 821c755d..d40723af 100644 --- a/src/location/maps/qgeocodingmanager.h +++ b/src/location/maps/qgeocodingmanager.h @@ -37,9 +37,9 @@ #include <QtLocation/QGeoCodeReply> #include <QtPositioning/QGeoRectangle> -#include <QObject> -#include <QList> -#include <QMap> +#include <QtCore/QObject> +#include <QtCore/QList> +#include <QtCore/QMap> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h index 7b569cdc..cc1a4be1 100644 --- a/src/location/maps/qgeomaneuver.h +++ b/src/location/maps/qgeomaneuver.h @@ -34,7 +34,7 @@ #ifndef QGEOMANEUVER_H #define QGEOMANEUVER_H -#include <qshareddata.h> +#include <QtCore/qshareddata.h> #include <QtLocation/qlocationglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h index 46365027..669723f9 100644 --- a/src/location/maps/qgeoroute.h +++ b/src/location/maps/qgeoroute.h @@ -37,9 +37,9 @@ #include <QtPositioning/QGeoCoordinate> #include <QtLocation/QGeoRouteRequest> -#include <QExplicitlySharedDataPointer> -#include <QList> -#include <QHash> +#include <QtCore/QExplicitlySharedDataPointer> +#include <QtCore/QList> +#include <QtCore/QHash> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h index 532226a7..06a74d4f 100644 --- a/src/location/maps/qgeoroutereply.h +++ b/src/location/maps/qgeoroutereply.h @@ -36,8 +36,8 @@ #include <QtLocation/QGeoRoute> -#include <QList> -#include <QObject> +#include <QtCore/QList> +#include <QtCore/QObject> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h index e510d5bb..bb847274 100644 --- a/src/location/maps/qgeorouterequest.h +++ b/src/location/maps/qgeorouterequest.h @@ -34,9 +34,9 @@ #ifndef QGEOROUTEREQUEST_H #define QGEOROUTEREQUEST_H -#include <QList> -#include <QExplicitlySharedDataPointer> -#include <QDateTime> +#include <QtCore/QList> +#include <QtCore/QExplicitlySharedDataPointer> +#include <QtCore/QDateTime> #include <QtLocation/qlocationglobal.h> #include <QtPositioning/qgeocoordinate.h> diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h index f6d29a58..ccc1c1d6 100644 --- a/src/location/maps/qgeoroutesegment.h +++ b/src/location/maps/qgeoroutesegment.h @@ -34,8 +34,8 @@ #ifndef QGEOROUTESEGMENT_H #define QGEOROUTESEGMENT_H -#include <QExplicitlySharedDataPointer> -#include <QList> +#include <QtCore/QExplicitlySharedDataPointer> +#include <QtCore/QList> #include <QtLocation/qlocationglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index b72aed26..d828d62c 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -58,7 +58,6 @@ #include <QMetaEnum> #include <QProcess> #include <QEventLoop> -#include <QString> #include <QtCore/private/qfactoryloader_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h index 2b539fa2..bbde8904 100644 --- a/src/location/maps/qgeoserviceproviderfactory.h +++ b/src/location/maps/qgeoserviceproviderfactory.h @@ -36,9 +36,9 @@ #include <QtLocation/QGeoServiceProvider> -#include <QtPlugin> -#include <QMap> -#include <QString> +#include <QtCore/QtPlugin> +#include <QtCore/QMap> +#include <QtCore/QString> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplaceattribute.h b/src/location/places/qplaceattribute.h index da6a7c06..43fd2e47 100644 --- a/src/location/places/qplaceattribute.h +++ b/src/location/places/qplaceattribute.h @@ -34,9 +34,9 @@ #ifndef QPLACEATTRIBUTE_H #define QPLACEATTRIBUTE_H -#include <QString> -#include <QVariant> -#include <QSharedDataPointer> +#include <QtCore/QString> +#include <QtCore/QVariant> +#include <QtCore/QSharedDataPointer> #include <QtLocation/qlocationglobal.h> diff --git a/src/location/places/qplacecontactdetail.h b/src/location/places/qplacecontactdetail.h index 8d96bca2..b4729398 100644 --- a/src/location/places/qplacecontactdetail.h +++ b/src/location/places/qplacecontactdetail.h @@ -34,9 +34,9 @@ #ifndef QPLACECONTACTDETAIL_H #define QPLACECONTACTDETAIL_H -#include <QString> -#include <QVariant> -#include <QSharedDataPointer> +#include <QtCore/QString> +#include <QtCore/QVariant> +#include <QtCore/QSharedDataPointer> #include <QtLocation/qlocationglobal.h> diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h index 3724a418..530ee02c 100644 --- a/src/location/places/qplacecontent.h +++ b/src/location/places/qplacecontent.h @@ -35,9 +35,9 @@ #include <QtLocation/qlocationglobal.h> -#include <QMap> -#include <QMetaType> -#include <QSharedDataPointer> +#include <QtCore/QMap> +#include <QtCore/QMetaType> +#include <QtCore/QSharedDataPointer> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h index 95cc8075..23485e0c 100644 --- a/src/location/places/qplacecontentrequest.h +++ b/src/location/places/qplacecontentrequest.h @@ -34,7 +34,7 @@ #ifndef QPLACECONTENTREQUEST_H #define QPLACECONTENTREQUEST_H -#include <QSharedDataPointer> +#include <QtCore/QSharedDataPointer> #include <QtLocation/QPlaceContent> diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h index f6b0758a..d7aa63d6 100644 --- a/src/location/places/qplaceimage.h +++ b/src/location/places/qplaceimage.h @@ -34,8 +34,8 @@ #ifndef QPLACEIMAGE_H #define QPLACEIMAGE_H -#include <QSharedDataPointer> -#include <QString> +#include <QtCore/QSharedDataPointer> +#include <QtCore/QString> #include <QtLocation/QPlaceSupplier> #include <QtLocation/QPlaceContent> diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h index e57a286b..21daadb5 100644 --- a/src/location/places/qplacemanager.h +++ b/src/location/places/qplacemanager.h @@ -45,10 +45,10 @@ #include <QtLocation/QPlaceSearchRequest> #include <QtLocation/QPlaceSearchResult> -#include <QLocale> -#include <QVector> -#include <QString> -#include <QObject> +#include <QtCore/QLocale> +#include <QtCore/QVector> +#include <QtCore/QString> +#include <QtCore/QObject> #include <QtLocation/QPlaceIcon> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h index a3285d9b..92da39f7 100644 --- a/src/location/places/qplacesearchresult.h +++ b/src/location/places/qplacesearchresult.h @@ -34,9 +34,9 @@ #ifndef QPLACESEARCHRESULT_H #define QPLACESEARCHRESULT_H -#include <QSharedDataPointer> -#include <QVariant> -#include <QString> +#include <QtCore/QSharedDataPointer> +#include <QtCore/QVariant> +#include <QtCore/QString> #include <QtLocation/QPlace> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h index e53873c1..950ad040 100644 --- a/src/location/places/qplacesearchsuggestionreply.h +++ b/src/location/places/qplacesearchsuggestionreply.h @@ -36,7 +36,7 @@ #include <QtLocation/QPlaceReply> -#include <QStringList> +#include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp index 7862c470..fec7ba30 100644 --- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp @@ -412,7 +412,7 @@ bool QGeoCodeXmlParser::parseAddress(QGeoAddress *address) } if (inThoroughfare && (m_reader->name() == "number")) { - address->setStreet(m_reader->readElementText() + " " + address->street()); + address->setStreet(m_reader->readElementText() + ' ' + address->street()); if (!m_reader->readNextStartElement()) inThoroughfare = false; } diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp index ce4deaef..f8c29c7b 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp @@ -246,7 +246,7 @@ QStringList QGeoRoutingManagerEngineNokia::calculateRouteRequestString(const QGe baseRequest += QString::number(i); baseRequest += QStringLiteral("=geo!"); baseRequest += trimDouble(request.waypoints().at(i).latitude()); - baseRequest += ","; + baseRequest += ','; baseRequest += trimDouble(request.waypoints().at(i).longitude()); } @@ -283,7 +283,7 @@ QStringList QGeoRoutingManagerEngineNokia::updateRouteRequestString(const QGeoRo baseRequest += "&pos="; baseRequest += QString::number(position.latitude()); - baseRequest += ","; + baseRequest += ','; baseRequest += QString::number(position.longitude()); QGeoRouteRequest::RouteOptimizations optimization = route.request().routeOptimization(); @@ -328,7 +328,7 @@ QString QGeoRoutingManagerEngineNokia::modesRequestString(const QGeoRouteRequest QString weightString = ""; switch (weight) { case QGeoRouteRequest::PreferFeatureWeight: - weightString = "1"; + weightString = '1'; break; case QGeoRouteRequest::AvoidFeatureWeight: weightString = "-1"; @@ -370,9 +370,9 @@ QString QGeoRoutingManagerEngineNokia::modesRequestString(const QGeoRouteRequest } requestString += "&mode="; - requestString += optimization + ";" + modes.join(","); + requestString += optimization + ';' + modes.join(','); if (featureStrings.count()) - requestString += ";" + featureStrings.join(","); + requestString += ';' + featureStrings.join(','); return requestString; } diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.cpp b/src/plugins/geoservices/nokia/qgeouriprovider.cpp index 932818a5..ceb86cf8 100644 --- a/src/plugins/geoservices/nokia/qgeouriprovider.cpp +++ b/src/plugins/geoservices/nokia/qgeouriprovider.cpp @@ -83,7 +83,7 @@ QString QGeoUriProvider::getCurrentHost() const { if (m_maxSubdomains) { QString result(m_firstSubdomain.toLatin1() + qrand() % m_maxSubdomains); - result += "." + m_currentHost; + result += '.' + m_currentHost; return result; } return m_currentHost; diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 099f7995..35b462d4 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs qtHaveModule(positioning): SUBDIRS += position -qtHaveModule(location) SUBDIRS += geoservices +qtHaveModule(location): SUBDIRS += geoservices diff --git a/src/positioning/doc/images/qml-flickr-1.jpg b/src/positioning/doc/images/qml-flickr-1.jpg Binary files differindex 14fc5c92..42514ff0 100644 --- a/src/positioning/doc/images/qml-flickr-1.jpg +++ b/src/positioning/doc/images/qml-flickr-1.jpg diff --git a/src/positioning/doc/src/examples/declarative-flickr.qdoc b/src/positioning/doc/src/examples/geoflickr.qdoc index a1d0bb58..af47461b 100644 --- a/src/positioning/doc/src/examples/declarative-flickr.qdoc +++ b/src/positioning/doc/src/examples/geoflickr.qdoc @@ -26,11 +26,11 @@ ****************************************************************************/ /*! - \example flickr - \title Flickr (QML) + \example geoflickr + \title GeoFlickr (QML) \ingroup qtpositioning-examples - \brief The Flickr example shows how to use the user's current position to + \brief The GeoFlickr example shows how to use the user's current position to fetch local content from a web service. This is a small example, illustrating one of the very core parts of the @@ -54,20 +54,20 @@ GeoTab component (the floating "window" describing current position and status). - \snippet flickr/flickrmobile/GeoTab.qml possrc + \snippet geoflickr/flickrmobile/GeoTab.qml possrc When the "Locate and update" button is pressed, we first interrogate the PositionSource to check if it has an available backend for positioning data. If it does not, we fall back to using a pre-recorded NMEA log for demonstration. We then instruct the PositionSource to update. - \snippet flickr/flickrmobile/GeoTab.qml locatebutton-top - \snippet flickr/flickrmobile/GeoTab.qml locatebutton-clicked + \snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-top + \snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-clicked To share the new position data with the rest of the application, we use properties that we have created on the GeoTab component: - \snippet flickr/flickrmobile/GeoTab.qml props + \snippet geoflickr/flickrmobile/GeoTab.qml props \section1 Using the Current Position @@ -79,7 +79,7 @@ In this case, it retrieves data from the Flickr REST API online, based on our current position - \snippet flickr/flickrcommon/RestModel.qml restmodel + \snippet geoflickr/flickrcommon/RestModel.qml restmodel This model data is then shown in a variety of Qt Quick views to produce the example application. diff --git a/src/positioning/doc/src/qml-position.qdoc b/src/positioning/doc/src/qml-position.qdoc index 3ccac326..ec1cf47a 100644 --- a/src/positioning/doc/src/qml-position.qdoc +++ b/src/positioning/doc/src/qml-position.qdoc @@ -111,9 +111,9 @@ PositionSource { -\section2 \b{Flickr Example} +\section2 \b{GeoFlickr Example} -The \l{Flickr (QML)}{Flickr Example} uses the Location to download thumbnail +The \l{GeoFlickr (QML)}{GeoFlickr Example} uses the Location to download thumbnail images from Flickr relevant to the current location. */ diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc index ae74f89c..5662b0aa 100644 --- a/src/positioning/doc/src/qtpositioning.qdoc +++ b/src/positioning/doc/src/qtpositioning.qdoc @@ -114,7 +114,7 @@ such as speed and direction. This provides the fundamental location information \section2 Examples \list - \li \l {Flickr (QML)} + \li \l {GeoFlickr (QML)} \li \l {Log File Position Source (C++)} \li \l {SatelliteInfo (C++/QML)} \li \l {Weather Info (C++/QML)} diff --git a/src/positioning/qgeoareamonitorsource.h b/src/positioning/qgeoareamonitorsource.h index 642bb4e7..88d01dc8 100644 --- a/src/positioning/qgeoareamonitorsource.h +++ b/src/positioning/qgeoareamonitorsource.h @@ -37,8 +37,8 @@ #include <QtPositioning/QGeoAreaMonitorInfo> #include <QtPositioning/QGeoPositionInfoSource> -#include <QObject> -#include <QStringList> +#include <QtCore/QObject> +#include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeocoordinate.cpp b/src/positioning/qgeocoordinate.cpp index 3ec69744..b604e8b4 100644 --- a/src/positioning/qgeocoordinate.cpp +++ b/src/positioning/qgeocoordinate.cpp @@ -42,8 +42,6 @@ #include <math.h> -#include <QDebug> - #ifndef M_PI #define M_PI 3.14159265358979323846 #endif diff --git a/src/positioning/qgeocoordinate.h b/src/positioning/qgeocoordinate.h index d80e0187..701ba50e 100644 --- a/src/positioning/qgeocoordinate.h +++ b/src/positioning/qgeocoordinate.h @@ -36,7 +36,7 @@ #include <QtCore/QMetaType> #include <QtCore/QString> -#include <QSharedDataPointer> +#include <QtCore/QSharedDataPointer> #include <QtPositioning/qpositioningglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeopositioninfo.h b/src/positioning/qgeopositioninfo.h index 865f5bdf..8debb806 100644 --- a/src/positioning/qgeopositioninfo.h +++ b/src/positioning/qgeopositioninfo.h @@ -35,7 +35,7 @@ #include <QtPositioning/QGeoCoordinate> -#include <QDateTime> +#include <QtCore/QDateTime> QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeopositioninfosource.h b/src/positioning/qgeopositioninfosource.h index f76161cc..e71b766d 100644 --- a/src/positioning/qgeopositioninfosource.h +++ b/src/positioning/qgeopositioninfosource.h @@ -35,7 +35,7 @@ #include <QtPositioning/QGeoPositionInfo> -#include <QObject> +#include <QtCore/QObject> QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeopositioninfosourcefactory.h b/src/positioning/qgeopositioninfosourcefactory.h index 776cd1f3..4db92fe6 100644 --- a/src/positioning/qgeopositioninfosourcefactory.h +++ b/src/positioning/qgeopositioninfosourcefactory.h @@ -37,7 +37,7 @@ #include <QtPositioning/QGeoPositionInfoSource> #include <QtPositioning/QGeoSatelliteInfoSource> #include <QtPositioning/QGeoAreaMonitorSource> -#include <QList> +#include <QtCore/QList> QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeosatelliteinfosource.h b/src/positioning/qgeosatelliteinfosource.h index 7dfd70b6..bd21db4f 100644 --- a/src/positioning/qgeosatelliteinfosource.h +++ b/src/positioning/qgeosatelliteinfosource.h @@ -35,8 +35,8 @@ #include <QtPositioning/QGeoSatelliteInfo> -#include <QObject> -#include <QList> +#include <QtCore/QObject> +#include <QtCore/QList> QT_BEGIN_NAMESPACE diff --git a/tests/auto/geotestplugin/geotestplugin.pro b/tests/auto/geotestplugin/geotestplugin.pro index 4b50989f..0945e4fe 100644 --- a/tests/auto/geotestplugin/geotestplugin.pro +++ b/tests/auto/geotestplugin/geotestplugin.pro @@ -20,3 +20,4 @@ OTHER_FILES += \ geotestplugin.json \ place_data.json DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +RESOURCES += testdata.qrc diff --git a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h index 07a6081c..61984ddc 100644 --- a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h +++ b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h @@ -251,6 +251,7 @@ public: protected: void timerEvent(QTimerEvent *event) { + Q_UNUSED(event); Q_ASSERT(timerId_ == event->timerId()); Q_ASSERT(geocodeReply_); killTimer(timerId_); diff --git a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h index 5974bfa7..841e9b82 100644 --- a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h +++ b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h @@ -167,6 +167,7 @@ public Q_SLOTS: protected: void timerEvent(QTimerEvent *event) { + Q_UNUSED(event); Q_ASSERT(timerId_ == event->timerId()); Q_ASSERT(routeReply_); killTimer(timerId_); diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h index e6a09da9..856e2de2 100644 --- a/tests/auto/geotestplugin/qplacemanagerengine_test.h +++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h @@ -206,6 +206,7 @@ public: m_locales << QLocale(); if (parameters.value(QStringLiteral("initializePlaceData"), false).toBool()) { QFile placeData(QFINDTESTDATA("place_data.json")); + QVERIFY(placeData.exists()); if (placeData.open(QIODevice::ReadOnly)) { QJsonDocument document = QJsonDocument::fromJson(placeData.readAll()); diff --git a/tests/auto/geotestplugin/testdata.qrc b/tests/auto/geotestplugin/testdata.qrc new file mode 100644 index 00000000..23eed23e --- /dev/null +++ b/tests/auto/geotestplugin/testdata.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>place_data.json</file> + </qresource> +</RCC> |