summaryrefslogtreecommitdiff
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>
* Fix Qt6 buildAlexandru Croitor2019-08-012-4/+4
| | | | | Change-Id: Ib308cbc590d2a9203ac95a707870f7bd45b9bdea Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"Alexandru Croitor2019-07-2529-119/+855
|\
| * Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-07-2529-119/+855
| |\ |/ / | | | | Change-Id: Ifb3e30bbad659239e28f4aa79e769e7b429fb9e4
| * Allow setting backend properties of positioning pluginsPaolo Angelelli2019-07-248-7/+139
| | | | | | | | | | | | | | | | | | | | 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>
| * Add tests for PluginParameters in PositionSourcePaolo Angelelli2019-07-248-47/+369
| | | | | | | | | | | | | | | | | | Testing parameters in QGeoPositionInfoSourceFactory becomes implicit with this test. Task-number: QTBUG-66304 Change-Id: I3e9fbf99762e9a03e4c8cae3ff317ea36313e687 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-173-0/+48
| |\
| | * Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-173-0/+48
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4f76eed0a59b602696c3f2c1c76df75246c69092
| | | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9c1e999c2971aaeb1434cdf2e8e06edc7acb76c1
| | | | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic2e7da41b6a90f3dcc9c642c0b4492099bd27a1f
| | | * | | 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>
| | | * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie6e3069ab6cd96881d5cadce2b4e015cce75f467
| | | * | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-07-011-0/+46
| | | |\ \
| | | | * \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-07-011-0/+46
| | | | |\ \ | | | |/ / / | | | | | | | | | | | | Change-Id: I9e43fd7c3d0e30c0f7279bea3290f48206990ac4
| | | | * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.05.13.0Paolo Angelelli2019-05-161-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3bd6c6c241326da331b2e7670e53dbec52f3a4ee Reviewed-by: Alex Blasche <alexander.blasche@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>
* | | | | Bump Qt version to Qt 6Alexandru Croitor2019-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c4f1c3397466d334e6fbd00469b0567bf800875 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@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 "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-292-1/+24
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-292-1/+24
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: Ia8e0d53bff9f4df0897bb77e75f427acb65f5da7
| * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-06-252-1/+24
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-06-252-1/+24
| | |\ \ \ | |/ / / / | | | | _ | | | | | | | | | | | | | | | | 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>
| | * | Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-1714-32/+34
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-1714-32/+34
| | | |\ \ | | |/ / / | | | | | | | | | | Change-Id: I0e61ba5697177a8daf8808023ac0207b70f8571d
| | | * | Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1817a1cb9e208af194fb1e8f416961d9c87815c1 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> 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>
| | | * | Bump versionFrederik Gladhorn2019-05-231-1/+1
| | |/ / | | | | | | | | | | | | Change-Id: I612c4c7887c9d1ed6efc43edb3a746be0d40de2d
* | | | 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>
* | | | unblacklist passing testsDaniel Smith2019-06-251-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests have not failed on the removed platforms for at least 60 days Task-number: QTBUG-76608 Change-Id: I97d52398535261312574fe170831641a67d4e8a5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@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>
* | | | Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife80695ff0204e2760a75c1b8194753cb8b6141e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-111-16/+23
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-111-16/+23
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: I657e61aba9a65be05876c5b1822a3bf7c88857d5
| * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-081-16/+23
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-081-16/+23
| | |\ \ \ | |/ / / / | | | _ / | | | / | | | | | | | | | | | | Conflicts: tests/auto/auto.pro Change-Id: Ibb9c7c93a30d981f7e519eda495436c1c4873aa0
| | * | Android: disable tests requiring plugins or local filesPaolo Angelelli2019-05-081-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we develop a long term solution to deal with this. Fixes: QTBUG-73575 Fixes: QTBUG-73576 Fixes: QTBUG-73578 Fixes: QTBUG-73579 Fixes: QTBUG-73580 Fixes: QTBUG-73581 Change-Id: Ib70d8f084dcbafa8853e0c687d0a31c88eef991f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-0315-92/+155
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-0315-92/+155
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: I46ebc392ac3f5da89bc9957113247dd18d682fc1
View Lorry Controller Status