summaryrefslogtreecommitdiff
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* New triangulator for map polygonsAlex Wilson2012-05-2417-0/+2838
| | | | | | | | | | | | | | | Replacing the qTriangulate call with poly2tri. This is a BSD-licensed triangulation library that gives better performance for most of our shapes. See http://pastie.org/3893553 for a timing comparison on linux-x86 (timing is given for the whole screen transformation step) The BSD-licensed code is isolated into its own dir (in src/3rdparty) and compiled as a separate static library to be linked in. The files have been renamed (.cc => .cpp) and doubles changed to floats, but are otherwise identical to those found at http://code.google.com/p/poly2tri/ Change-Id: Ib07aadafdc5d4b8ac1024e1eecd70ab39f673197 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Squashed commit of the following:Aaron McCarthy2011-09-09173-32334/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 142bae21d2c938ea29ebfaf8cafd5b1791ae1f6e Merge: 1eac7c4 3b55bbd Author: Aaron McCarthy <aaron.mccarthy@nokia.com> Date: Fri Sep 9 12:41:26 2011 +1000 Merge remote branch 'origin/places' into maps-merge Conflicts: examples/declarative/flickr/qmllocationflickr.cpp examples/declarative/landmarkmap/landmarkmap.pro examples/declarative/landmarkmap/qmllandmarkmap.cpp examples/declarative/mapviewer/mapviewer.pro examples/declarative/mapviewer/qmlmapviewer.cpp examples/examples.pro src/3rdparty/proj.pri src/imports/location/location.cpp src/imports/location/location.pro src/imports/location/qdeclarativegeomapcircleobject.cpp src/imports/location/qdeclarativegeomapcircleobject_p.h src/imports/location/qdeclarativegeomapgroupobject.cpp src/imports/location/qdeclarativegeomapgroupobject_p.h src/imports/location/qdeclarativegeomapmousearea_p.h src/imports/location/qdeclarativegeomapobject.cpp src/imports/location/qdeclarativegeomapobject_p.h src/imports/location/qdeclarativegeomapobjectborder.cpp src/imports/location/qdeclarativegeomappixmapobject.cpp src/imports/location/qdeclarativegeomappixmapobject_p.h src/imports/location/qdeclarativegeomappolygonobject.cpp src/imports/location/qdeclarativegeomappolygonobject_p.h src/imports/location/qdeclarativegeomappolylineobject.cpp src/imports/location/qdeclarativegeomappolylineobject_p.h src/imports/location/qdeclarativegeomaprectangleobject.cpp src/imports/location/qdeclarativegeomaprectangleobject_p.h src/imports/location/qdeclarativegeomaprouteobject.cpp src/imports/location/qdeclarativegeomaprouteobject_p.h src/imports/location/qdeclarativegeomaptextobject.cpp src/imports/location/qdeclarativegeomaptextobject_p.h src/imports/location/qdeclarativegeoserviceprovider_p.h src/imports/location/qdeclarativegraphicsgeomap.cpp src/imports/location/qdeclarativegraphicsgeomap_p.h src/imports/location/qdeclarativelandmarkcategorymodel_p.h src/imports/location/qdeclarativelandmarkfilters_p.h src/imports/location/qdeclarativelandmarkmodel_p.h src/location/location.pro src/location/maps/qgeomapcircleobject.cpp src/location/maps/qgeomapcircleobject.h src/location/maps/qgeomapcircleobject_p.h src/location/maps/qgeomapcustomobject.cpp src/location/maps/qgeomapcustomobject.h src/location/maps/qgeomapcustomobject_p.h src/location/maps/qgeomapdata.cpp src/location/maps/qgeomapdata.h src/location/maps/qgeomapgroupobject.cpp src/location/maps/qgeomapgroupobject.h src/location/maps/qgeomapobject.cpp src/location/maps/qgeomapobject.h src/location/maps/qgeomapobjectengine_p.cpp src/location/maps/qgeomapobjectengine_p.h src/location/maps/qgeomapobjectinfo.cpp src/location/maps/qgeomapoverlay.cpp src/location/maps/qgeomappingmanagerengine.cpp src/location/maps/qgeomappixmapobject.cpp src/location/maps/qgeomappixmapobject.h src/location/maps/qgeomappixmapobject_p.h src/location/maps/qgeomappolygonobject.cpp src/location/maps/qgeomappolygonobject.h src/location/maps/qgeomappolygonobject_p.h src/location/maps/qgeomappolylineobject.cpp src/location/maps/qgeomappolylineobject.h src/location/maps/qgeomappolylineobject_p.h src/location/maps/qgeomaprectangleobject.cpp src/location/maps/qgeomaprectangleobject.h src/location/maps/qgeomaprectangleobject_p.h src/location/maps/qgeomaprouteobject.cpp src/location/maps/qgeomaprouteobject_p.h src/location/maps/qgeomaptextobject.cpp src/location/maps/qgeomaptextobject.h src/location/maps/qgeomaptextobject_p.h src/location/maps/qgraphicsgeomap.cpp src/location/maps/qgraphicsgeomap.h src/location/maps/tiled/makepoly_p.h src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h src/location/maps/tiled/qgeotiledmapdata.cpp src/location/maps/tiled/qgeotiledmapdata.h src/location/maps/tiled/qgeotiledmapdata_p.h src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp src/location/maps/tiled/qgeotiledmapobjectinfo_p.h src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp src/location/maps/tiled/qgeotiledmappingmanagerengine.h src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp src/location/maps/tiled/qgeotiledmaprequest.cpp src/location/maps/tiled/qgeotiledmaprequest_p.h src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp src/location/mapsgl/cameradata.h src/location/mapsgl/map.h src/location/mapsgl/map2d/projection2d_p.h src/location/mapsgl/map3d/map3d_p.h src/location/mapsgl/map3d/spheregeometry_p.h src/location/mapsgl/map3d/viewport.cpp src/location/mapsgl/map3d/viewport_p.h src/location/mapsgl/map3d/viewportcamera_p.h src/location/mapsgl/map3d/viewporttiles_p.h src/location/mapsgl/map3d/viewporttiles_p_p.h src/location/mapsgl/map3d/viewporttilesnew.cpp src/location/mapsgl/map3d/viewporttilesold_p.h src/location/mapsgl/mapitem.h src/location/mapsgl/mapsphere_p.h src/location/mapsgl/projection_p.h src/location/mapsgl/tile.cpp src/location/mapsgl/tile.h src/location/mapsgl/tilecamera.h src/location/mapsgl/tilespec.cpp src/location/mapsgl/tilespec.h src/location/projwrapper_p.cpp src/location/projwrapper_p.h src/plugins/geoservices/nokia/nokia.pro src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp tests/auto/auto.pro tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro tests/auto/testplugin/qgeosearchmanagerplugins.pro tests/auto/testplugin/testplugin.pro tests/declarativetestplugin/location.pro tests/declarativetestplugin/locationtest.cpp tests/declarativetestplugin/qdeclarativelocationtestmodel.cpp tests/declarativetestplugin/qdeclarativelocationtestmodel_p.h tests/tests.pro Change-Id: I23e2a324ad64ea1abe026c72569d578dcc664e75 commit 1eac7c46f40a1007e11841d7b9fc7934da3e3f45 Author: Aaron McCarthy <aaron.mccarthy@nokia.com> Date: Fri Sep 9 10:37:30 2011 +1000 Rename project files. Change-Id: Idc1d7f3fcf4f5fdbf38af3842928cdfada1b7ee8 commit db2d91abf29e52236358e67dabbabbf4568f5d84 Author: juhvu <qt-info@nokia.com> Date: Thu Sep 8 20:53:35 2011 +1000 Revert "temp check" This reverts commit 82f1370d2d29bfb95663a740d2b566fa22093388. commit 82f1370d2d29bfb95663a740d2b566fa22093388 Author: juhvu <qt-info@nokia.com> Date: Thu Sep 8 20:40:42 2011 +1000 temp check Change-Id: I1d497a44d9422dd9b08554ccaad80ac80a0b8bae commit 19276939b4b56281e8b5f5f418afa76383ff91b9 Author: juhvu <qt-info@nokia.com> Date: Thu Sep 8 20:20:51 2011 +1000 clear color more obvious Change-Id: I7609c4218a8d5112d7ff361b4b5515d418770364 commit 4a179d3a08e07ac3e32e0c2f555ddb2eed21b636 Author: juhvu <qt-info@nokia.com> Date: Thu Sep 8 19:53:55 2011 +1000 more qdebugs Change-Id: If1cede53f8d38e799e7da4ffee92e3dbb93af764 commit 3e63c9f5fe1062294734082ec4fd94c5badf0213 Author: juhvu <qt-info@nokia.com> Date: Thu Sep 8 19:11:47 2011 +1000 qdebugs more visible Change-Id: Ibd2acc57ce22bdf743b9a440ec77e59a2dc576bd commit 2c1f5c8cb245155e09677f3e3e592ac64a9ffc56 Author: juhvu <qt-info@nokia.com> Date: Thu Sep 8 18:39:39 2011 +1000 Some qdebugs always needed. Change-Id: I2af97585e7e4a14bf1f2ca9dccc5280e31d453b4 commit 3e1a6a12571ed056b9141475d6214c464a6693f7 Author: juhvu <qt-info@nokia.com> Date: Thu Sep 8 14:41:21 2011 +1000 Check qsgengine availability earlier. Change-Id: I65f3902f1829ff7869831135f574873ea4265374 commit cb71264ee7a573033985cc1eab8452cf29a34c65 Author: David Laing <david.laing@nokia.com> Date: Wed Sep 7 14:59:19 2011 +1000 First pass at improved intersection code. The old code has some dependencies on some QPainter specific code that we might not be able to rely on in the very near future. This could do with some testing. commit 09f101e685f48154c5bede732c147dee027dffd5 Author: David Laing <david.laing@nokia.com> Date: Wed Sep 7 13:54:18 2011 +1000 Removes accidentally added tex files. commit 675fa4c57a0f537ce5f30c06ffcf0f00e56a18ab Author: David Laing <david.laing@nokia.com> Date: Wed Sep 7 13:48:33 2011 +1000 Refactors the code to remove the deprecated parts of Maps. Also changes the new mapping code to make use of the existing maps plugin system. commit f873103da192c1ba5195018bdc8222c148d0c4c8 Author: juhvu <qt-info@nokia.com> Date: Tue Sep 6 14:14:39 2011 +1000 test plugin import fix Change-Id: Ib8f2fec09e38ebef43895a145520399ac470a7b7 commit 29719cdc6ebc62045ae8083836ce418ab21ba11b Author: juhvu <qt-info@nokia.com> Date: Tue Sep 6 11:19:07 2011 +1000 Temp hack to resolve the QML startup assert. Change-Id: I01ba9be3e1c92e032885dc71140a62392dbbfbc4 commit 680954a85ea69ed4146a66b726f8775b03fec311 Author: Xizhi Zhu <xizhi.zhu@nokia.com> Date: Mon Jun 27 16:48:29 2011 +0300 Fix copy2build output path for QML plugin. commit b309375dff7bc23b1759dfed1edcad609b7647f9 Author: David Laing <david.laing@nokia.com> Date: Fri Sep 2 14:14:30 2011 +1000 Cleans up the includes in the C++ code. commit 8b5328e06db5c5799f47feb57fa0ea33a65b9d74 Author: David Laing <david.laing@nokia.com> Date: Fri Sep 2 12:54:33 2011 +1000 Fixes some compile warnings for the new maps code. commit 43c7b2b76e3e634f0066a7cb012ea0eab4c4eb53 Author: David Laing <david.laing@nokia.com> Date: Fri Sep 2 11:42:21 2011 +1000 Further cleans up naming of files. commit ecfd70736d7bf3b7233940024756c81d73487d39 Author: David Laing <david.laing@nokia.com> Date: Thu Sep 1 17:40:48 2011 +1000 Adds licenses and sorts out private/public headers. commit f0a394389c3dc8c51f48e44c78300886f595887e Author: juhvu <qt-info@nokia.com> Date: Thu Sep 1 14:05:25 2011 +1000 Possible to run qml basic map without tweaks to qtdeclarative. Means that no map items or mouseareas will work. Change-Id: I6c6d1013462eb8424b5ec9eeb9e7779bb0cb5f25 commit 383983f2a2b4674332b63bb81da1b17fe11db3fa Author: David Laing <david.laing@nokia.com> Date: Wed Aug 31 16:13:32 2011 +1000 Removes unused debug output. commit 8bf2fc191b172525c3750205d0b0d3fcedf17a78 Merge: fea668d fa36fb7 Author: juhvu <qt-info@nokia.com> Date: Wed Aug 31 16:01:32 2011 +1000 Merge branch 'experimental_scenegraphing2' of scm.dev.nokia.troll.no:qt/dalaings-qtlocation-staging-experimental into experimental_scenegraphing2 commit fea668d9f69ef13ce79029869a9e440b65cb7230 Author: juhvu <qt-info@nokia.com> Date: Wed Aug 31 16:00:23 2011 +1000 Don't wait for texture when creating map item node. Change-Id: Ib5dbee82dbb27ba7bb18ef65df4ba401e8894818 commit fa36fb7905585c80109b262fd718aa71df31e882 Author: David Laing <david.laing@nokia.com> Date: Wed Aug 31 15:57:29 2011 +1000 Modifies the 2D map to take into account the window size. Previously we were setting various values based on the window sizes we were using for testing, which was never going to work in the long term. We might want to try to find out the DPI of the display and take that into account later on as well. commit d2ae0f0bde89b0ddb8278ba9595818fa9e37a004 Author: David Laing <david.laing@nokia.com> Date: Wed Aug 31 14:27:02 2011 +1000 Cleans up some of rendering code that was commented out. commit ba55afb9f39c60f0412f0f0a9a9bed98dcab2e0d Author: juhvu <qt-info@nokia.com> Date: Mon Aug 29 15:52:22 2011 +1000 Added zoomLevel to mapItems (much more joyous thingies now). Change-Id: Icd58b60920a8453fb5f26d0155ff027d86d11b73 commit f43db647753f8fa5ed9fa90c5c5a580d527bf4f1 Author: juhvu <qt-info@nokia.com> Date: Mon Aug 29 14:24:56 2011 +1000 Better working support for adding map items with Q_INVOKABLEs. Change-Id: I3c47a76369bd0968537c8490f9079f880aa54f26 commit d849ff492db227ab96ebca99dbaad9610cdc6130 Author: David Laing <david.laing@nokia.com> Date: Mon Aug 29 13:44:25 2011 +1000 Flips MapItem textures so they're drawn correctly. This was initially written to work with QPixmaps, which have a y-axis that points in the other direction. commit 5b60ed1d15f7fca457d347102d290664481eef0c Author: David Laing <david.laing@nokia.com> Date: Mon Aug 29 11:59:32 2011 +1000 Quick and dirty fix for map item rendering. We now draw the map, disable the depth test, draw the objects, then re-enable the depth dest. It's a bit dirty but it seems to work. Some of the map3d system test was modified to make it easier to check what works and what doesn't while this is played with. It'll probably change back once we've gotten this down. commit bccbfa89a0cab133871e29e735ee2724e88830c0 Author: juhvu <qt-info@nokia.com> Date: Fri Aug 26 16:22:43 2011 +1000 Solved map item threading -related crashes. However refactoring will be needed, this commit pinpointed and workarounded the issues but real solutions will follow shortly. Change-Id: I734ba79f36033f1d290f498f04310400a4074c57 commit 17f72db36f5084973ec470128a3edb1415f601ef Author: David Laing <david.laing@nokia.com> Date: Fri Aug 26 15:41:38 2011 +1000 Compilation fix. Also updates the include path in the map3d example / system test. commit a3fcbf90a599b8973331dab9fb75172027372651 Author: David Laing <david.laing@nokia.com> Date: Fri Aug 26 15:09:21 2011 +1000 Adds a copy of map3d to the system tests. This way the version in examples can be made into a nicely behaving example while the version in system tests can be used for benchmarking and verification. commit 496d8f4fe752c4f2c8899c5be6b34a91a03c01e9 Author: David Laing <david.laing@nokia.com> Date: Fri Aug 26 15:06:05 2011 +1000 Renames the maps3d directory to mapsgl. commit 23cce283c44cc98282150d76930d4e34d2ece683 Author: David Laing <david.laing@nokia.com> Date: Thu Aug 25 16:54:06 2011 +1000 Adds initial support for coordinate - screen conversions. The screen -> coordinate conversion could still be improved. commit 33d688d2b19a7b3fa80c12ff4284bb0efd39d6e6 Author: Cristian Adam <cristian.adam@nokia.com> Date: Wed Aug 24 12:00:51 2011 +0200 Buildfix for MSVC. commit a8490395427b460ada4eda118a6d22f2a067843f Author: David Laing <david.laing@nokia.com> Date: Wed Aug 24 16:10:26 2011 +1000 One last little change for the declarative texture problem. This change trades off correct behaviour for up to twice the memory consumption - once in the texture and once in the image - although we should be able to have both. I need to get my declarative environment up to scratch so I can figure this out properly. commit 3caea5c919bd2aa2c2e652a06270ea638dc82c25 Author: David Laing <david.laing@nokia.com> Date: Wed Aug 24 15:54:33 2011 +1000 Attempts to fix a bug introduced by the last commit. The last commit was a little less rendering-thread aware than it should have been - hopefully this fixes it. commit cc0f1d797097ad27bb537c5638b7e6e46318c423 Author: David Laing <david.laing@nokia.com> Date: Wed Aug 24 15:03:42 2011 +1000 Makes the tile cache eviction rendering-thread-aware. Some things weren't being cleaned up previously because we needed to clean them up in the rendering thread. The MapSphere class had a method for this but TileCache has the information. The cleanup is now done in TileCache, however the interface between the two classes for this task could do with some neatening. commit a7ac61adf978565e8e25adc2474f89e4414fc3a4 Author: David Laing <david.laing@nokia.com> Date: Wed Aug 24 11:01:17 2011 +1000 Refactors the code to separate the 2D and 3D mapping classes. Quite a few optimizations and other fixes are included. Now that this refactoring is done I should be able to make smaller and more frequent commits rather than these monsters... commit 01873d37f8eae15eccf424cc39e7810312d0b412 Author: Cristian Adam <cristian.adam@nokia.com> Date: Tue Aug 23 20:43:56 2011 +0200 Texture display "beautification" commit 87abf218bafaa98e55beaa050a14526427c88152 Author: Cristian Adam <cristian.adam@nokia.com> Date: Mon Aug 22 20:18:15 2011 +0200 Fixed for 2D map. commit f44f8dc61670bf21efa4b6e84fa8fa2291d16f95 Author: Cristian Adam <cristian.adam@nokia.com> Date: Fri Aug 19 19:25:10 2011 +0200 Compilation bugfix and some mouse navigation for map3d. commit bd929f6f11a16ff681d5fc543caf33f494fdbd27 Merge: 024214c ee5cd33 Author: Cristian Adam <cristian.adam@nokia.com> Date: Fri Aug 19 10:01:59 2011 +0200 Merge branch 'experimental_scenegraphing2' of scm.dev.nokia.troll.no:qt/dalaings-qtlocation-staging-experimental into experimental_scenegraphing2 commit ee5cd339b1f72df506905ee815988a65623584c5 Author: juhvu <qt-info@nokia.com> Date: Fri Aug 19 15:00:58 2011 +1000 First success on texturized map objects. Change-Id: Ied9276da69a047e578cee614318e7d6a6a5d4e6d commit 25f7f641787a43f16a7c379c5e0e0735296524a9 Author: juhvu <qt-info@nokia.com> Date: Fri Aug 19 09:37:08 2011 +1000 Interim commit for arbitrary QML map item support. Change-Id: Ica29abb6f9cd74e6c6fbdc028f31cd25957546f9 Conflicts: src/location/maps3d/mapsphere.cpp src/location/maps3d/mapsphere.h commit 6f7aa4e2eec65ee855992a22d019202234de4f9b Author: juhvu <qt-info@nokia.com> Date: Fri Aug 19 09:03:30 2011 +1000 Few changes to get QML Map example running. Change-Id: Iaada49719341b9c48682f2a5a87eb03986d8272d commit 024214cbc524584e719cc6e5baf67cfe68764918 Author: Cristian Adam <cristian.adam@nokia.com> Date: Thu Aug 18 19:23:01 2011 +0200 Bugfixes to build for Windows. commit 0c3b8d7250fcbef3c1ca6a8c538cf7440f6d3dae Author: David Laing <david.laing@nokia.com> Date: Thu Aug 18 17:36:57 2011 +1000 Adds preliminary support for map items. Dummy items at the moment, projected onto the map. - need to look at drawing items in a second pass to avoid rendering glitches - need to handle non-projected objects, which will probably involve yet another pass, possibly with an ortho projection - need to handle the texture stuff from Juha commit 8289b3227873576c9fa32bb117633135d89f5800 Author: David Laing <david.laing@nokia.com> Date: Thu Aug 18 17:31:46 2011 +1000 Improves the behaviour of the tile provider. - Queued connection between the cache and the provider - Provider aborts replies that are no longer going to be used commit 473bef88f86322d575936b1312a976a65ce116df Author: David Laing <david.laing@nokia.com> Date: Thu Aug 18 13:41:09 2011 +1000 Updates some of the rendering mutex related changes. commit 398a37255d09a862fae58760918ac6b3c4ef4ac7 Author: David Laing <david.laing@nokia.com> Date: Tue Aug 16 14:58:06 2011 +1000 Reworked the maps to allow for 2D Map projections There are numerous other changes and optimizations in here. commit 1a8844780b0e02f90e6929c1edaeaef80c288a3f Author: juhvu <qt-info@nokia.com> Date: Tue Aug 9 10:34:23 2011 +1000 Stop timers when stopping too. Change-Id: I0334eea1cfd6a0a9cdcb23bc9120b10a9f90b913 commit a4671b1517d3fc10107dd4b6da70f784a11d5855 Author: juhvu <qt-info@nokia.com> Date: Tue Aug 9 10:30:48 2011 +1000 Took out some asserts in maps. Change-Id: I0dd48f0c30ae9e2f958f1b750a1713315ec1d681 commit e524908c6b977307408d6992a1cb7d5c6c7874c5 Author: juhvu <qt-info@nokia.com> Date: Tue Aug 9 10:15:28 2011 +1000 Map (3D) zoom and flick working at same time. Change-Id: I4862882cfe9b23bcef88873372a7178635dc9485 commit 30aef46a61e8414985533f7b8eaaa7cf5578993f Author: juhvu <qt-info@nokia.com> Date: Mon Aug 8 16:27:03 2011 +1000 Fixed Map (3D) mousewheel (QSGItem event type changed) and flickable. Change-Id: If79463b84630ce8d96525a095fbb0167903a8ca5 commit 037eb28953eb78a628710aba487e78240805ea93 Author: juhvu <qt-info@nokia.com> Date: Fri Aug 5 14:15:36 2011 +1000 Corrected Map flick to work even with very short (<200ms) flicks. Change-Id: Ic6fc294d6f3517090578b3e66d1ddf425df845f5 commit ad28c2c32b1a14093e6a09d4fd3a0c100976366c Author: David Laing <david.laing@nokia.com> Date: Thu Aug 18 11:13:48 2011 +1000 Re-adding the non-revert parts of 6c39b17 commit 9f948f41b19e605e400d3303314a7d844a4a0a8c Author: David Laing <david.laing@nokia.com> Date: Thu Aug 18 11:13:04 2011 +1000 Revert "Revert "Further improvements to the camera / sphere intersect code."" This reverts commit 6c39b175188a8cddf290c3cf2aac2ea61835b109. commit 6c39b175188a8cddf290c3cf2aac2ea61835b109 Author: juhvu <qt-info@nokia.com> Date: Fri Aug 5 13:06:44 2011 +1000 Revert "Further improvements to the camera / sphere intersect code." This reverts commit 78b01bf94e196b3130e1b75d746dcd6a8cbbc8c2. Conflicts: src/location/maps3d/mapsphere.cpp Also improved the example application. Dodgy to do it in revert commit but forgot the thing and ran out of time. Change-Id: I0aaa934b5d93a4a9846304a5553276a0937439e8 commit c5bef97778e635722ee255b0da4366b3606fa44f Author: juhvu <qt-info@nokia.com> Date: Thu Aug 4 15:57:10 2011 +1000 Rough version of Map scene node thread protection. Change-Id: Ida38cd02fbfe42ac8908df54f8aad4ac61da28d4 commit 78b01bf94e196b3130e1b75d746dcd6a8cbbc8c2 Author: David Laing <david.laing@nokia.com> Date: Thu Aug 4 15:09:02 2011 +1000 Further improvements to the camera / sphere intersect code. Increased correctness, added some optimizations. commit 3c78999378e73167dacf72f511b4f75c0ed43b0f Author: juhvu <qt-info@nokia.com> Date: Thu Aug 4 13:26:54 2011 +1000 Added tilt support for Map(3D) pinch area. Change-Id: I17a3ee333f2ef594df3cc4f5d38604a77414ea2a commit 13d57872c57b62ee857a25eab65803552d813497 Author: juhvu <qt-info@nokia.com> Date: Thu Aug 4 10:53:09 2011 +1000 Added gesture option support for map pinch area. Change-Id: I2ca45d48626528f1c000d395d9dadfc3e665f8f2 commit 0a0d98d3f8b67946d601518beb8b15f671cba458 Author: juhvu <qt-info@nokia.com> Date: Thu Aug 4 09:57:43 2011 +1000 Improved the rotation for Map3D. Change-Id: I9f77ee2018cc878fdad56508a2037510ec405746 commit 0002c36d984516ffa2c6aa8e5ac0aa6e637d4b6e Author: juhvu <qt-info@nokia.com> Date: Wed Aug 3 16:08:48 2011 +1000 Radical pinch zooming improvements for Map3D. Change-Id: I402c712d577d5f3737271d6b34c79862cd838c44 commit 0fec6b84da9c9cbc99fa91452f7957b93ca7364a Author: juhvu <qt-info@nokia.com> Date: Tue Aug 2 13:29:53 2011 +1000 Fix for pinching gen - changed qapp->notify to canvas->sendEvent. Change-Id: I8e68b5d120ace5652cef4f4ad0b46b949d2e28bd commit fbbb3016c212214e18afa58452bd96253c0779ee Author: juhvu <qt-info@nokia.com> Date: Tue Aug 2 10:51:51 2011 +1000 Forgot .pro file for the testplugin. Change-Id: Iad18fa5e988b730c54e8deea7b4cea1bcbea3e98 commit c8ae01f629a6a5798bfd187c6c67d9fe31482155 Author: juhvu <qt-info@nokia.com> Date: Tue Aug 2 09:47:24 2011 +1000 Put pinchgenerator into test plugin. Change-Id: Ia401fb7d1ee7bc9bbd4decaa39b446a5dda81693 commit 4767ad9b4f37a1ac90f12b288df73f14469c616e Author: juhvu <qt-info@nokia.com> Date: Mon Aug 1 15:40:05 2011 +1000 First version of pinch generator. Change-Id: I3eff3559b6750e086de914b166545b66742a04c8 commit 2121ca14e5b8d7e0679711bac35cbc79df2f1fb1 Author: David Laing <david.laing@nokia.com> Date: Fri Jul 29 15:14:35 2011 +1000 Improves the sphere / plan intersection code. Now using a much improved algorithm - less code / memory time is needed to get results which are correct in more cases. commit 5e5e88471797a1d2de8c161cc00e26da1528c13c Author: juhvu <qt-info@nokia.com> Date: Fri Jul 29 11:40:06 2011 +1000 Map 3D pinch event support. Change-Id: I2196e59c581b6a17ccb87f2550102bce70e967f2 commit 7135d6717ff225445c7ec99d22a243f577e02b8b Author: juhvu <qt-info@nokia.com> Date: Thu Jul 28 16:15:41 2011 +1000 First version of 3D Map pinching. Change-Id: I834def992b01e6701cbc48cc49c86527033e7e26 commit 8380676866d777bda65d77148869cfb0ef787352 Merge: addf553 b36eae4 Author: juhvu <qt-info@nokia.com> Date: Wed Jul 27 15:41:47 2011 +1000 Merge branch 'experimental_scenegraphing' of scm.dev.nokia.troll.no:qt/dalaings-qtlocation-staging-experimental into experimental_scenegraphing Conflicts: src/location/maps3d/cameradata.cpp Change-Id: Ia822a689a1ea65e2bdadbd5dcf7e606f6091d3dd commit addf5532dc4b267ee7a4a8b26ce3e052c3f9f655 Author: juhvu <qt-info@nokia.com> Date: Wed Jul 27 15:38:30 2011 +1000 Added rough draft of Map 3D flicking. Change-Id: Ia9ed0723a906b52490cc5b05fd11d9569adfc285 commit b36eae47ba5a8f3809a088ddb9bfcdb511a4776e Author: David Laing <david.laing@nokia.com> Date: Tue Jul 26 11:34:39 2011 +1000 Fixes a bug with the relationship between zoom and distance. Was using z^2 instead of 2^z. commit 3fe3c2146615906cb8726d7326213cfc98de5821 Author: David Laing <david.laing@nokia.com> Date: Tue Jul 26 11:34:17 2011 +1000 Adds animation support to the C++ demo. commit 39f26af1d7f7b4bb59bb59b3ecef18f6481fbd51 Author: juhvu <qt-info@nokia.com> Date: Tue Jul 26 09:58:00 2011 +1000 Update Map3D backend. Change-Id: Ie1e3f730fb9505b42fa664f1da5f8af0c3818435 commit ff0bb0b48e27b3f9a9e92c6cc05dbfdd8f6106bf Author: juhvu <qt-info@nokia.com> Date: Mon Jul 25 15:38:18 2011 +1000 QtLocation to compile with qml2 header changes. Change-Id: Ia1724740fdcd6f6a4114737dea47b981658aa71e commit a3c4b9c1550ece97531954073bd0e0063695bf50 Author: David Laing <david.laing@nokia.com> Date: Tue Jul 26 09:34:22 2011 +1000 Switches the viewport-to-tiles backend to the stable version The new and improved version isn't ready quite yet. commit e32743ea59c4df2cd5e7cd67b63364e2cd653019 Author: David Laing <david.laing@nokia.com> Date: Mon Jul 25 16:37:45 2011 +1000 Fixes some camera bugs. The bearing rotation was being applied twice, and the coordinate interpolation was moving in the wrong direction i.e. from the end to the start. Fixed now. commit 62ed7d29e2e739d7ba82c5c280ec599a674ad513 Merge: 358d9ec 685693e Author: David Laing <david.laing@nokia.com> Date: Mon Jul 25 15:27:38 2011 +1000 Merge branch 'experimental_scenegraphing' of scm.dev.nokia.troll.no:qt/dalaings-qtlocation-staging-experimental into experimental_scenegraphing commit 358d9ecbea2b142238ff6696e40eb7012f387510 Author: David Laing <david.laing@nokia.com> Date: Mon Jul 25 15:25:49 2011 +1000 Another bulk update of backend stuff. - Quite a bit of refactoring - Adds scripting for the map example (for testing / profiling) - Adds switchable camera->tiles strategies - Including the start of the new approach - Adds interpolators for the camera commit 685693e68bdfc2d909063a344e5963ea753daf27 Author: juhvu <qt-info@nokia.com> Date: Mon Jul 25 14:20:35 2011 +1000 Small pinch update. Change-Id: I1fe08805200e8391963cf8ea513dc7fb843bcc0d commit 9d8f663ac423efe9d206936b367d84ac270cfdaa Author: juhvu <qt-info@nokia.com> Date: Fri Jul 22 15:38:42 2011 +1000 Simple mouse wheel support for Map 3d. Change-Id: I0d466cd923d62494870b952102ccb447203e7876 commit d3a57442cb921fab1cf1ae50e525308ae37513a5 Author: juhvu <qt-info@nokia.com> Date: Fri Jul 22 14:52:51 2011 +1000 Regular MouseArea integration to 3D Map element. Change-Id: Ib6fd5040a94c0a0dafe33de77254791d695809ea commit 7c7d6efcc3ce0ea3cc77e1523ac238d36b1cf544 Author: juhvu <qt-info@nokia.com> Date: Mon Jul 11 12:54:53 2011 +1000 Intermediate idea commit Map::MouseArea integration. Change-Id: I6f3ce7e15e540943581aa678f421a45418a8d763 commit dc9545e75f3c0dc60fdf60d323f46e5159e8506b Author: juhvu <qt-info@nokia.com> Date: Tue Jul 5 16:13:25 2011 +1000 Added the sphere/map toggle to map3d qml example. commit abbc8d5b33537856e13f0b1787c4202d29d1471d Author: juhvu <qt-info@nokia.com> Date: Tue Jul 5 13:23:30 2011 +1000 Anchors to work with 3d map element. commit 19048b9260b3e51a1fb9aa8c04eb10f32f37ce56 Author: juhvu <qt-info@nokia.com> Date: Tue Jul 5 10:57:11 2011 +1000 Restored gl context defaults after rendering underlay (warnings). commit 220c3feec0aefce34ec73db23d90f853876dfabd Merge: 708b242 1f375c2 Author: juhvu <qt-info@nokia.com> Date: Mon Jul 4 12:01:42 2011 +1000 Merge branch 'experimental_scenegraphing' of scm.dev.nokia.troll.no:qt/dalaings-qtlocation-staging-experimental into experimental_scenegraphing commit 708b2423dc6e4474a77f85cb16dc121d05359d56 Author: juhvu <qt-info@nokia.com> Date: Mon Jul 4 12:01:10 2011 +1000 Simplified QSG rendering for Map element. commit 1f375c2ebbbe66eecbb36f9d0b3bfe2f0506bfb8 Author: David Laing <david.laing@nokia.com> Date: Mon Jul 4 11:45:23 2011 +1000 Massive update to 3D maps code. Still need to rework TileCamera so we have a camera API with user-friendly goodness. commit eeaa93cd262581cadc674daa03267a4b96ca7053 Author: juhvu <qt-info@nokia.com> Date: Fri Jul 1 14:37:08 2011 +1000 Cube tests for QSG underlay. commit 04991ff06f733f554f701e9bf1ae7f1e3a9b1aa0 Author: juhvu <qt-info@nokia.com> Date: Mon Jun 27 15:37:07 2011 +1000 Modified tile camera. commit c39ef64e914ba40929821d7c115bdff9ae73c675 Author: juhvu <qt-info@nokia.com> Date: Tue Jun 21 10:48:17 2011 +1000 Map3D element to run 3d map. commit 049466a6581af6a78bd02ca316ceb379b76fbad9 Author: David Laing <david.laing@nokia.com> Date: Fri Jun 17 16:47:00 2011 +1000 Removing example executable. commit 8de142a35f3f6630cc7114e08e4e5c4234515fce Author: David Laing <david.laing@nokia.com> Date: Fri Jun 17 16:44:59 2011 +1000 Adding initial code dump. commit 2ccd4851439daf76165187c20c1981b305782957 Merge: f9a921e 54c829a Author: David Laing <david.laing@nokia.com> Date: Fri Jun 17 16:11:31 2011 +1000 Merge branch 'master' into experimental_scenegraphing commit f9a921e84f19c52d7ea7452a47f8aa0c0417852b Author: juhvu <qt-info@nokia.com> Date: Tue Jun 14 15:51:19 2011 +1000 Map3D object visible in QML. commit 416fdb11c2649f72a04cfe9c64d5fdc4cc175aa3 Author: juhvu <qt-info@nokia.com> Date: Fri Jun 10 15:47:12 2011 +1000 Some maps scenegraphing drafting. Change-Id: I96b5c5a396f371e7e9acf983441d674a55b44368
* fix buildOswald Buddenhagen2011-07-192-5/+0
| | | | | | | | QT_BUILD_TREE is a no-no Change-Id: Icbf3bb5d0776d5db1859c2a2d8d89621c6cc34bd Reviewed-on: http://codereview.qt.nokia.com/1834 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Compile proj library as a static lib.Aaron McCarthy2011-07-192-149/+161
| | | | | | | | | | | | Compiling the proj library as a static lib and then linking as necessary improves compile speed as we now only build it once. The proj library is also built with CONFIG+=warn_off which removes a lot of compile warnings from the build output. Change-Id: I1842263d5bd96f8c89d91b25583ce58c79e2b1ff Reviewed-on: http://codereview.qt.nokia.com/1800 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Laing <david.laing@nokia.com>
* add snapshot of 3rdparty Proj libraryAlex2011-05-06172-0/+32327
support library for QtLocation
View Lorry Controller Status