summaryrefslogtreecommitdiff
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-152-13/+0
|\ | | | | | | Change-Id: Id7d47d95c8dc6a696b79812573e50c572593123e
| * 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 ICU linkage on the Mapbox GL pluginThiago Marcos P. Santos2017-11-032-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Bump Mapbox GL to v1.1.0Thiago Marcos P. Santos2017-08-221-0/+0
| | | | | | | | | | | | | | | | mapbox-gl-native @ bd15e273dce767458d335aeb1f50aa081390d593 Task-number: QTBUG-62454 Change-Id: I241ae47d8590a5de7da95f39ae056abeab9c172b Reviewed-by: Paolo Angelelli <paolo.angelelli@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>
* | Merge remote-tracking branch 'origin/5.9' into devPaolo Angelelli2017-08-103-0/+807
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/declarative_ui/tst_map.qml Change-Id: If408b8242b39f78926b5373393f3b1f65b262499
| * Fix dragging items out of map boundsPaolo Angelelli2017-07-283-0/+807
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.9.0 map items are clipped against the visible region. This implies that their geometry is also clipped against the visible region. This is problematic in ::geometryChanged, since the old geometry is always clipped in this way. This patch clips items against a "projectable" region instead, that is the part of the map that is in front of the camera. Since this can produce very large vertices, mapbox earcut 3rd party library is pulled in, to replace qTriangulate that only supports coordinates up to 1<<21. This patch also contains a fix for earcut.hpp to make it build also on QNX6.6 Task-number: QTBUG-61727 Change-Id: Iffc95fdae88fef982c1eb86db567b326b5e51057 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Revert "Fix dragging items out of map bounds"Paolo Angelelli2017-07-193-803/+0
| | | | | | | | | | | | | | | | This reverts commit 2ab93acd9751b3ffe2c36a4a0e37dc792686a08f. Reason being: not passing QNX6 bot Change-Id: If45fe095b6e6959f7c40e3e0ed7a14d278bbb230 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Remove dead code in QDeclarativePolygon/Polyline MapItemsPaolo Angelelli2017-07-171-1/+3
| | | | | | | | | | Change-Id: I95c1d361bd6ba43a3eed5465fc2f74b7a622af72 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix dragging items out of map boundsPaolo Angelelli2017-07-173-0/+801
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.9.0 map items are clipped against the visible region. This implies that their geometry is also clipped against the visible region. This is problematic in ::geometryChanged, since the old geometry is always clipped in this way. This patch clips items against a "projectable" region instead, that is the part of the map that is in front of the camera. Since this can produce very large vertices, mapbox earcut 3rd party library is pulled in, to replace qTriangulate that only supports coordinates up to 1<<21. Task-number: QTBUG-61727 Change-Id: I7449e755a4848a2b2107c5de4e27821e3e887bfb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Bump Mapbox GL to v1.1.0Thiago Marcos P. Santos2017-08-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mapbox-gl-native @ edd7948893fcd40a24d96b790e21d3dd028cecbe New features include: - 3D extrusions - Data driven styles - Style transitions - Bug fixes [ChangeLog][QtLocation][MapboxGL] Updated Mapbox GL Native to v1.1.0 Change-Id: Ib4f88f382dc726e4b229dfe41530034009d7c12b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Add QGeoPolygon to QtPositioningPaolo Angelelli2017-08-042-0/+7
|/ | | | | | | | | | | This patch introduces a new QGeoShape, QGeoPolygon, together with helper functions in the location singleton (QtPositioning.*) to create and convert geopolygons from QML. [ChangeLog][QtPositioning][QGeoPolygon] Added QGeoPolygon shape. Change-Id: I111c576d7428f2a953f0459d16c25eea7ab2bd7c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* More detailed attribution file for Mapbox GLThiago Marcos P. Santos2017-05-251-0/+0
| | | | | | | | | Add individual entries for all the Mapbox GL own dependencies used when building the Mapbox GL plugin. Task-number: QTBUG-60821 Change-Id: I1da2617eed6eabd3ef35c6b23db3418bf56370a0 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.9.0' into 5.9" into ↵Liang Qi2017-05-241-0/+0
|\ | | | | | | refs/staging/5.9
| * Fix build on Android with clangThiago Marcos P. Santos2017-05-091-0/+0
| | | | | | | | | | | | | | | | | | Qt builds Android with clang using libstdc++ instead of libc++. This bumps mapbox-gl-native to a version with a fix that takes that into account. Task-number: QTBUG-60533 Change-Id: I7379cbb43623a745d221cbcdb8bf748486e6cbac Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Use appropriate qmake flags for optimizationsAllan Sandfeld Jensen2017-05-243-11/+12
|/ | | | | | | | | | Using optimize_full gives us -O3 also on icc and clang, and -O3 already implies -ftree-vectorize, and -ffast-math already implies unsafe-math- optimizations. Change-Id: Ieb1a6841da1ea3513ae624bf2468554bc62318c9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix build on OpenSuSE 13.2 + GCC 4.9Thiago Marcos P. Santos2017-05-031-0/+0
| | | | | | | | Changes on Mapbox GL to make GCC 4.9.0 happy. Task-number: QTBUG-60378 Change-Id: Id5ba2e725caa8b54fee651a21ff76c81af02da43 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Enable Mapbox GL plugin on MinGW buildsThiago Marcos P. Santos2017-04-281-0/+0
| | | | | | | | | | | | Qt CI is using MinGW 5.3.0 that should do the job compiling Mapbox GL. For now, only the ANGLE OpenGL backend is supported on Windows for this plugin. I.e. you need to set QT_OPENGL=angle or Qt::AA_UseOpenGLES. Task-number: QTBUG-60110 Change-Id: Iebd4d1569191f47a14b264c489b5d3fb23338d78 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Rename libclipper namespaceThiago Marcos P. Santos2017-04-104-14/+14
| | | | | | | | | | | So it won't clash with the libclipper used by the Mapbox GL plugin when linking Qt with -static. With -static, all the plugins are linked together instead of each one having its own shared library, thus, hiding private symbols. Change-Id: I33ee4afd4b83741c5f3fae32a88da7f4a7fee75f Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Mapbox GL static/debug build fixesBruno de Oliveira Abinader2017-04-071-0/+0
| | | | | | Task-number: QTBUG-59281 Change-Id: I3605265ca9c330ea782bdda53ce5af004ef35a22 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Disable warnings in third-party codeThiago Macieira2017-04-033-3/+3
| | | | | | | | | | We don't care to fix them. clipper.cpp:3665:13: warning: unused variable 'firstLeft' [-Wunused-variable] sweep.cpp:706:8: warning: reference cannot be bound to dereferenced null pointer in well-defined C++ code; comparison may be assumed to always evaluate to false [-Wtautological-undefined-compare] Change-Id: I27b55fdf514247549455fffd14b17ba6040ac332 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix islands disappearing at certain zoom levelsThiago Marcos P. Santos2017-03-151-0/+0
| | | | | | | Bump Mapbox GL Native to a new hash that includes the fix. Change-Id: I95ab18c898b0643372cc94645cb8931b3976677d Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix build when building with -qt-zlibThiago Marcos P. Santos2017-03-142-0/+6
| | | | | | | | | | Qt configures zlib to prefix symbols with z_ and that was messing with mapbox-gl-native own function names due to preprocessor sorcery. Task-number: QTBUG-59447 Change-Id: Ib664a33103990f262b6979953d1415d06f230fd3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Use $$MODULE_BASE_OUTDIR/lib in Mapbox GL nativeBruno de Oliveira Abinader2017-03-081-0/+0
| | | | | | Task-number: QTBUG-59281 Change-Id: Iec3a1fefb029e9eb0386b29b40e7844eba04bbd7 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Remove dependency on QtWidgetsThiago Marcos P. Santos2017-03-061-0/+0
| | | | | | | | | Mapbox GL Native was using QtOpenGL and that was pulling in the dependency on QtWidgets. Now we use only QtGui. Task-number: QTBUG-58821 Change-Id: Iae4c0d6de24988180fd8c837ff53ffc426831a30 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* ICU support in Mapbox GL Native upon availabilityBruno de Oliveira Abinader2017-03-032-0/+13
| | | | | | | Change-Id: I5102b3013263a3cb5158673b19ef7b89655d7fa7 Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com>
* Better dependency tracking when building 3rdparty modulesThiago Marcos P. Santos2017-02-241-20/+0
| | | | | | | | | | | | Make the component using the 3rdparty module depend directly on the module instead of depending on the 3rdparty directory as a whole. This will speedup compiling time when doing parallel builds and make build more consistent when building only selected pieces of QtLocation. Task-number: QTBUG-58943 Change-Id: I95b5ef8302109fb0c5fad760027a7a53d021bfa4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Bump mapbox-gl-native package versionThiago Marcos P. Santos2017-02-201-0/+0
| | | | | | | | | | | Fixed few nits caused by Mapbox GL Native 3rd party package when packaging Qt. Task-number: QTBUG-59035 Task-number: QTBUG-59027 Task-number: QTBUG-58864 Change-Id: I4fe1d985183c027e69303663839ae517a9c1a1be Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Support for Mapbox GL Native rendering of QML Map{Polygon,Polyline} itemsBruno de Oliveira Abinader2017-02-141-0/+0
| | | | | | | | | | | | Replaces Mapbox GL Native annotations with runtime styles API. Missing: - Map{Polygon,Rectangle} border width property - see QTBUG-58872 for details. - MapCircle support - see QTBUG-58869 for detais. Change-Id: I77c9daee813a63efc60104f94f440f00ac3cf70f Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* mapbox-gl-native and mapboxgl depend on opengl (attempt 2)Liang Qi2017-02-131-1/+1
| | | | | | | | | This amends c3eb798dc7b4e82b86169533ae59648205d88d48. Task-number: QTBUG-58807 Change-Id: I1bd0785331d9b66420758023c73100e04fa01658 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* mapbox-gl-native and mapboxgl depend on openglLiang Qi2017-02-131-8/+10
| | | | | | | Task-number: QTBUG-58807 Change-Id: I64f66024e83eaf6414a80085ef98d1ad041464dd Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix per-thread unique QSqlDatabase connection names in Mapbox GL pluginBruno de Oliveira Abinader2017-02-011-0/+0
| | | | | | Task-number: QTBUG-58552 Change-Id: I0bae1579e316c5663145274fc651a74fdfbc37ba Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Add support for native polylines in Mapbox GL pluginBruno de Oliveira Abinader2017-01-311-0/+0
| | | | | Change-Id: I14240e095bb6260d56925c026cf78fc1a3ceacdb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Re-enable the Mapbox GL 3rdparty and the pluginThiago Marcos P. Santos2017-01-312-0/+14
| | | | | | | | It was previously disabled so we could move the 3rdparty package to a more consistent location. Change-Id: I9ebd8c8fe131b2821aa3205e0deda87e9e9db19c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Add clipping for rotated/tilted Map ItemsPaolo Angelelli2017-01-263-66/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds proper rotation/tilting support to Map Items. To do so, clipping is now performed in wrapped mercator space instead of screen space. This prevents projection of geo coordinates that ended behind the camera, and that would be projected incorrectly by the projection transformation. This patch therefore does not use the screen clipping code any longer (clipPathToRect), since the geometry has already been clipped. The downside is that updateSourcePoints is now necessary for any viewport change. This would be necessary anyway in presence of tilt or rotation. NB: Handling of MapQuickItems with zoomLevel set is still TODO. Future work: 1) Optimize updateSourcePoints by pre-computing the mercator projection of the geometry, and let updateSourcePoints do only the wrapping/clipping/projection-to-screen operations. 2) Remove updateScreenPoints altogether Change-Id: Ie0d3dbef68d48ac97a596d40240d0ac126c0efaf Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Update clipper 3rd party libraryPaolo Angelelli2017-01-192-907/+930
| | | | | | | | | | | This patch updates the 3rdparty clipper lib The version of clipper that this patch introduces is 6.4, with SHA1: e03b24c05a322ab91fecee8240532616bd0727ee Change-Id: I957c63249ece74b2861dd2b99879db40c0636fa1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add clipping support to Clip2TriPaolo Angelelli2017-01-192-0/+103
| | | | | | | | | | | | Clip2Tri is a Poly2Tri and Clipper wrapper to do robust triangulation. It also catches exceptions, making Clipper safe to be used with Qt. This patch adds wrappers to expose clipping functionalities through Clip2Tri, in order to use Clipper from a layer that sanitizes the exception and makes it possible to use in Qt. Change-Id: I0cf18d55c87fee2584bcf34928f1a9cb1c3e287f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Document licenses of Qt LocationPaolo Angelelli2016-09-236-82/+39
| | | | | | | | | | | | Add qt_attribution.json files for 3rdparty code in Qt Location, and list the attributions in the index file. Also document the different licenses the module is available under as a whole. The _legal.qdoc files apparently weren't included anywhere, and have been removed. Change-Id: I56e8b75ae044954c745b2fde6f7cd4c1e80ec1b3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix for crash on tessellation of self-intersectiong GeoPolygonsPaolo Angelelli2016-06-1511-0/+5533
| | | | | | | | | | | | | | | QtLocation makes use of a 3rd party library for polygon tessellation, poly2tri. This library is known to be weak in handling complex input, like, for example, polygons with self intersecting edges. Sanitizing the input data through clipper solves the problem, and it has already been implemented in the clip2tri library, which this patch includes and uses. Task-number: QTBUG-52076 Change-Id: I071a58e202345bc71da583995f7245361f00e8c4 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix crash due to floating point precision.Aaron McCarthy2015-01-078-90/+90
| | | | | | | | | | | | 86549ae5135f2efa9ceb0689b88004ede5269668 imported the poly2tri library with doubles changed to floats. The poly2tri has expectations on the precision of floating point operations which are not met with single precision floating point operations, leading to crashes. Revert back to using double precision. Change-Id: Ifd35287461a268fd89cdc6674aa31fef1dd55562 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* Update poly2tri to latest upstream.Aaron McCarthy2015-01-072-8/+22
| | | | | | | | Sync'd with upstream change 26242d0aa7b8. Change-Id: I16e8fd333006b88c464d8e083af181cd2ce726e3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* Fix static linking when using libpoly2triAlex Blasche2014-12-101-9/+1
| | | | | | Task-number: QTBUG-43006 Change-Id: I2143b815d8b597f3a02e8bd18021f6133fa9ea17 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix some typosSergio Ahumada2014-03-032-2/+2
| | | | | Change-Id: If46057e48040fda7b61b81e735c171daf2cc7d06 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix the build on Mac when c++11 was enabledLiang Qi2013-06-071-0/+3
| | | | | | | Task-number: QTBUG-31445 Change-Id: Iac7771f06f4a8f784c7330e299fe0bc448e45202 Reviewed-by: Alex <alexander.blasche@digia.com>
* Ensure compilation does not fail if function does not return a valueRainer Keller2013-01-161-1/+1
| | | | | | | | | | | | | In some cases the 3rd party project source tree "poly2tri" does contain an "assert(0)" instead of a return statement. This lets at least the GNU compiler assume a return value is missing. Some systems consider this an error. To prevent compile errors on those this change adds an additional compiler flag to make functions without a valid return value a warning instead of an error. Change-Id: I13acda8bfd274e37195d49392f4f93990f57ded2 Reviewed-by: Alex <ablasche@gmail.com>
* Make poly2tri library build both debug and release versionsJonathan Liu2012-10-291-0/+3
| | | | | | | | | | | | | | | | | Since the poly2tri library doesn't load qt_module.prf, build_all doesn't get added to CONFIG automatically. This resulted in only the debug version of the library getting built when Qt was configured for building both debug and release. Fixed by making sure build_all and debug_and_release are added to CONFIG explicitly in affected libraries if they are present in QT_CONFIG. Task-number: QTBUG-27679 Change-Id: I62172fc311383ab11c9a71fb65ccfcd163268b82 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix compilation on QNXSean Harmer2012-08-282-1/+2
| | | | | | | | including <cmath> declares the standard maths functions in the std namespace not the global namespace. Change-Id: I293cba5ed166b4f122bb34bca5c1d508e2dda259 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix compiler warnings with MSVC.Friedemann Kleint2012-08-281-2/+2
| | | | | | | | | - Unused variables. - 64bit truncations. Change-Id: I358a1378e875fea4a0790db3c30e422a0b9eba40 Reviewed-by: abcd <amos.choy@nokia.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix qtlocation build for WEC7.Janne Anttila2012-06-201-0/+4
| | | | | | | | | | | | | | | Apparently math.h in WEC7 does not define M_PI used by qtlocation. Added the requiresd define the necessary files. qSqrt returns qreal and it is defined to 'float' on some configurations and to 'double' in other configurations. In those configirations where it is defined to float, no suitable overload for division is found. Added explicit cast for qSqrt return value to double to fix the build. Change-Id: I734fab66abfd4ce95e02ec83e373f0eacd87bdef Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* QtLocation: Fix compiler warnings.Friedemann Kleint2012-05-292-5/+1
| | | | | | | | - Assigned/unused variables. - Signed/unsigned comparison Change-Id: I712baa90442f9fc9699965e7c7e1c5f4ca319aab Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
View Lorry Controller Status