summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgpl5.15Tarja Sundqvist2023-03-231-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I9be7838c6d8ff38cd26621bec55fb2b183211973
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-104-66/+60
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I538d4dd455b56a4d396f655a61f99c1d68893d9f
| * Fix positioning must be enabled and authorized at startup to work on iOSØystein Heskestad2021-11-102-62/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Positioning updates were never starting on iOS if startUpdates was called when positioning was not enabled and authorized. Also removed call to authorizationStatus, with is deprecated and the replacement is too new to be used. [ChangeLog] Fix positioning must be enabled and authorized on startup to work on iOS Fixes: QTBUG-78705 Fixes: QTBUG-92261 Change-Id: Id0c6c6491edd2a55dd47627b4c99984764bca983 (cherry picked from commit 0fe43dd0722b0aca86bdbb11f621cf12da8a5fb7) Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * Fix position handling in geoclue2 pluginIvan Solovev2021-11-101-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pre-existing code was incorrect due to the operation priority. The result of the comparison was assigned to the variables, so they were always initialized with 0 or 1 instead of real values. Also use std::numeric_limits<double>::lowest(), because the altitude can have a negative value (when we are below sea level). This commit is a manual cherry-pick from qtpositioning.git dev branch Fixes: QTBUG-97722 Change-Id: I2d5beddfdf6d7b4fc626d6b09f4923c968016428 (cherry picked from commit 70b7818e1fc585f8bac43b721f3dd172b7489d07) Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ic6dc1ab32d3e3e4eef9ca60e6ac82289d0fe07da
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I871fbdf8234a3b4846e457786b41af22deeab2b1
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-163-27/+42
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I7592fcec7b13c5bbe021716a424dd03004b101c6
| * QGeoCoordinate: fix toString() conversionIvan Solovev2021-07-292-26/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applying qRound() to check if the minutes/seconds should overflow was not the right solution in some cases. It could lead to incorrect overflows, and so - to wrong conversion results. The actual logic of overflow is related to the behavior of QString::number. This patch fixes the logic and also introduces some minor optimizations. After overflow, the minutes or seconds value is always 0.0, because the actual minutes/seconds value is always in range [0; 60). This allows us to get rid of some checks. Fixes: QTBUG-95221 Change-Id: Ie3dcb6cef226b04c43dd973c09c4ae297c583f3b Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 15f06eca6a5085ce14d2eb0b743c5a06365068ea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-162-1/+7
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Id7d89a7b8c0fb50bb921eabaa2a4bb3d094378a0
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I91889722a2ed2be2c7d9deb73b9e435c5fdc8ac5
| * QtPositioning: fix source detectionIvan Solovev2021-05-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an 'nmeaSource' property is specified, it is read before the component is completed. At this point, a valid position source can be created to read the data from the specified source. After that, when the component is completed, a new position source is created based on the 'name' property, even if it's empty. This results in the initial valid position source being overridden by a default one (depending on the system configuration it may or may not provide valid positioning information). This patch adds a check that if nmeaSource is used, we do not try to override it and ignore the 'name' property. Fixes: QTBUG-85636 Change-Id: I6acdcdaf7c7f8ee168c1d48d9eb5dbc7d1838af3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I3a2203201046c3f9a6f9cc5cb6429f110c659a04
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: I2802ac0bc71ff1911991f7954618affe22487331
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-22598-12309/+12316
|/ | | | | | | | | | | This reverts commit a924cd38a71af86023e0a9ea19d3379136b68c7f. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I654419ef3fafe26dbf525e7d5e15c4ed9c2c7853 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Allow removal of layers and sources created using parameters in MapboxGLTadej Novak2021-02-093-0/+35
| | | | | | | [ChangeLog][MapboxGL] Sources and layers from parameters can be removed Change-Id: I08db3e02b123f3ffb16e09fb77070ad5b6dbb18a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update commercial license headersTarja Sundqvist2021-02-02598-12316/+12309
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtlocation. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4167 Change-Id: Ie04ccedd48eacda57bfae6689dac78c1cd7f2ca1 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Blacklist ReviewModel::test_resetMichal Klocek2021-01-261-0/+4
| | | | | | | | It seems flaky in recent integrations. Task-number: QTBUG-90244 Change-Id: I7853b94b986cfdab8541117e5c8e66aac26f4ed4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix compilation for no opengl buildsMichal Klocek2021-01-1312-21/+109
| | | | | | | | | | | | | Disables experimental labs qml plugin, which since a4469cad40 depends heavily on opengl backend. Fix warnings with msvc when compiling without experimental plugin. Fixes: QTBUG-88017 Change-Id: I53c5da915981bd05f39134ba57f585d0a0786aa8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Simpler fix to crashing Qml Map appearing 2nd+ timePiotr Mikolajczyk2020-11-092-32/+11
| | | | | | | | | | | Previous solution did not take advantage of the QSGNode::OwnedByParent flag. Setting this flag to false allows to use parent() property to determine if the node has been removed from node tree. This amends 4fe9e0ed027134a833b2243597a2ccd00987b559 Fixes: QTBUG-85260 Change-Id: I705848483d7dc2639dffffa0ff66c682b3fffca0 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Use QLocale::NorwegianBokmal rather than NorwegianEdward Welbourne2020-11-072-2/+2
| | | | | | | The short form is a deprecated alias and going away. Change-Id: I6b095f61a798e8559043cbeac75cd27176a45196 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Android: fix Location propertiesVyacheslav Koscheev2020-11-031-5/+20
| | | | | | | | | | | According to android doc getAltitude, getAccuracy, getVerticalAccuracyMeters, getSpeed, getBearing & getAltitude returns 0.0 if location does not have this value. Corresponding has* method can return false positive on some devices. e.g. Huawei P20 Pro Change-Id: I887412cf2cff05414de08c774947d969fc69aa92 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-11-021-0/+48
| | | | | | | | | | | | | | - 4ea38f51051adb290e414981e3dc2be67d50fcab Add changes file for Qt 5.15.1 + 3e9d5379f4db89413cb50e928857dbd852755087 Add actual text of Boost Software License + 4fdb479bbbb946d825b7d908527651c4bf37091c Update src/3rdparty/mapbox-gl-native + 64c608f72f0ffe253d37eefb56b465e70465bb05 Use RedirectPolicyAttribute instead of FollowRedirectsAttribute + 023d51d8bea80771db1f2767a0bc6ff98e16ae71 Bump version + 9ac778b23aa77c62470efcd6bb3afe57576c0aa7 Make names of poly2tri, clipper, clip2tri libraries unique Change-Id: I728895c80ec546017a2dfc2bd1fd112e06257ddf Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 02a21217a9706402802f38c646797be8eccb86e4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix crash when showing Map QML comp. for 2nd+ timePiotr Mikolajczyk2020-10-281-1/+28
| | | | | | | | Crash caused by storing pointer to a node that could be deleted elsewhere Fixes: QTBUG-85260 Change-Id: I871123322fac84b8bf91e9bab8ecad08e75c2854 Reviewed-by: Paolo Angelelli <paolo.angelelli.qt@gmail.com>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: Id255515e0754d1905073ed1ec03ca75ad56c41de
* Make names of poly2tri, clipper, clip2tri libraries uniqueKai Koehne2020-10-026-7/+7
| | | | | | | | | | | | | | | This avoids conflicts for static builds, where the system might also provide a clipper2tri, clipper, or poly2tri library. [ChangeLog][General] The generated clipper2tri, clipper, poly2tri libraries have been renamed to qt_clipper2tri, qt_clipper, qt_poly2tri. This avoids conflicts for static builds. Fixes: QTBUG-86248 Change-Id: I38261633acef1d3be0cb5b67b3b5bf3262258a95 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 6b2cf7e9d150b7be709fcd688c5045949cedc3d9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I9c717db510c375ae1e758398c43df3ee57ab3595
* Use RedirectPolicyAttribute instead of FollowRedirectsAttributeMårten Nordheim2020-09-152-2/+2
| | | | | | | Because we want to deprecate FollowRedirectsAttribute Change-Id: I3453b120a442dea3624ff2a3f49a2eb565bde762 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Update src/3rdparty/mapbox-gl-nativeKai Koehne2020-09-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Take in commits d3101bbc2 Update Qt redirection handling 5dbbb966f [qt] Remove libc++ attribution 9d155e652 [qt] Document deps/optional dependency 255935c14 [qt] Add zlib to mapbox-gl license a7f15a826 [qt] Improve third-party license documenation [ChangeLog][Third-Party Code] Update and extend third-party documentation for Mapbox GL plugin dependencies: libc++, Optional, Mapbox GL Native, Boost, CSS Color Parser, cURL Parse Date, Earcut Polygon Triangulation Library, geojson-cpp, geojson-vt-cpp, geometry.hpp, kdbush.hpp, polylabel, protozero, RapidJSON, shelf-pack-cpp, supercluster.hpp, tao_tuple, unique_resource, variant, Vector Tile Library, Wagyu Geometry Processing Library, nunicode. Change-Id: Icb55f9aaa2d96dd973aced90a73208eb8c0be209 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 7769ea903f87efc4ad55530a2749f104eddff2e4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add actual text of Boost Software LicenseKai Koehne2020-08-261-0/+27
| | | | | | | | | | [ChangeLog][Third-Party Code] Added actual license text of Boost Software License (used in Clipper Polygon Clipping Library) Change-Id: Ie4bfc92541eaac3844a8a75044e2ba60a89adaaa Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit e69a08a91334df9830d196c48b24f487775e798f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-261-0/+20
| | | | | | | | | | | | | | | | | | | + 3efe2e302e49e5e03c96e733ce39a59e8072546f Add missing "override" + 4b6fae67f3889837b37711b65ac21dfc8e8893c2 Remove unused variable + 81e0e5990b1bfec4fcbe49bc37471223fa7a16f1 Fix developer-build with clang 7 + 197f2bcf42be6670eb50162fd3c8d8ec6d306eb3 Fix Qt6 build + 7b696b6e399cea7cde8bf973370f23c324aff6a8 Fix warning about QString::SkipEmptyParts being deprecated + cd7b64a59450069815ded66dca5f407a20cbb6ed Fix Clang 10 warnings about deprecated copy constructors + e73246b0e575a14bd88a84f67543b7e9b50960d5 Fix incorrect iteration over a C array + 9328401245165dd013af7b56d25f4e53f7c5456a Purge uses of legacy cruft before qtbase removes it + 7b92fd72ab325914427dfadcc5f9c02591bda649 Replace Qt::MidButton with Qt::MiddleButton + 4b48bfe133c5a9b5b257373e58c405f37d4b9d03 Bump version + eed38a67e759f660462e5cd233c73f07e0cfb59f Add binary compatibility file for 5.15 for QtLocation Change-Id: I0db08686e5b18f3825d3fa8c138b832538189664 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit bae290d25a37fddf88f3a6e2e94c3ee68b2cc038) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add binary compatibility file for 5.15 for QtLocationMilla Pohjanheimo2020-08-171-0/+5278
| | | | | | | Binary compatibility file added. Change-Id: I5d0a302f06771a0cfaa23e8a364d7e72ce884458 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: Ifef4ebf96bd3d5572feed0b618bdfd1ff1a2948f
* Replace Qt::MidButton with Qt::MiddleButtonEdward Welbourne2020-07-231-1/+1
| | | | | | | | | The latter has been the preferred name since Qt 4.7.0. Change-Id: I2f47bd54b971252d1c3abe601c3709c8da4ab5ad Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit f3a34ce8890c68c04212eafa0ae2c9eeeb60b555) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Purge uses of legacy cruft before qtbase removes itEdward Welbourne2020-07-222-3/+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. Change-Id: Ie79c181e5f194c00949bfd7d2372f2d246b53180 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 354d59cd8e7972525e5978d970ef5e64edb14898) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix incorrect iteration over a C arrayThiago Macieira2020-05-201-3/+1
| | | | | | | | | | | | | | | Found by Clang 10: error: expression does not compute the number of elements in this array; element type is 'const MapStyleData', not 'QGeoMapType::MapStyle' [- Werror,-Wsizeof-array-div] Instead, just use range-for. Task-number: QTBUG-83666 Change-Id: I99ab0f318b1c43b89888fffd160b589c5543b9d4 Coverity-Id: 226105 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 275efcc6c493e01fcbb623de4a277cffd584fa58)
* Fix Clang 10 warnings about deprecated copy constructorsThiago Macieira2020-05-201-1/+1
| | | | | | | | | | qgeocodereplyosm.cpp:115:21: error: loop variable 'k' of type 'const QString' creates a copy from type 'const QString' [-Werror,-Wrange-loop- construct] Task-number: QTBUG-83666 Change-Id: I99ab0f318b1c43b89888fffd160b4a12bee11723 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 8b0c9024b1eb9b6a4ad2e440d6e7856ca3a09e80) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix warning about QString::SkipEmptyParts being deprecatedThiago Macieira2020-05-203-3/+3
| | | | | | | | | /home/tjmaciei/src/qt/qt5/qtlocation/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp:107:98: warning: ‘QString::SkipEmptyParts’ is deprecated [-Wdeprecated-declarations] Change-Id: Ib3333a58f37746f3b935fffd1607e152af50f386 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 3ca1149275e1e63e11c8d97f696e05bf73d2e076) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Tony Sarajärvi2020-05-113-1/+52
|\ | | | | | | Change-Id: Ied8bd656df6a6ad2c3d913905b32f8e08fd9d7e0
| * Update mapbox-gl to the latestv5.15.0-rc2v5.15.05.15.0Thiago Macieira2020-05-061-0/+0
| | | | | | | | | | | | | | Needed to compile with GCC 9 and 10. Change-Id: I99ab0f318b1c43b89888fffd160bf42e51e9a0d1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add changes file for Qt 5.15.0v5.15.0-rc1Alex Blasche2020-04-231-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 2b743cdca353f84959dac47e4ca24615c6f1830a Bump version + efdf3c266dce8791b78d1a851b16d2f4dbe8534e Add optional argument to Map.fitViewportToMapItems + c59ae0c350786ab3d7691503b487a7dda48f4b5c Avoid initializing QFlags with 0 or nullptr + 3aaa71792b6a30e12d1aaff66d7238770576b4cc tests: Fix duplicate .pro entries + b359faca3420916efd649b743501df3fdf5b6f35 Fix MapObjects ::border property not properly initialized + b482674e51c097fccffa1e1cc32b4843ad393894 qtlocation: remove uses of the deprecated member-function + a5e677741a9cbc8b257a58a2ffe3c5f5ee785152 QDeclarativePositionSource::socketError - use deleteLater + 1bba966b8df1cc1d39276833ff4533f967df247e Add to GeoJsonDelegate.qml support for logging clicked country + 8e53b4913946801f5ba51807feda21778f264bf0 Add parent property to QParametrizableObject + f4a98904855b57c6ad42f9ead29737d0201b6733 Fix MapObjectView not setting properties + 6935c61b75ab600950da8ff62b693c426de5b9a5 Update earcut 3rd party library + 4ee08b0770dc018e390051a35092264f0b1a789a Fix QGeoCoordinate::CoordinateFormat missing Q_ENUM + 964a1bb8532249f82d4d647bd496d77ccb5e240f Fix QGeoPolygon translate not updating clipper cache + d055098540df99a5d426360e9322c659e678e5ee Enable mercator-to-screen projection in GLSL + e82c41d35ddd6ef0d14e1d01ea1dfd46742bc0fe Fix Map*ObjectsQSG implementation triggering QSGBatchRenderer crashes + a4469cad4041f21e640efa9ca5d0b192dd702955 Port Map*ObjectPrivateQSG to the shader-based projection geometries + be7cbed7411d024d178377bd327d5916c80e02a0 Add geometry simplification to MapPolyline/MapPolylineObjectQSG + 0ace8d20dcdbcc281c7ebc48b0c153170ebd99b0 Fix crash with empty maps on construction + 0b81e828add7e77fd3aecaf46955f7d1a84321ae Fix segmentation fault due to null pointer usage + a95c1e3a7cf55a43ba1a8b963aa0c0df02655747 Remove use of bearer management from weatherinfo example + d983c7edac94b5e397b781b3f7a9b119d1996318 Examples: request permissions storage permissions on Android + ec3001c3490b14de3b242dce6af97ec519433305 Revert "qtlocation: remove uses of the deprecated member-function" + a0e88ed10cd07d4bdf79d7e7f05f01179f2eb296 Doc: Fix highlighing of import + d97b13fc2ccd38dd6d38190722d2207bb26315b5 serialnmea plugin construction connect() error fix + ae9a8826d73fa689e81c43038bb13226c9cb9ac7 QtLocation: get rid of now unneeded qOverloads + 29816a3aaa3f368422a3b19983add62673bb6960 qtlocation - use errorOccured signal for QTcpSocket + f16f4a231cd10867c10eb42fb456867469c93836 Support custom Mapbox API base URLs + ccfcf832862582cd0e7c6b33547c9bf9d3b47240 winrt: Fix crash on exit + 7711e7bcfae2c09688ecdaf587d580077889cce3 Make use of qRegisterAnonymousType where possible + dd6df42a6ae90cd349b9af2d00d53c5a0d3ed1ed Fix QHash/QMultiHash related deprecations warnings + f64813599bc4d1f57c964727e6b5b4ba3b6cb24a Fix Qt6 build + eda2a7c286058176e1906d0ddc88d4e2cfbec55e Change QQmlListProperty ctor expecting a QList ptr Change-Id: Ib710e60af7111eedf7a7b0dee90228dc3ad74b8f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | | | | | | | | | Change-Id: I56ad4358566f1ceb00c7a4584a202739994bfccd
| * | Fix typo in error->errorOccurred deprecation fixMårten Nordheim2020-04-201-1/+1
| | | | | | | | | | | | | | | Change-Id: If9ee065e8d2cbca6ca0ff64415c509caa655a2e6 Reviewed-by: Paolo Angelelli <paolo.angelelli.qt@gmail.com>
* | | Fix Qt6 buildAlexandru Croitor2020-05-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab6e89c016eb25ea99edcdc88e1191604157b4b9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 22895ccf70a5f0932972f5b363fd9001e19616bd) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Fix developer-build with clang 7Robert Loehning2020-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | comparison of two values with different enumeration types in switch statement ('QVariant::Type' and 'QMetaType::Type') Change-Id: I40bff89a773d4c312825133fd8c00e32e469953a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Remove unused variableRobert Loehning2020-04-281-2/+0
| | | | | | | | | | | | | | | | | | | | | Fixes developer build with clang 7. Change-Id: I45e532541de0f3acc6cdd00231ed7d3aa2264e48 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Add missing "override"Robert Loehning2020-04-281-1/+1
| |/ |/| | | | | | | | | | | | | Fixes developer build with clang 7. Change-Id: I551a5b90d02f5ccb9a7e2e0f9e455d593237a562 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli.qt@gmail.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | |/ |/| | | Change-Id: I28f3adfb93bf74bd7af04619fbd5d7dc000c395b
View Lorry Controller Status