summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Paolo Angelelli2017-09-0510-32/+192
|\ \ | |/ | | | | Change-Id: Ibfd8b430011abb0a7174bbcc158b03f8e26492eb
| * Fix Mapbox GL plugin not respecting MapItem visibility and opacityThiago Marcos P. Santos2017-09-052-3/+19
| | | | | | | | | | | | | | | | Now opacity and visibility will be respected for the fill color as borders are not supported yet. Change-Id: I58f982dc9285537fde770e14238c5d6d903913e6 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix PositionSource never turning active on androidPaolo Angelelli2017-08-301-9/+8
| | | | | | | | | | | | | | | | | | It seems that if m_positionSource gets created too late, PositionSource never becomes active so it never starts pushing position updates. Task-number: QTBUG-62778 Change-Id: I7b375e9f9f1fbe546dfc27fa6bf0c431df393e65 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Mapbox GL native circle supportBruno de Oliveira Abinader2017-08-305-14/+75
| | | | | | | | | | | | | | | | | | | | Circles crossing one pole are drawn inverted. Circles crossing 2 poles do not even have the correct geometry. Nevertheless, a first approximation. Task-number: QTBUG-58869 Change-Id: I5a508f5d6e27c4f08412a7ae327883866068a1e9 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix broken native text rendering with Mapbox GL pluginThiago Marcos P. Santos2017-08-301-0/+12
| | | | | | | | | | | | | | | | | | Mapbox is "leaking" the pixel storage mode. So we need to restore it after we render otherwise it breaks native text rendering. Task-number: QTBUG-62861 Change-Id: I12643e34e462cce58cdf30da52ab927499f38442 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Add a configure feature for each geoservice pluginPaolo Angelelli2017-08-303-6/+78
| | | | | | | | | | | | | | | | This patch makes it possible to disable geoservice plugins at configuration time using the QtLite -no-feature-geoservices_xxx syntax. Change-Id: I276382833db8cfca27383705cbb3f994ced47cb3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge dev into 5.10Frederik Gladhorn2017-09-024-14/+69
|\ \ | | | | | | | | | Change-Id: I36d66c69ac72fe44a5161f7a45803d47d97f8e6e
| * \ Merge remote-tracking branch 'origin/5.9' into devPaolo Angelelli2017-08-274-14/+69
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h Change-Id: I4940db79ebe500ff7e37ded42c7d29d7ccfb6253
| | * Fix PluginParameter not working with script as property valuesPaolo Angelelli2017-08-232-6/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces the undocumented QDeclarativeGeoServiceProviderParameter::initialized signal, to signal to the parent when a parameter becomes fully initialized, so that the parent QDeclarativeGeoServiceProvider can attach. Task-number: QTBUG-62075 Change-Id: Ie3615abf31d19f39587c5e54b202f8f2c4a711cc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * Fix GeocodeModel not autoUpdating if plugin attaches latePaolo Angelelli2017-08-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch handles the case when the plugin attaches after QDeclarativeGeocodeModel::componentComplete() has been called. Change-Id: Ib9e4991ab3a4a34730da2d55fae20a492ac9d9f2 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Fix QDeclarativeGeoMap::populateMap duplicating itemsPaolo Angelelli2017-08-231-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since apparently children() and childItems() do not necessarily return disjoint sets, concatenating the two lists did, in some cases, cause duplicated items in the map. This patch resorts to uniting sets to remove the duplicates. Change-Id: I07ef19a2fdff65429eb65d92be278d7c02ac1999 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Bump Mapbox GL to v1.1.0Thiago Marcos P. Santos2017-08-225-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | mapbox-gl-native @ bd15e273dce767458d335aeb1f50aa081390d593 Task-number: QTBUG-62454 Change-Id: I241ae47d8590a5de7da95f39ae056abeab9c172b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| | * Fix MapParameters not having effect on Mapbox GL if added dynamicallyThiago Marcos P. Santos2017-08-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code was not handling the case of MapParameters changing the style appearance after the style is fully loaded, which happens when MapParameters are created dynamically at runtime. [ChangeLog][QtLocation][MapboxGL] Fixed MapParameter dynamic usage Task-number: QTBUG-61442 Change-Id: I64a8a1416dd5f7477297878f42760ad9008382a4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Fix the filter attribute name inside the named filterJarek Kobus2017-09-011-1/+1
|/ / | | | | | | | | Change-Id: Ib19c416b07d2d14771beb1445a2209dbf8b1fa96 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Update Mapbox GL versionThiago Marcos P. Santos2017-08-221-0/+0
| | | | | | | | | | | | | | | | | | Includes the patch that removes incompatible caches when downgrading Mapbox GL to a version that uses an older cache database schema. Task-number: QTBUG-62454 Change-Id: I666777ff8a984e4acee9f585c191e7204cbbadb7 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix 3D buildings not being renderedThiago Marcos P. Santos2017-08-211-0/+1
| | | | | | | | | | | | | | | | Let Mapbox GL know about what FBO is in use so it can set texture attachments properly. Change-Id: Ie70de0f449eecf1d8a1f1dec8b89e60495ca5386 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix MapParameters not having effect on Mapbox GL if added dynamicallyThiago Marcos P. Santos2017-08-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | The previous code was not handling the case of MapParameters changing the style appearance after the style is fully loaded, which happens when MapParameters are created dynamically at runtime. [ChangeLog][QtLocation][MapboxGL] Fix MapParameter dynamic usage Task-number: QTBUG-61442 Change-Id: I64a8a1416dd5f7477297878f42760ad9008382a4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Update Mapbox GL stylesThiago Marcos P. Santos2017-08-111-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced deprecated styles and added new navigation styles. Replaced: - traffic-day-v1 -> navigation-preview-day-v2 - traffic-night-v1 -> navigation-preview-night-v2 New: - navigation-guidance-day-v2 - navigation-guidance-night-v2 [ChangeLog][QtLocation][MapboxGL] Updated map styles Task-number: QTBUG-62002 Change-Id: I461335b7354bf78ee5d4c380bffd72a5bfda3285 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devPaolo Angelelli2017-08-1020-235/+1025
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/declarative_ui/tst_map.qml Change-Id: If408b8242b39f78926b5373393f3b1f65b262499
| * Fix routes comparisonBogDan Vatra2017-08-091-2/+2
| | | | | | | | | | Change-Id: Ie02061804efdb79911a997bd017d13ed0d65d262 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix visible region computation in QGeoProjectionWebMercatorPaolo Angelelli2017-08-093-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the visible region is calculated as the intersection between the viewing frustum and the map plane clipped against the map extended rectangle in mercator space (from -1 to 2 in x coords, 0 to 1 in y coords). The result is correct in the extended mercator space. However, this may lead to overlapping coordinates when converted back to latitude and longitude. For this reason, this patch changes the clipping geometry to be the map un-extended rectangle centered around the current map center. The result is a geometry that never wraps around or overlaps, thus removing the need for handling separately the case when the map is fully visible when returning the visible region. Task-number: QTBUG-57690 Change-Id: I8396c40a123ce94bff4388dfefbd8a694657b8bd Reviewed-by: BogDan Vatra <bogdan@kdab.com>
View Lorry Controller Status