summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Liang Qi2017-11-211-0/+41
|\ | | | | | | Change-Id: Ia3bb9e3a2b8eb6d1ee5396e723a1dfa82b235fba
| * Add changes file for Qt 5.9.3v5.9.35.9.3Alex Blasche2017-11-101-0/+41
| | | | | | | | | | Change-Id: I7d99490cbcaf99ce51e97a4ad9d5661da66c5add Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Add changes file for Qt 5.10.0Antti Kokko2017-11-201-0/+62
| | | | | | | | | | Change-Id: Iccc7e2837cfe8cd65fc1e4ae20c8c94cb8e1dbdc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-209-32/+27
|\ \ | | | | | | | | | Change-Id: I81af4fc4e6dcc204b3657ec321820d6c7109e336
| * \ 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>
* | | 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>
* | Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-033-6/+6
| | | | | | | | | | 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-26158-531/+1790
|\ \ | |/ | | | | | | | | | | 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-17116-347/+1507
| | | | | | | | | | | | | | Use new version with commercial exception. Change-Id: I11058c94138615f7df2f99b6c3245ab075cd8222 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix outdated FDL headerKai Koehne2017-10-1733-161/+161
| | | | | | | | | | Change-Id: Ie9771204ea1aa46e333d96ab0f392c795c512946 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: I67735aa7b93d0871dca8d301a003e5bdfc80833d
| * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+56
| |\ | | | | | | | | | Change-Id: Ia24b0f27b408902a3d8da10b25960b3f814d8592
| | * Merge 5.9 into 5.9.2v5.9.25.9.2Oswald Buddenhagen2017-09-252-5/+37
| | |\ | | | | | | | | | | | | Change-Id: I69598f5f4c5c7c8fec58c6ff41f353fe4e042762
| | * | Add changes file for Qt 5.9.2Jani Heikkinen2017-09-221-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-62751 Change-Id: Ia8cd743245cb0df867ef373cb97c7d1ade005b23 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-212-5/+37
| |/ | | | | | | | | | | Task-number: QTBUG-63251 Change-Id: I7ceeeebb30007c5d97d61e057c8ec6e827177b19 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Fix mapviewer example build with -no-feature-libraryJake Petroules2017-09-151-1/+2
| | | | | | | | | | Change-Id: I4d2d430a1315afb1b5cbbaf254b08691579d28f2 Reviewed-by: Lars Knoll <lars.knoll@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-116-32/+45
|\ \ | |/ | | | | 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>
| * Remove HERE plugin from testsPaolo Angelelli2017-09-091-14/+2
| | | | | | | | | | | | | | | | It keeps causing errors saying that host requires autentication, every now and then. Change-Id: I9fc96aee8793ca865cbcc88c7340f2363d08fc1f 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-0515-35/+235
|\ \ | |/ | | | | 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 places_map example view on AndroidAlex Blasche2017-08-312-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The previous setup enforced a small 360x640 view size on Android which makes no sense on the platform's full screen premise. This patch tells the QML rectangle to adjust to the parent's size and shifts the size limitation to the surrounding QuickView. At the same time the QuickView will automatically change to full screen as per platform requirement. Change-Id: I2dcd0fc345f6c1ef7520bb10116d9f2fe0722dff 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>
| * Add change file for Qt 5.6.3Jani Heikkinen2017-08-301-0/+38
| | | | | | | | | | Change-Id: I76c7bb46ae7e068c1db780c34d8a0c065e55b2c4 Reviewed-by: Alex Blasche <alexander.blasche@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-304-7/+80
| | | | | | | | | | | | | | | | 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>
| * Revert places_map.png to the pre-mapboxgl versionPaolo Angelelli2017-08-291-0/+0
| | | | | | | | | | | | | | | | The new screenshot did not match the code (showing Helsinki's pizzerias, not Oslo's) Change-Id: Ie51ca95c3e554e8a353d57e7a7db8f36521eef83 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge dev into 5.10Frederik Gladhorn2017-09-027-15/+106
|\ \ | | | | | | | | | Change-Id: I36d66c69ac72fe44a5161f7a45803d47d97f8e6e
| * \ Merge remote-tracking branch 'origin/5.9' into devPaolo Angelelli2017-08-277-15/+106
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h Change-Id: I4940db79ebe500ff7e37ded42c7d29d7ccfb6253
View Lorry Controller Status