summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* QtPositioning: get rid of warningsHEADdevIvan Solovev31 hours15-81/+83
| | | | | | | | | | Fix warnings in QtPositioning sources. These are mostly the warnings regarding a missing "override" keyword in unit tests. Task-number: QTBUG-90491 Change-Id: I6ca676de0733767d4b85353670103ad5a8d60688 Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QtPositioning: refactor QGeoPositionInfoSourceFactoryIvan Solovev36 hours31-484/+147
| | | | | | | | | | [ChangeLog][QtPositioning][Important Behavior Changes] Remove QGeoPositionInfoSourceFactoryV2 and update QGeoPositionInfoSourceFactory to support source configuration parameters. Update plugin ID string. Task-number: QTBUG-90491 Change-Id: I1d3dc556d73e273e2e364f77e2decaad11810547 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QtPositioning: rename Android's package name for Qt 6Assam Boudjelthia36 hours7-10/+10
| | | | | | | | | | | Rename Android package name org.qtproject.qt5.android to org.qtproject.qt.android to avoid inconsistency with Qt 6 name. Also, we include the major version number in the jar target. Task-number: QTBUG-86969 Task-number: QTBUG-90491 Change-Id: I89e9a709cc9379b0359aceabdabd1676a4943ffa Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QtPositioning: port to cmakeIvan Solovev3 days66-7/+1667
| | | | | | | | | | Switching QtPositioning, its tests and examples to cmake. QtLocation is not covered by this patch. Task-number: QTBUG-89854 Change-Id: Ic971f7fd4c576eac9b662641aae77d68c062712d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QtPositioning: adapt to Qt6Ivan Solovev3 days20-108/+102
| | | | | | | | | | | | | | | | | | | | | | | | Make QtPositioning module buildable under Qt6: - remove calls to deleted QMetaType-registration methods - replace int -> qsizetype where it prevents the code from being compiled - fix some deprecation warnings - fix library dependencies in .pro file for building tests - fix weatherinfo example For now only qmake is supported. CMake support will be done in scope of a separate patch. Geoflickr example is yet to be ported, as it requires extracting XmlListModel from xmlpatterns. QtLocation is also skipped for now, as it seems to require heavy refactoring due to changes in QSGMaterialShader interface. QtLocation build is disabled in qmake for now. Task-number: QTBUG-89853 Change-Id: I8cc4da6efabe32ce114701219d5431f8480bee3b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix qml code snippetTasuku Suzuki2020-09-171-4/+4
| | | | | Change-Id: I1e0c1977859852a0d018124a39c635bc0c622ec8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Make names of poly2tri, clipper, clip2tri libraries uniqueKai Koehne2020-09-096-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. Pick-to: 5.15 Fixes: QTBUG-86248 Change-Id: I38261633acef1d3be0cb5b67b3b5bf3262258a95 Reviewed-by: Alex Blasche <alexander.blasche@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. Pick-to: 5.15 Change-Id: Icb55f9aaa2d96dd973aced90a73208eb8c0be209 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update src/3rdparty/mapbox-gl-nativeKai Koehne2020-09-071-0/+0
| | | | | | | | | d7e368c42 [build] Fix GCC10 build 0853378b2 Fix compilation issues on GCC 9 f22bbe388 [qt] Ignore status code with 'data' URLs Change-Id: I6a81a33d7bfc97df36d7e5ef065fe68b8399505f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Remove use of QNetworkRequest::RedirectPolicyAttributeMårten Nordheim2020-09-022-2/+0
| | | | | | | | | Its behavior is the new default in 6.0 Task-number: QTBUG-85901 Change-Id: I65e41d85d9f171aeaee03ca7a81597b8a08e5414 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* 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) Pick-to: 5.15 Pick-to: 5.12 Change-Id: Ie4bfc92541eaac3844a8a75044e2ba60a89adaaa Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* 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>
* Fix warning about deprecated non-namespaced "endl"Thiago Macieira2020-08-040-0/+0
| | | | | Change-Id: I99ab0f318b1c43b89888fffd160b5b6abebe48f2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Adapt to the Q(Multi)Hash split-upEdward Welbourne2020-07-273-6/+6
| | | | | | | | Make some variables auto so that we no longer care whether they're QHash or QMultiHash. Change-Id: Idbefdbd6134ac862d44403f8ba1dcbf8bf5cd761 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Adapt to QLocale(QString) now being explicitEdward Welbourne2020-07-271-2/+2
| | | | | | | | Various things passed a string to a function expecting a locale. That no longer works; the QLocale() wrapping must be overtly present. Change-Id: Ide5ede5237d8fd4badab7d6a919b08c1883c809a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Convert QRegExp to QRegularExpressionEdward Welbourne2020-07-271-3/+3
| | | | | Change-Id: I0f6918b18816975b91c28d3426c63d9a399aa274 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* 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-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. Pick-to: 5.15 Change-Id: Ie79c181e5f194c00949bfd7d2372f2d246b53180 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-299-12/+12
| | | | | | | | 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>
* Add missing overrideAlexander Volkov2020-06-2953-125/+125
| | | | | Change-Id: Ieae01bc4669cdd503f97399c622989795a0ad734 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-2534-173/+157
| | | | | | Task-number: QTBUG-84469 Change-Id: Iefd2fb627602ef4744d80858eee72a089ef5f4ec Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Qt6: Port QtLocation to QStringViewKarsten Heimrich2020-06-102-6/+6
| | | | | | | Task-number: QTBUG-84319 Change-Id: I48cfafbf0a489947468b4b4e3fcf851e459cdfd3 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix incorrect iteration over a C arrayThiago Macieira2020-05-081-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 Pick-To: 5.15 Change-Id: I99ab0f318b1c43b89888fffd160b589c5543b9d4 Coverity-Id: 226105 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix warning about QString::SkipEmptyParts being deprecatedThiago Macieira2020-05-063-3/+3
| | | | | | | | /home/tjmaciei/src/qt/qt5/qtlocation/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp:107:98: warning: ‘QString::SkipEmptyParts’ is deprecated [-Wdeprecated-declarations] Pick-To: 5.15 Change-Id: Ib3333a58f37746f3b935fffd1607e152af50f386 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Fix Clang 10 warnings about deprecated copy constructorsThiago Macieira2020-05-051-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 Pick-To: 5.15 Change-Id: I99ab0f318b1c43b89888fffd160b4a12bee11723 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-251-0/+20
|\ | | | | | | Change-Id: I731a3916eec8f3b92ac472a9559081761e879606
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ | | | | | | | | | Change-Id: I28f3adfb93bf74bd7af04619fbd5d7dc000c395b
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Iff917e5e9624261107b25eb151625cfc42789ecd
| | | * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 5885d03a4616d86056d98762bb445867081f2dce Android: JNI_OnLoad return JNI_VERSION_1_6 instead of JNI_VERSION_1_4 + 594ec018648060340bfbd96477cfd743d7133a56 Android: request permissions before location requests or updates + f813d6af4e41b8b60652265827c0c06deb888f66 Bump version + 1fb878d8de41a2cfd2e0afe4c939679bbb65fdb2 Examples: set minimal_map fullscreen on Android devices + 07de1d0f0f93b742434e2fcfda70bf70cb6373c9 Fix return type of doc for qmlmethod MapPolyline.setPath Change-Id: I0c42f0a64125d4d559402b6808900a0c90adf386 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-079-24/+34
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: If3ebc0821be0d0206522adf8ff10040e80e34414
| * | | Change QQmlListProperty ctor expecting a QList ptrv5.15.0-beta4Alex Blasche2020-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced by 5a4ffa0de0ecc666a514ef60f0149a76d25b040d Change-Id: Icccf0c8cd3154c102fd93b79e81199e043f7d0bb Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | | Fix Qt6 buildAlexandru Croitor2020-04-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib308cbc590d2a9203ac95a707870f7bd45b9bdea Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit f2fb9058b7053267f3c4b7a2bb5d1fe74fc358f7) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | Fix QHash/QMultiHash related deprecations warningsAlex Blasche2020-04-024-13/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: I5ec9c700a0b69a556512efbd0bfd79c4c2119f9a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | | Make use of qRegisterAnonymousType where possibleAlex Blasche2020-04-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conincidentally the patch fixes a few other minor deprecation warnings in the same file too. Change-Id: Iaf6221cd35cca95415b7d5383477b8c2bcfe92b0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta3Qt Forward Merge Bot2020-03-313-5/+15
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I8b84b78bf234556b7162066b8401630da2afb311
| | * | winrt: Fix crash on exitOliver Wolff2020-03-271-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a static ComPtr<IGeoLocationStatics> in requestAccess might cause a crash on exit as this pointer might be cleaned up after the application has exited. Make sure, that this pointer is deleted together with the rest by making it part of the d pointer. Fixes: QTBUG-80711 Change-Id: I93c09a4549967195101de07b3cef430f8cd52229 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Support custom Mapbox API base URLsAlex Leung2020-03-242-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for custom Mapbox API base URLs. Fixes: QTBUG-82655 Change-Id: Ieebcc834f8aeaeb223b036100e5edadd55749101 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge 5.15 to dev and fix resulting compile issuesQt Forward Merge Bot2020-04-02114-1161/+100546
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 - use errorOccured signal for QTcpSocketTimur Pocheptsov2020-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove ugly cast Task-number: QTBUG-82605 Change-Id: I8220ead34731b488f8350229447e7f2e723f9c11 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | QtLocation: get rid of now unneeded qOverloadsTimur Pocheptsov2020-03-2325-28/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | serialnmea plugin construction connect() error fixJyrki Yli-Nokari2020-03-232-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | serialnmea QIOPipePrivate initialization accessed QIOPipe via q_ptr before the object was constructed. [ChangeLog][QtPositioning][serialnmea plugin] Fixed serialnmea plugin initialization when used with serial port. Fixes: QTBUG-82819 Change-Id: I3ff2de381a124f6b25f19327a39f1b001ef4899a Reviewed-by: Paolo Angelelli <paolo.angelelli.qt@gmail.com>
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-211-2/+2
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I72fa0c1d41db884c752820a8d1fb5a7aa55762bc
| | * | Doc: Fix highlighing of importKai Koehne2020-03-131-2/+2
| | |/ | | | | | | | | | | | | Change-Id: Ifc34a27c89d7d8a63e66e9858f8e6dd3cd9522ab Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2Qt Forward Merge Bot2020-02-291-1/+1
| |\ \ | | |/ | | | | | | Change-Id: I66502770edaa22deb2644ce5071df4894c4d0f97
| | * Fix return type of doc for qmlmethod MapPolyline.setPathShawn Rutledge2020-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-82417 Change-Id: Id9be6f9e248612bce3a17a65d5f73f7ec4c9f45f Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Revert "qtlocation: remove uses of the deprecated member-function"Timur Pocheptsov2020-02-2525-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Examples: request permissions storage permissions on AndroidAssam Boudjelthia2020-02-242-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since QStandardPaths::writableLocation() is used, it's best to make sure we have to write permissions on Android. Task-number: QTBUG-80717 Change-Id: I992661aed25e7d40254f7c7d6373273cf84aac16 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-221-3/+3
| |\ \ | | |/ | | | | | | Change-Id: Ibfd9321f80367173575afb9393307d8b7ce5f399
| | * Examples: set minimal_map fullscreen on Android devicesAssam Boudjelthia2020-02-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | If running minimal_map example on Android, the map view is shown on a small view on top of the screen only, with all the remaining view as blank, this is not desirable. Change-Id: I727247428c9a33e0281083abef672379f479c5be Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Remove use of bearer management from weatherinfo exampleMårten Nordheim2020-02-174-42/+14
| | | | | | | | | | | | | | | | | | Change-Id: I8740a008b43b8a5476bdb3506e763acb4bd1b454 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>