summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-0112-34/+39
| |\ \ | | |/ | | | | | | Change-Id: Id543d32c49c8efd1d7798d41bbee0e28c1742e12
| | * Doc: Fix link errors and complete parameter specsNico Vertriest2019-09-3012-34/+39
| | | | | | | | | | | | | | | Change-Id: I786ab35a0e9c8dfa2c8124692289d98e8eee4a8d Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-241-4/+4
| |\ \ | | |/ | | | | | | Change-Id: Ie8e4e01faad54b7a38aa3b96a769c4893a5cfb58
| | * Doc: Fix link to Qt for UWP docs in Qt Positioning module docsLeena Miettinen2019-09-201-4/+4
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ic739e3d7fe4df81e97be77c4294aa422dfcd6344 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Add optional argument to Map.fitViewportToMapItemsPaolo Angelelli2019-09-262-16/+32
|/ / | | | | | | | | | | | | | | So that a user-specified list of items can be fitted without requiring complex computations in JS to deduct the enclosing geo rectangle. Change-Id: I4a36fe72a49d5fc3566ba0b9fe1db930c4008885 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix 5.14 positioning APIsPaolo Angelelli2019-09-197-8/+47
| | | | | | | | | | | | | | | | This patch fixes a few inconsistencies in the newely added features. Change-Id: Icdf1c9208fd0d5ab1d6ec6d87fcc5be5072c3f58 Fixes: QTBUG-77865 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Update SHA of mapbox-gl-native to the upsteram versionSona Kurazyan2019-09-051-0/+0
| | | | | | | | | | | | | | Bumps Mapbox GL to a new version that fixes the Qt version comparison. Change-Id: Ia6df7a461fc2358cda7e3ac7aa0d58c2b5b8fcfb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge dev into 5.14 (delayed final downmerge)Kari Oikarinen2019-09-049-3/+82
|\ \ | | | | | | | | | | | | | | | | | | | | | This replicates the effects of the fast-forward merge that should have been pushed on 2019-08-27 as the final down-merge from dev to 5.14. Task-number: QTBUG-78019 Change-Id: Ib17e195466b7a88b4753f5fa4906e561acbeb7e8
| * | Replace the deprecated QWheelEvent::posF() -> QWheelEvent::position()Sona Kurazyan2019-08-211-2/+2
| | | | | | | | | | | | | | | Change-Id: I0aa13b6c472664ad2c6175fa800687598207ab8e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Add autoFadeIn property to map itemsPaolo Angelelli2019-08-218-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property allows a user to disable the until now built-in behavior that makes map items fade in or fade out between zoom levels 1.5 and 2.5. By default the old behavior is kept. [ChangeLog][Location][MapItems] Added property to disable the automatic fade-in/fade-out behavior on low zoom levels Change-Id: Id764f12d34db528f533f14fd561604507681f216 Fixes: QTBUG-76867 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-08-311-0/+6
|\ \ \ | |/ / |/| / | |/ Change-Id: Ic431a95117ee8290a5b91937a756e9f9cfc37c7a
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-241-0/+6
| |\ | | | | | | | | | Change-Id: If3fd3389c3e2eed55daf342d1bde1899d2fe01a2
| | * Improve debugging in mapboxgl plugin when running without opengl backendPaolo Angelelli2019-08-201-0/+6
| | | | | | | | | | | | | | | Change-Id: I252c163ad9296b52f14b83710fda0a469f882d73 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Add Satellite support to serialnmea pluginPaolo Angelelli2019-08-1512-58/+1110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new class, QNmeaSatelliteInfoSource, locally to the plugin, that behaves similarly to QNmeaPositionInfoSource in the way of handling the IODevice and producing the updates. Change-Id: Id594152dd70514974ac79c7757ce6f0da4631191 Fixes: QTBUG-59274 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Introduce QIOPipe and use it in serialnmea pluginPaolo Angelelli2019-08-095-24/+399
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the plugin to pipe the input stream into multiple, independent processing pipelines. Good for allowing multiple position sources from the same serial port, and will allow supporting satellite info source in the nmea plugin too. Change-Id: I21e3cd2c78e7138ca49821c68b55ce96eb83e986 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Eradicate Java-style iterators and mark the module free of themMarc Mutz2019-08-034-29/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and of QLinkedList Java-style iterators are going to be deprecated, or at the very least banned from use in Qt code. Ditto QLinkedList. Unfortunately, the module contains more than 120 uses of Q_FOREACH, even though, according to my sources, its use was banned in Qt implementation from the get-go. So QT_NO_FOREACH is currently not an option. Change-Id: I0f05e9c78dda259b0eac1bcdfc7dddfcddc4b908 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Port from QMutex::Recursive to QRecursiveMutexMarc Mutz2019-08-031-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also port from QMutexLocker to std::lock_guard, as the former will not support QRecursiveMutex going forward, and port the remaining ctor-init-list to NSDMI to avoid additional churn going forward. Change-Id: I0645f4b2ffad455c41c12b94af56de800c6d1773 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | QDeclarativeGeoMapParameter: replace the last use of QSignalMapper in the moduleMarc Mutz2019-08-011-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code here is a bit tricky, as it relies on dynamic property inspection, and therefore can't use the statically-typed Qt5 connection syntax to simply connect to a lambda to captures 'i' by value. But QSignalMapper is not just deprecated, its use here is also overkill. Unlike your normal signal mapper, the code doesn't map many source objects to different ints, there is actually one QSignalMapper object _per sender_. But this use-case doesn't need all the sender() inspection that QSignalMapper does under the hood. It just needs a QObject with a map() slot that emits mapped(i), where 'i' is a member variable. Implement that. Change-Id: Ib363144c8ab7997cb0a34c8c9c1a0c348fd38d57 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | 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>
* | | 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>
View Lorry Controller Status