summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Replace Qt::MidButton with Qt::MiddleButtonEdward Welbourne2020-07-221-1/+1
| | | | | | | | The latter has been the preferred name since Qt 4.7.0. Pick-to: 5.15 Change-Id: I2f47bd54b971252d1c3abe601c3709c8da4ab5ad Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Purge uses of legacy cruft before qtbase removes itEdward Welbourne2020-07-221-1/+0
| | | | | | | | | | A use of deprecated qrand() was in a comment, so remove it. A use of QT_BEGIN_HEADER wasn't matched by QT_END_HEADER and it's now a no-op anyway. Pick-to: 5.15 Change-Id: Ie79c181e5f194c00949bfd7d2372f2d246b53180 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-291-2/+2
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I1aaf36e893b8f947abd0770acd9d3007cffdcb10 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge 5.15 to dev and fix resulting compile issuesQt Forward Merge Bot2020-04-0214-2/+94414
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/location/location.cpp The change fixes the bare minimum of what needs to be done to compile and run. This includes the following issues: 1. Fix build failures as a result of QMetaType changes in qtbase moc now stores the QMetaType of properties as a result of 46f407126ef3e94d59254012cdc34d6a4ad2faf2 in qtbase, which requires full type information about the property type inside the moc generated source file. Many of the property types were forward-declared, and this resulted in build errors like: "invalid application of 'sizeof' to an incomplete type 'QDeclarativeGeoMap'" 2. Adopts QtQML API changes. A private QJSValue ctor was removed. The "replacement" is QJSValuePrivate::fromReturnedValue(..). 3. The mapboxgl 3rdparty backend does not compile at this point in time and seems unmaintained. For the time being, the mapboxgl backend is disabled in the interest of keeping qtlocation closer to dev HEAD of other Qt modules. Change-Id: I756e1c2effb29eaaf96a61a28c1c17338774b77c
| * QtLocation: get rid of now unneeded qOverloadsTimur Pocheptsov2020-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | In a preparation for final cleanup in dev/Qt6. This amends the recent change in QtNetwork where we deprecated ambiguous signal overload. Also, fix old SIGNAL to use the proper name. Task-number: QTBUG-82605 Change-Id: Ifc92ce4569ba15ac5429fe379f134a6dbe3a5f73 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Revert "qtlocation: remove uses of the deprecated member-function"Timur Pocheptsov2020-02-251-2/+2
| | | | | | | | | | | | | | | | This reverts commit b482674e51c097fccffa1e1cc32b4843ad393894. Reason for revert: naming in QProcess is considered to be the correct one. Change-Id: I6722adfc06b351c76fb432628a678c4ce887d594 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Add geometry simplification to MapPolyline/MapPolylineObjectQSGPaolo Angelelli2020-02-122-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces a metric-based implementation of the Ramer-Douglas-Peucker line simplification algorithm to generate a LOD pyramid for the polyline geometries. This comes with a related property (in MapItemBase), lodThreshold, that can be used to change the threshold after which no simplification will be used. By default the value of this property is 0, meaning that the behavior will be unchanged and no LOD will be used. This change also introduces LOD on map polyine objects QSG, for which no property is introduced, and there's a default threshold set to zoom level 12 (which appear to produce acceptable results). Finally, this patch makes use of a threadpool with 1 thread to enqueue geometry simplification tasks, which would otherwise freeze the UI when computing for the first time. Support for geometry simplification is currently added only to polylines. It might be of interest extending it to polygons as well, once a proper strategy for handling the simplification of inner holes has been identified. Finally, extending it to circles could be of interest, while potentially bringing only minor benefits, as circle geometries are currently fixed to 128 vertices. Also adds a MapObject-based delegate to the geojson viewer example. Task-number: QTBUG-46652 Task-number: QTBUG-38459 Task-number: QTBUG-49303 Change-Id: I64b5db4577962db17e5388812909285c9356ef0d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * Port Map*ObjectPrivateQSG to the shader-based projection geometriesv5.15.0-alpha1Paolo Angelelli2020-02-114-0/+597
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the implementation of the scenegraph-based mapobjects (those created by QGeoTiledMap) to be the recently introduced one sporting shader-based map projection. This is much faster than the previous, but may introduce small glitches at this time (mostly on minified polylines). Adding polyline LOD simplification will solve this problem. Compared to equivalent Map Items (that is, Map Items backed by the same underlying implementation), map objects now are approximately 1.5x faster. This measure has been gathered using medium-size polygons (contained in the file 10_countries.json from the geojson_viewer example). The difference is caused by the additional QtQuick geometry related operations (essentially projecting the bounding box for each item) present in MapItems. Smaller polygons may therefore yield larger improvements, larger polygons the opposite. Change-Id: I3fc92b02b74a3a4d001e69755949a98f80d8a3d3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Enable mercator-to-screen projection in GLSLPaolo Angelelli2020-02-119-0/+93798
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, all the geo-to-screen conversion, and the triangulation operations for geo polylines and geo polygon are performed either at set time or in the shader. A separate bounding box geometry is processed in the old way to provide a correct QtQuick Item geometry, that can be used for nesting mouse areas, performing translations, input event delivery, etc. With this approach, performance are improved by more than one order of magnitude in average, but complex geometries will of course benefit more. It also adds correct rendering support for polygons with holes, previously only rendered correctly by the MapboxGL plugin. The polyline shader has basic miter joins. The miter is skipped if the angle is too sharp to avoid complicating the implementation. This shader introduces some glitches when the polyline is minified, for which the real fix is to have LOD for the geometry, and render simplified geometries at low zoom levels (added in a subsequent patch). Note: this approach, at least in its current implementation, does not support enabling layers on individual items, only on the Map element. Task-number: QTBUG-49303 Task-number: QTBUG-38459 Change-Id: I0c2dc0bf364d32f74ca7c4014f6d66e6219c8ae4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-081-2/+2
|\ \ | |/ | | | | Change-Id: If5c3274ecf7e19b55ca54db21405d2908d8b14ae
| * Fix QGeoPolygon translate not updating clipper cachePaolo Angelelli2020-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem resulting in failure when calling the contains() method. This patch caches the leftbound that is used in many other methods. This patch also fixes the copy constructor, now correctly converting rectangles and circles into polygons. Tests are added in a subsequent patch. [ChangeLog][QtPositioning][QGeoPolygon] Fixed contains method. Change-Id: I324e5a6e9bf981f830a8bb88e5f2abedb5ece5dd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-011-2/+2
|\ \ | |/ | | | | Change-Id: I453207cbd09ee4901def858193f33d8cef80a2dc
| * qtlocation: remove uses of the deprecated member-functionTimur Pocheptsov2020-01-151-2/+2
| | | | | | | | | | | | | | | | | | Which is QNetworkReply::error(). Use QNetworkReply::networkError() instead. Task-number: QTBUG-80369 Change-Id: Id41166a72c0d14bc77d9ec853db2f665617195ee Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Fix build with latest qtbase and qtdeclarativeQt Submodule Update Bot2020-01-273-13/+14
|/ | | | | | | | | | | | * Bump the submodule to include the one build fix for sqlite3. * Rename VisualDataModel to DelegateModel (it's been the latter for many years and now the old name vanished) * Fix dangling pointers into QList. In clearMapItems() we iterate over m_mapItems and call removeMapItems(), which also removes from the same QList (now vector). The same goes for m_mapItemGroups. Change-Id: I4c229fd2cf1bce76d6ad5ffae4bdbda7fe8e6a18 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+5268
|\ | | | | | | Change-Id: I0dc35c36208833779d26d5090859baf43199eb9a
| * Add binary compatibility files for qtlocation 5.14 branchMilla Pohjanheimo2019-12-131-0/+5268
| | | | | | | | | | | | | | BC file built against 5.14.0 added. Change-Id: I11ce479a65a05d8816d234fdab9f3319575dfa7b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | tests: Fix duplicate .pro entriesFriedemann Kleint2019-11-251-3/+1
|/ | | | | | | | | Remove entries duplicated in the !android scope, fixing: Makefile:1664: warning: ignoring old recipe for target 'sub-qgeosatelliteinfosource' Makefile:1889: warning: overriding recipe for target 'sub-qnmeapositioninfosource' Change-Id: I38b9fe8abd9adb21d7a9a497916d9868f5bfa786 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-011-0/+6
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I21ae20734645fc34b302409163f7400015d8302c
| * Blacklist flaky testDimitrios Apostolou2019-10-301-0/+6
| | | | | | | | | | | | Task-number: QTBUG-59074 Change-Id: I34a43d5f0852a3976ad32b03743aadd265ab5438 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Ensure that geotestplugin is built before the targets that depends on itv5.14.0-alpha1Jan Arve Sæther2019-09-201-5/+18
| | | | | | | | | | | | Change-Id: Ib3a9ea37506e29eafcfb45e0c1d73a4c65d8e70b Fixes: QTBUG-78562 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix 5.14 positioning APIsPaolo Angelelli2019-09-191-1/+1
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-08-311-0/+5208
|\ \ | |/ | | | | Change-Id: Ic431a95117ee8290a5b91937a756e9f9cfc37c7a
| * Binary compatibility file for Qt5.13.0 for QtLocationMilla Pohjanheimo2019-08-121-0/+5208
| | | | | | | | | | | | | | Binary compatibility file added. Change-Id: Ic7d328d1c3f6ad17b547085992f266559a1679c4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Eradicate Java-style iterators and mark the module free of themMarc Mutz2019-08-033-20/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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>
* | Allow setting backend properties of positioning pluginsPaolo Angelelli2019-07-243-6/+33
| | | | | | | | | | | | | | | | | | | | 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>
* | 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>
* | 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 remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-111-16/+23
|\ \ | |/ | | | | Change-Id: I657e61aba9a65be05876c5b1822a3bf7c88857d5
| * 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>
| * | Diagnose flaky coordinate animation testPaolo Angelelli2019-04-101-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add debug info to failing verify. Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 7e35bd3a31341b9593134808b08ee8dee6951c10) Change-Id: Ib0a01a31c6e5ae1ebd81cc48d73e995c06770826 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Fix deprecation warningsFriedemann Kleint2019-05-272-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Add QDeclarativeGeoServiceProviderRequirements navigation propertyPaolo Angelelli2019-03-203-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously missing, making it impossible to require specific navigation features. [ChangeLog] Added QDeclarativeGeoServiceProviderRequirements navigation property. Change-Id: I75f8f3208aa387aea9d1652bb674fdb747877747 Fixes: QTBUG-72505 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Diagnose flaky coordinate animation testPaolo Angelelli2019-03-111-12/+9
|/ / | | | | | | | | | | | | Add debug info to failing verify. Change-Id: Ic5e81a70a6ee0bc488edab1b63b7b16840fc9fe9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-212-3/+3
|\ \ | |/ | | | | Change-Id: If768f08fd6a7bc55dc65ebec9db1ccd23aa3bdf9
| * Fix toCoordinate calls in qml testsPaolo Angelelli2019-02-212-3/+3
| | | | | | | | | | | | Task-number: QTBUG-73943 Change-Id: Ia6c008575d0415f5301d177114e4a906cdc7f2e9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-161-0/+4838
|\ \ | |/ | | | | Change-Id: Ibf40dee29026002ce435e4b316ed999e320e73b6
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+4838
| |\ | | | | | | | | | Change-Id: I13775b0f1df521fef560fa4b39b341517e0edc62
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-086-6/+119
| | |\ | | | | | | | | | | | | Change-Id: Ib65445a9e316252e7483d2878b8cdad252242177
| | * | Add binary compatibility file to QtLocation for 5.12Milla Pohjanheimo2018-12-191-0/+4838
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary compatibility file added. Change-Id: I46e179f29957a281f0b04424a6d44fb63556b208 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | | Add departure time attribute to route queriesv5.13.0-alpha1Paolo Angelelli2019-02-064-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that it can be used to improve the route calculation based on traffic information or other time-based information (ferries etc.) Change-Id: I8bdc81046484cc4f0ebfaffbdf6f034c555d7781 Fixes: QTBUG-70503 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-023-9/+28
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ia0a66c229f249532e70b1548f5e618e4db4bc5ad
| * | | test app: Improve status and error handling a bitOliver Wolff2019-01-243-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reset "running" check box if an error occurs - Add check box to manually reset position source's error code, as error is not emitted with NoError - There is no need to handle the "OK" case in errorChanged, as the corresponding signal will not be emitted for NoError Change-Id: I53d637c8efd807d6c3e8abff98963585fe74f220 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Unify semicolon usage in Q_UNUSEDJesus Fernandez2019-01-237-15/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: I36dd6881b6f6f028869d63b6311cba7f52a99cc4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-222-0/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8d0881209c8b0a0dce4ed949ef89ee2679448420
| * | | Set things up for logging in positioning test applicationOliver Wolff2019-01-141-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I3f44e1a1d5022c00db149b2ba23d4dd91d3b1f1a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Fix QGeoRectangle::operator|=Paolo Angelelli2019-01-141-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This patch fixes the case when one QGeoRectangle contains the second, and wraps around. Change-Id: I7110c1864082c502845754fab2dc4e783455a446 Fixes: QTBUG-72935 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Add QGeoJson: a GeoJSON parserJulian Sherollari2019-01-1815-0/+46558
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a Class to convert a GeoJSON document to a QVariantList ready to be used as Model in a MapItemView. It comes with autotests, example and detailed documentation. [ChangeLog][QtLocation] Added a GeoJSON parser which can be used to annotate maps with tracks, polygonal boundaries, etc. Fixes: QTBUG-64111 Change-Id: Ib06d3902a052f69f75ae40be5c9ab56023cad916 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-101-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0724ca9ffbb8099f698b090a4fdd993fad2c2302
View Lorry Controller Status