summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix Qt6 buildwip/qt6wip/cmakeAlexandru Croitor2019-08-062-4/+6
| | | | | | | | | | | Modify all the qmlRegisterModule calls to use minor version 15 because minor version zero from 6.0.0 would make tests fail. This is similar to what was done in qtdeclarative in c147b20a2c1299b2d659fe7c9472ae3866b6a425. Change-Id: Ia363f9e36afbee734c1991916bbdd48fbd20e989 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-07-2520-70/+411
|\ | | | | | | Change-Id: Ifb3e30bbad659239e28f4aa79e769e7b429fb9e4
| * Allow setting backend properties of positioning pluginsPaolo Angelelli2019-07-245-1/+106
| | | | | | | | | | | | | | | | | | | | This change adds a pair of setter/getter to specify positioning backend properties at runtime, both in QGeoPositionInfoSource and QDeclarativePositionSource. Task-number: QTBUG-66304 Change-Id: Iea9421fb708879bee5c62c4afaf45cbda57f50bb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Support specifying serial port via PluginParameter in serialnmea pluginPaolo Angelelli2019-07-182-8/+33
| | | | | | | | | | | | | | | | This patch supports the serialnmea.serial_port plugin parameter. Task-number: QTBUG-66304 Change-Id: I1d1e3083f50c25e2ba2fd24ddb300e73b1f883f9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Accept and honor PluginParameters in PositionSource elementsPaolo Angelelli2019-07-182-47/+165
| | | | | | | | | | | | | | | | | | This patch implements the support for PluginParameters inside PositionSources. Task-number: QTBUG-66304 Change-Id: Ia28e1c620b6f6abc462a0e4c68a0ff517a40cfa9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-172-0/+2
| |\
| | * Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-172-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4f76eed0a59b602696c3f2c1c76df75246c69092
| | | * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-092-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I80ad167400fc2c61c310adef8b00df70b42404dd Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | | Fix compilation after recent declarative internal header changesSimon Hausmann2019-07-174-0/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Some types of the private declarative API became visible through implicit header file inclusion from qqmlengine_p.h. This was changed in declarative and requires fixing here, but it's backwards build compatible to before the changes in declarative. Change-Id: I3553fada4363e88191c127f9cabae2169916ae46 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | QDeclarativeSearchResultModel: modify a map's value in-place instead of ↵Marc Mutz2019-07-101-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overwriting More efficient, because the copy taken from the element in the container must needs detach on the remove call. Calling remove on the element in the container, OTOH, requires no detach (unless the page is otherwise shared, of course). The old code wouldn't detach the whole map when the int was out of range, but that's not the normal case. Change-Id: I2febd591ff78cea86949aa068938a3be4ca115f0 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | QDeclarativeSupportedCategoriesModel: don't use a QMap just to sort a containerMarc Mutz2019-07-101-11/+11
| | | | | | | | | | | | | | | | | | | | | ... use std::sort() Change-Id: I2b40f475f44b41a9f0540602085f0a430eed9508 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | Expose alternativeRoutes in QDeclarativeNavigationBasicDirectionsPaolo Angelelli2019-07-094-1/+76
| | | | | | | | | | | | | | | | | | | | | | | | So that they can be also visualized in list views or details can be presented. Change-Id: Ib8bb48e73624d8bb50073312e7834c3c609c561b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Expose recalculateRoutes invokable method in NavigatorPaolo Angelelli2019-07-093-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | This to let the user choose when to do it, if automaticRerouting is disabled. Change-Id: I53251dc42fc831da623f135ff3f1c372ee3dac66 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix Qt6 buildAlexandru Croitor2019-07-091-5/+5
|/ / | | | | | | | | | | Change-Id: Iab6e89c016eb25ea99edcdc88e1191604157b4b9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Add correct header for QSGPlainTextureLiang Qi2019-07-071-0/+4
| | | | | | | | | | | | | | | | | | Guard with QT_HAS_INCLUDE, because the header isn't there, yet, but adding it is blocked by the missing include here. Task-number: QTBUG-76928 Change-Id: Iaa4e67a73662de26b600207852e4668762cf5d96 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Expose automaticReroutingEnabled and isOnRoute properties in NavigatorPaolo Angelelli2019-07-034-0/+48
| | | | | | | | | | | | | | | | | | | | This patch adds these two properties to the Navigator API to let the user know when the engine detects that the position source gets off the route and to choose whether or not let the engine automatically recalculate routes in that case. Change-Id: I1f3afc8820dee1dd2042aa05fb0b3284108cb581 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-1/+4
|\ \ | |/ | | | | Change-Id: Ia8e0d53bff9f4df0897bb77e75f427acb65f5da7
| * Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-06-251-1/+4
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id91b04d63ddfe46a44f377add670f704b536c183
| | * winrt: Do not assert if requesting access failedOliver Wolff2019-06-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows 8.1 accessing geolocation statics fails. If this happens, the function should not assert/crash, but just return false. Fixes: QTBUG-76344 Change-Id: I2dbd4734512f731ef065ec1e1e210fc22e057547 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Fix crash when removing items from MapboxGL mapsPaolo Angelelli2019-05-2812-31/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Triggered by usage of a virtual method in superclass destructor. Change-Id: If99e523e42fd13686ae43c0083a74e1b68221fc7 Fixes: QTBUG-67638 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 1ac41150501d3c5cc4a9a6ed9c93729687666553) Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Remove usages of deprecated APIs from QDateTimeSona Kurazyan2019-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced the deprecated QDateTime::fromTime_t() with QDateTime::fromSecsSinceEpoch(). Task-number: QTBUG-76491 Change-Id: I45c5d1816da553e9eaf5cb085ea32087931e10bf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Move PluginParameter into PositioningQuick, expose also in QtPositioningPaolo Angelelli2019-06-2112-110/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch the QDeclarativeGeoServiceProviderParameter in the location-private module becomes QDeclarativePluginParameter in the positioningquick-private module. This renamed class is then registered, under the same QML typename "PluginParameter" both in QtPositioning and QtLocation qml plugins. In this way it will become possible to use the same type both inside QtLocation "Plugin" and inside QtPositioning "PositionSource", and regardless of which is the QML plugin that provides "PluginParameter", this will translate into the same cpp type. [ChangeLog][QtPositioning] Exposed PluginParameter also from QtPositioning qml plugin, to be used in PositionSource as replacement of environment variables. Task-number: QTBUG-66304 Change-Id: I1d982ff689130ae896c616480567aa12d9b49c3a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Introduce QGeoPositionInfoSourceFactoryV2Paolo Angelelli2019-05-115-31/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGeoPositionInfoSourceFactoryV2 exposes factory methods that accept plugin parameters as argument, and can be used to configure a given plugin when requesting a source. Task-number: QTBUG-66304 Change-Id: If93a0746fddc6ff4074e771db1376c3b3fc67122 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | QGeoPositionInfoSourceCL: Initialize location timestamp with UTC time specAndrew Dolby2019-06-141-3/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-73651 Change-Id: Ie1955e8f524ef828a7407995fc14586ff54f660c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-0313-91/+154
|\ \ \ | |/ / | | | | | | Change-Id: I46ebc392ac3f5da89bc9957113247dd18d682fc1
| * | Doc: Fix documentation issuesTopi Reinio2019-05-1612-90/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix various documentation-related issues, including missing parameter documentation, broken links, and typos. Do some minor language editing. Change-Id: I0a8f8457e0d1ab56b4fc4670376509adf1fd26a3 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | Compile fixJarek Kobus2019-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fixes the following issue: error: comparison of integer expressions of different signedness: ‘unsigned int’ and ‘int’ [-Werror=sign-compare] 115 | else if (searchArea.type() == qMetaTypeId<QObject *>()) { Change-Id: I67e4abd664c19bf3560023d9bd58127a6c97aa58 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Fix deprecation warningsFriedemann Kleint2019-05-274-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: maps/qgeotilefetcher.cpp:78:36: warning: 'QList<T> QSet<T>::toList() const [with T = QGeoTileSpec]' is deprecated: Use values() instead. [-Wdeprecated-declarations] declarativeplaces/qdeclarativeplace.cpp:1088:101: warning: 'QVariant qVariantFromValue(const T&) [with T = QDeclarativePlaceAttribute*]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations] maps/qgeotiledmapscene.cpp:498:62: warning: 'static QSet<T> QSet<T>::fromList(const QList<T>&) [with T = QGeoTileSpec]' is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] maps/qgeotiledmapscene.cpp:498:89: warning: 'static QSet<T> QSet<T>::fromList(const QList<T>&) [with T = QGeoTileSpec]' is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] maps/qgeotiledmapscene.cpp:643:61: warning: 'static QSet<T> QSet<T>::fromList(const QList<T>&) [with T = QGeoTileSpec]' is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] maps/qgeotiledmapscene.cpp:643:94: warning: 'static QSet<T> QSet<T>::fromList(const QList<T>&) [with T = QGeoTileSpec]' is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] /data1/frkleint/qt-dev/qtbase/include/QtCore/../../src/corelib/tools/qset.h:400:23: warning: 'QSet<T> QList<T>::toSet() const [with T = QGeoTileSpec]' is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] declarativemaps/qdeclarativegeomap.cpp:453:45: warning: 'QSet<T> QList<T>::toSet() const [with T = QObject*]' is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] qplacemanagerengine_test.h:477:72: warning: 'QSet<T> QList<T>::toSet() const [with T = QPlaceCategory]' is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] ../utils/qlocationtestutils.cpp:50:31: warning: 'QString& QString::sprintf(const char*, ...)' is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations] Change-Id: Ice04fd0f158ee95a42f53b33dcb7b9204a33c90e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-112-16/+24
|\ \ \ | |/ / | | | | | | Change-Id: Ie1edff443af9ae6cea3e811a2597ebf4ff1ab55a
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta4Qt Forward Merge Bot2019-05-072-16/+24
| |\ \ | | |/ | | | | | | Change-Id: I28b2db32a10b2f70d8c3626d645d279cfedb49f5
| | * Use network cache when fetching provider data in the OSM pluginPaolo Angelelli2019-05-062-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise it becomes problematic to start up applications in absence of network. Change-Id: Ia543b88bd56bb6c93c803a66e345be1610a4dfe0 Reviewed-by: Tuomas Vaarala <tuomas.vaarala@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix changed import for delegate modelPaolo Angelelli2019-05-063-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed after 2b91e2bca3 in qtdeclarative. Need to be adjusted to QtQmlModels/private/qqmldelegatemodel_p.h later. Task-number: QTBUG-75607 Change-Id: Ic6db50798edc47f6bca307be3acd1611282d2e83 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-272-5/+5
|\ \ \ | |/ / | | | | | | Change-Id: I46962833cb56c4004df9410fe59dbd34fee5c2b0
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3Qt Forward Merge Bot2019-04-131-3/+3
| |\ \ | | |/ | | | | | | Change-Id: I3f63ff19e947a440286f57bf4734780e8d05a5cd
| | * QDeclarativeGeoMapItemView: Silence MSVC warnings about commentsFriedemann Kleint2019-04-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add space, fixing: declarativemaps\qdeclarativegeomapitemview.cpp(143): warning C4138: '*/' found outside of comment declarativemaps\qdeclarativegeomapitemview.cpp(148): warning C4138: '*/' found outside of comment declarativemaps\qdeclarativegeomapitemview.cpp(153): warning C4138: '*/' found outside of comment Change-Id: Ia63ebb4553661bac1af4dce1adf00befbaa34a87 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | Minor fix in a table for Qt Location Mapbox GL PluginKavindra Palaraja2019-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | * Removed an orphan cell, moved its contents to the correct cell. Change-Id: If411447b01d265f6103fe18129f734860c753b15 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev" into ↵Qt Forward Merge Bot2019-04-109-60/+129
|\ \ \ | | | | | | | | | | | | refs/staging/dev
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-109-60/+129
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I9c0d23b3db225c7e85337f9f99482d1eea034b21
| | * | Reduce QtXmlPattern dependencyv5.13.0-beta2Alex Blasche2019-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtLocation and QtPositioning don't depend on it and QtXmlPatterns is about to be deprecated in Qt 5.13. The only existing dependency is the geoflickr example. The most likely resolution is to remove the example once QtXmlPatterns is removed for good. This change makes QtXmlPatterns an optional build dependency. Change-Id: Ibcd9e48604cff4d5e52a63164b30616b0eb100f2 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-018-58/+127
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5700c90ee86873599b5e7c9ccb6cef7ca48153e7
| | | * Display a notice when requesting a SSL map type without SSL supportPaolo Angelelli2019-03-253-17/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some plugins request map data for some map types over HTTPS. Without SSL support (Qt built without SSL support, or missing OpenSSL libraries) this typically translates into blank maps. This is very evident on the MapViewer example. This patch makes sure that the example displays a notice when this situation happens. [ChangeLog] Added a notice to the MapViewer example to inform when a HTTPS-based map is selected without SSL support. Change-Id: I85428bb0536f33089a0e6045301c089fafe69d74 Fixes: QTBUG-74195 Fixes: QTBUG-74294 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | | * Fix Map destructor incorrectly deleting MapItemViewsPaolo Angelelli2019-03-253-40/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the views are explicitly destroyed, leading to issues, in particular for views declared inside the Map. Change it to simply remove these views from the map. Child views will be destroyed in ~QObject. [ChangeLog] Fixed crash when destroying Maps containing MapItemViews. Change-Id: Iff9b1afd6b17b55671b1f999b1bf69f172a05483 Fixes: QTBUG-69195 Fixes: QTBUG-74337 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | | * Document QGeoPath::length behaviorPaolo Angelelli2019-03-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, the method computes a closed-loop length. Being this public API, the only thing that can be done is to properly document the behavior. [ChangeLog][QtPositioning] Documented QGeoPath::length behavior properly. Change-Id: Ie48a51ab0d11ec68851c2ea26b8c6f6894be8b61 Fixes: QTBUG-71358 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | | * Fix incorrect indexing of Mapbox tiles in the cachePaolo Angelelli2019-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A missing '.' was causing to index the wrong tile specs for all map types. [ChangeLog] Fixed incorrect indexing of Mapbox tiles in the cache. Change-Id: Ic22dd60f4a608b31d071520bae750efddb48d59a Fixes: QTBUG-70438 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | | Add notification signal to Map.visibleRegion propertyPaolo Angelelli2019-04-103-6/+26
|/ / / | | | | | | | | | | | | | | | | | | [ChangeLog] Added notification signal to Map.visibleRegion property. Change-Id: I77d5e1f086a94a677d452644bb82ada1b765c617 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-302-4/+8
|\ \ \ | |/ / | | | | | | Change-Id: I30fdb8e0ef811ea2d2043e1e34423ccbf239f729
| * | Update Location QML importsAlex Blasche2019-03-252-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | the changed attributes should have a matching meta object export. Change-Id: I35cd3d5fabe1c4837bce9e64935850dba0501846 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-235-18/+142
|\ \ \ | |/ / | | | | | | Change-Id: I0fa7fcc41426cdfdd65ca941cfbd4a2d4cab444d
| * | Update plugins.qmltypes for Qt 5.13Paolo Angelelli2019-03-223-17/+134
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-73484 Change-Id: Ic6025449c74fcfa242545ffc82c9a74ceb2b5f6e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Fix missing \row in osm.qdocPaolo Angelelli2019-03-191-0/+2
| | | | | | | | | | | | | | | Change-Id: I1b9a2298fbc1e4205924a1db2a78d71fabe3020d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
View Lorry Controller Status