summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-2626-226/+534
|\ | | | | | | | | | | | | | | Conflicts: tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp tests/plugins/declarativetestplugin/testhelper.h Change-Id: Ie218ab1dc68642a6922e05e5688c20b90440b72e
| * Clarify operation of QDeclarativeGeoMapItemBase::childMouseEventFilterPaolo Angelelli2018-01-251-3/+8
| | | | | | | | | | Change-Id: I06353153980659bf9370705b2d7f4263d066bdad Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix copyright notice performance when adding/removing itemsPaolo Angelelli2018-01-164-70/+31
| | | | | | | | | | | | | | | | | | | | This change avoids rescanning the list of map items every time an item is added or removed, to recompute the Z value at which the copyright notice should go. Task-number: QTBUG-64880 Change-Id: Ieea77669f0140e43085a76dfd9dfdee40a335f5a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Fix performance issue with copyright noticePaolo Angelelli2018-01-159-43/+141
| | | | | | | | | | | | | | | | | | | | | | | | Skip evaluating copyrights when the notice is not visible. The implication of this patch is that copyright information won't be up to date or even available unless there is an "attached" copyright notice that has the visible property set to true. Task-number: QTBUG-64880 Change-Id: I3750b61913becb0cbf31273ad9a76ae1a2b6a393 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix GeocodeModel getting stuck in Loading statusPaolo Angelelli2018-01-121-5/+6
| | | | | | | | | | | | | | | | Caused by a signal emitted before nulling a member Task-number: QTBUG-65498 Change-Id: Iad7ab8b2c6cfc290953191eab71ca9aa645ff499 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix fitViewportToMapItems in presence of MapQuickItems with zoomLevelPaolo Angelelli2018-01-112-22/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Map.fitViewportToMapItems currently uses the screen geometries of the items to calculate the new values for zoom level and center. When the zoomLevel property is set on MapQuickItems, their on-screen geometry is affected by a hidden transformation within the item. This patch considers that transformation in the calculations. Task-number: QTBUG-63093 Change-Id: I328028f1901b31225866aa3d749849815d59a2a1 Reviewed-by: Vlad Seryakov <vseryakov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Fix documented property types for Map propertiesPaolo Angelelli2018-01-101-5/+5
| | | | | | | | | | | | Task-number: QTBUG-65564 Change-Id: I9c52d0bdbbdd2eb0e41ff21741423aa7e22f3e28 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix NmeaPositionInfoSource not combining sentences - simulation modePaolo Angelelli2018-01-107-60/+286
| | | | | | | | | | | | | | | | | | | | | | | | This patch is the first half of a fix to prevent NmeaPositionInfoSource to push an update per sentence instead of combining all sentences with the same timestamp into one QGeoPositionInfo. This patch fixes only the source in simulation mode. Additional work is needed for standard mode. Task-number: QTBUG-64699 Change-Id: I39d9905331c5a1f646b7465f4d7d155834bec815 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Use custom namespace in QtLocation's earcutBruno de Oliveira Abinader2018-01-093-3/+3
| | | | | | | | | | | | | | | | | | The custom namespace avoids clashes with mapbox-gl-native's own earcut.hpp dependency. Task-number: QTBUG-65262 Change-Id: Ic5121e88dca45c01af7ce26e38a99a0cd2d1c88e Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Increase lat/lon precision in OSRMv5::requestUrlPaolo Angelelli2018-01-091-1/+1
| | | | | | | | | | Change-Id: I1ca0565640c639419796cf32d8cefea99bd21a88 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Document that WinRT plugin can be used for Win32 env (if platform is Win10)Alex Blasche2018-01-091-1/+3
| | | | | | | | | | | | | | Task-number: QTBUG-65325 Change-Id: I46bbca4d90ef9d96be91ffbb2346f8f4e6da8855 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * Apple platforms: properly guard API access when requesting location infoJake Petroules2018-01-022-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requestAlwaysAuthorization and requestWhenInUseAuthorization are prohibited APIs on macOS, and the former is also prohibited API on tvOS. This means they are akin to private APIs and must not be called under any circumstances. The respondsToSelector calls are also removed as Qt no longer supports OS versions where thee methods are not available, and in any case such uses should be replaced with __builtin_available. Background location updates are also now made available on watchOS 4 and above. Change-Id: I817d69f4ec71b96f03dda42635d675499e8908c0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | Remove duplicated qlocationglobal_p.h entryAlex Blasche2018-01-091-1/+0
| | | | | | | | | | | | | | It is a private header. Change-Id: Id1455758a64943f7df36030243be8b197b07d450 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Paolo Angelelli2017-12-155-13/+4
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8300f5fcbbe3064049e11d2b04c10e35c9945c8d
| * Remove OpenGL ES limitation for Mapbox GL on WindowsBruno de Oliveira Abinader2017-11-302-9/+0
| | | | | | | | | | | | | | | | | | | | Also fixes an issue preventing GL native from working on MinGW. mapbox-gl-native @ 8757164ac8f2b033b2b12d4baf075ed18cfeb2b4 Task-number: QTBUG-64632 Change-Id: Iab9a560adcd54194cd9829a326b325856f8c8cc2 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Enforce numberAlternativeRoutes where possible when doing route requestsPaolo Angelelli2017-11-282-2/+2
| | | | | | | | | | Change-Id: I321e802d795df36d8cdd1b8578e77094c500cc2e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Make QGeoMapParameter accessors virtualPaolo Angelelli2017-11-231-2/+2
| | | | | | | | | | | | | | | | So that it's possible to make the type property somehow constant in subclasses Change-Id: I61f4d1b412dbfb173e7ca7fa31411cffbfcfacb1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Disable Mapbox-GL with the Intel compilerThiago Macieira2017-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MBGL code uses C++ Standard Library functionality that does not compile with ICC. Or with QNX. Or MSVC. So, great job in the Standard Library being cross-platform. When using gcc 6 headers: /usr/include/c++/6/experimental/optional(720): error: more than one instance of overloaded function "__constexpr_addressof" matches the argument list: [...] detected during instantiation of "const _Tp *std::experimental::fundamentals_v1::optional<_Tp>::operator->() const [with _Tp=std::string]" at line 47 of "platform/qt/src/http_request.cpp" When using gcc 7 headers: /usr/include/c++/7/ext/new_allocator.h(136): error: function "std::pair<_T1, _T2>::pair(const std::pair<_T1, _T2> &) [with _T1=const std::string, _T2=mbgl::gl::VertexArray]" (declared at line 292 of "/usr/include/c++/7/bits/stl_pair.h") cannot be referenced -- it is a deleted function Change-Id: I9741f017961b410c910dfffd14ff5d8b5f5120d3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.10.0' into 5.10" into ↵Liang Qi2017-12-081-0/+2
|\ \ | | | | | | | | | refs/staging/5.10
| * \ Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-209-32/+27
| |\ \ | | | | | | | | | | | | Change-Id: I81af4fc4e6dcc204b3657ec321820d6c7109e336
| * | | Doc: Maintain the list of highlighted examples locallyTopi Reinio2017-11-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the list was maintained in qtbase. Change-Id: Iab52737abc54ff73e91c8c5cf6b0191e31eaa723 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | | Always step QML versions when Qt steps a versionAlex Blasche2017-12-084-12/+67
| |/ / |/| | | | | | | | | | | Change-Id: I2b9751dcdcee4a5d8d3353bfc2fcc43cd995b584 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-158-31/+26
|\ \ \ | | |/ | |/| | | | Change-Id: Id7d47d95c8dc6a696b79812573e50c572593123e
| * | Update Mapbox GL docs on the db file nameBruno de Oliveira Abinader2017-11-141-0/+6
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63013 Change-Id: Ifc232705eec81ec632cb19282cfba02c04ba5ec6 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com>
| * | Bump Mapbox GL versionBruno de Oliveira Abinader2017-11-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps Mapbox GL to a new version that fixes the Qt-based database SQLite query binding for text data. Also, replaces 'QImage::byteCount()' with 'QImage::sizeInBytes()' to avoid deprecation warnings in Qt 5.10 onwards. mapbox-gl-native @ 3bef7593a64a51e86dd5a2ed9fd36b4a143350b0 Task-number: QTBUG-63013 Change-Id: I81fb4d8a7cb36fe96e28e28692411460edde5c96 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | Fix Mapbox GL plugin OpenGL usageThiago Marcos P. Santos2017-11-083-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were linking directly with the OpenGL library available in the system. On Windows for instance the only option was ANGLE. Now Mapbox GL is using OpenGL through QOpenGLFunctions and shall offer much better compatibility. Task-number: QTBUG-62108 Task-number: QTBUG-61767 Task-number: QTBUG-60897 Change-Id: Iabd29ff6c0b6daf14373508d4847344c07d01a57 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | Enable alpha channel in QSGMapboxGLTextureNodeBruno de Oliveira Abinader2017-11-031-1/+8
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64038 Change-Id: Icfa079d181994d8db9bd738bbd6107dce0ea76d1 Reviewed-by: Ola Røer Thorsen <ola@silentwings.no> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | Fix MapPolygon docPaolo Angelelli2017-11-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document undefined behavior for less than 3 coordinates Task-number: QTBUG-63929 Change-Id: I3111637c625d6410e8bd58c566f54e3accadc2e3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Ola Røer Thorsen <ola@silentwings.no> Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com>
| * | Fix ICU linkage on the Mapbox GL pluginThiago Marcos P. Santos2017-11-033-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes both the Mapbox GL plugin and the Mapbox GL engine at src/3rdparty/mapbox-gl-native use ICU in the same way as qtbase. QMAKE_USE_PRIVATE += icu This should fix build errors when using an ICU that doesn't have headers installed on the default header lookup path. That assumption was specially true for the Mapbox GL engine 3rdparty submodule. Task-number: QTBUG-63571 Change-Id: Id0ab4cb8fb42b8eda8afb9650cd678ee7c5c45ad Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | Consider map item color alpha channel when applying opacityBruno de Oliveira Abinader2017-10-261-4/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63928 Change-Id: I8b09da92e182dc5464516842718b8d30bc9a48fc Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | Check if coordinates are non-empty before repeating the first entryBruno de Oliveira Abinader2017-10-261-1/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63926 Change-Id: Ic57090dbc78705893280e040e5b4556cf296f949 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | remove use of deprecated QQuickEventPoint::grabber()Shawn Rutledge2017-11-081-1/+1
| |/ |/| | | | | | | | | | | It will soon be removed. Change-Id: Id3e348a6e2ef200b1dde7bd87f64b7ca2cffc5cc Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* | Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-032-3/+3
| | | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3Liang Qi2017-10-2644-175/+335
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9a3d7ec0bb203ac8b5bd483af3973510ca33c4a9
| * Windows/MinGW: Build MapBoxGL only when Qt is built with ANGLEFriedemann Kleint2017-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | The code links against functions of OpenGL versions > 1.1, which Windows' opengl32.dll does not provide. Task-number: QTBUG-62417 Change-Id: I0fa1ba6ef3fa3ed714e261369df1292018f5568b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Android: check positioning listener not nullVyacheslav Koscheev2017-10-241-2/+5
| | | | | | | | | | | | Change-Id: I8b491dc1a3b9056c9a15d6814b72e52e37132dda Reviewed-by: Sergey A. Galin <s.galin@2gis.ru> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix outdated BSD license headerKai Koehne2017-10-1714-42/+182
| | | | | | | | | | | | | | Use new version with commercial exception. Change-Id: I11058c94138615f7df2f99b6c3245ab075cd8222 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix outdated FDL headerKai Koehne2017-10-1723-111/+111
| | | | | | | | | | Change-Id: Ie9771204ea1aa46e333d96ab0f392c795c512946 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix MapboxGL crashing when no OpenGLContext can be createdPaolo Angelelli2017-09-261-7/+10
| | | | | | | | | | | | Task-number: QTBUG-63374 Change-Id: Iff172e7715ac9f59da23e890bae77ff522ed9e47 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix Map.fromCoordinate returning wrong values during tiltingPaolo Angelelli2017-09-211-5/+15
| | | | | | | | | | | | Task-number: QTBUG-63251 Change-Id: I7ceeeebb30007c5d97d61e057c8ec6e827177b19 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Fix MapGestureArea docPaolo Angelelli2017-09-121-1/+1
| | | | | | | | | | | | Task-number: QTBUG-62593 Change-Id: Ieb9a6d8b78b7b123f7376e7313d4a06a00a02841 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add braces to fix compilation with clangRobert Loehning2017-09-121-2/+2
| | | | | | | | | | | | Change-Id: If79aca3d20475f7734cdd525747f44372ed930b7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
| * Fix wrong clipper dependency due to incorrect qmake syntaxAlex Blasche2017-09-121-4/+8
| | | | | | | | | | | | Task-number: QTBUG-63124 Change-Id: I0edac8fe9bda70e7c3bb0b8667ae33e25957af14 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | positioning.pro: Remove qgeopolygon_p.hFriedemann Kleint2017-10-241-1/+0
| | | | | | | | | | | | | | | | Fix qmake warning: WARNING: Failure to find: qgeopolygon_p.h Change-Id: If943dce0cc9957bc877f3dcaf61a5ddf0d832421 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | DocFix: mark the new QDeclarativeGeoMap API in 5.10 as tech previewv5.10.0-beta2Paolo Angelelli2017-10-071-0/+4
| | | | | | | | | | Change-Id: Iec1cf03fe5cb480cb6dcd24b43046d7009a37f23 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1Paolo Angelelli2017-09-115-18/+43
|\ \ | |/ | | | | Change-Id: Ibcf748d5f0d172ad5c77bdcd41806009ff6914e3
| * Fix disabling redirection for providers that have no local fallbackMårten Nordheim2017-09-112-8/+9
| | | | | | | | | | | | | | | | | | | | | | Currently these providers would not turn ready when disableRedirection() is called, while they also get disconnected, thus never being tried to be resolved, resulting in stalling the completion of the provider's resolution process Task-number: QTBUG-63033 Change-Id: I316b858fbc66b82bc124b8814b25fe29bc0c21a1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix tile cache not honoring cost 0Paolo Angelelli2017-09-112-9/+33
| | | | | | | | | | | | | | | | | | This patch fixes the case of disabling the various caches. Currently setting the cache size to 0 results in default initial values instead. Change-Id: I019cd15ac23b6479e4367a3e102dd661895a7fda Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Prevent MapItemView from fitting viewport on map when not readyPaolo Angelelli2017-09-111-1/+1
| | | | | | | | | | Change-Id: I4c066c858801f9d80974018c00b245ec86c05d1e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Use QGeoPolygon for returning the visible regionv5.10.0-alpha1Paolo Angelelli2017-09-091-5/+6
| | | | | | | | | | Change-Id: I5be81916c5c7b4802bdde00c60c370b9a12c07e9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
View Lorry Controller Status