summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Pass the QQuickWindow to the cache for texture creationnoqt3dFabian Bumberger2014-01-2912-51/+79
| | | | | Change-Id: I97f66d5fbf1aa809afd6e5e3f1ed18044c01a3cc Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Implement textures ansd geometry creation for the SG rendererFabian Bumberger2014-01-285-35/+87
| | | | | Change-Id: Ia91e8b7220c333b9fa6d718eec4a950f3f1fc583 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Prepare to get rid of the Qt3D dependencyFabian Bumberger2014-01-2825-522/+882
| | | | | | | | This patch puts most Qt3D dependencies in ifdefs and thus is the first step to eliminate the dependency. Change-Id: Ifa3c3213aacd8dd50aec18fedd4df3d3c34671e8 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Merge remote-tracking branch 'gerrit/dev' into noqt3dAlex Blasche2014-01-28178-769/+3904
|\ | | | | | | Change-Id: Ide59f885491a417ca59d01217b1e734f0302fbf5
| * Document use of GenericCacheLocation.Alex Blasche2014-01-241-1/+1
| | | | | | | | | | | | | | | | This was introduced by 1e5476a2f50cacbd349c43868701eeac6f056014. Change-Id: Ie216dd56978d467483d4b80798cfd5d17ca49e48 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Remove offset attribute from place content requests.Aaron McCarthy2014-01-2228-224/+298
| | | | | | | | | | | | | | | | | | | | | | | | This complements 1d0966c6924876655c52725e779a7aa24866ff60 Not all service providers support arbitrary offsets when requesting place content. The offset attribute has been removed, instead service providers can supply a previous and next content request query in the form of a QPlaceContentRequest. Change-Id: I6239b42c31bed5dcd6645d86d5a48d7e6a667f46 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Add dependencies to project file.Aaron McCarthy2014-01-204-8/+34
| | | | | | | | | | | | | | | | | | | | | | src.pro was using CONFIG += ordered, changed to specify proper dependencies. Include documentation snippets and build them by default. Fix broken documentation snippets. Change-Id: I550db3844e77e0ea52e697a3946720f770f6c9b6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Alex Blasche2014-01-206-24/+96
| |\ | | | | | | | | | refs/staging/dev
| | * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-176-24/+96
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp Change-Id: Iae3f3c00d46c903e2fa6c1dd49876839362f8001
| | | * QDeclarativePositionSource::{supported|preferred}PositioningMethods() always ↵Jim Ehrismann2014-01-172-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return AllPositioningMethods Also added unit test for preferredPositioningMethods() Change-Id: I28c1d5ce66987d3799d1d1cc97469112dd055a45 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | | * Merge "Merge branch 'release' into stable" into refs/staging/stableAaron McCarthy2014-01-173-6/+17
| | | |\
| | | | * Merge branch 'release' into stableAlex Blasche2014-01-163-6/+17
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: I82706858585256cbb23278250d870c54d6c4b085
| | | | | * Remove byte order marker which causes problems with older compilersAlex Blasche2014-01-152-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-36187 Change-Id: Ie20ec6e802f44a6fa6757b914289736c4421138b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | | | * Attempt to fix flaky QNemaPositionInfoSource_Simulation test on WindowsAlex Blasche2014-01-151-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The failure was discovered by https://codereview.qt-project.org/#change,75481 We increase the timeout for the local tcp connection as the likely reason is an overworked CI system. In addition we add more verbose output to easy the failure detection in case this happens again. Change-Id: I44ee52fcb957dcaa5aca4a6932221a34ce3f2af7 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| | | * | | Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | Change-Id: I4bff11ac65bb72b37e2540bb1d3f6fba24472db6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * | Fix run-time warning when using Geoclue positioning plugin.Aaron McCarthy2014-01-151-0/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Geoclue plugin requires that the QGeoPositionInfo meta type is registered. Change-Id: I1310868ffd5d57539c3b790b4de1ba9c8396c580 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | | * Add 5.2.1 change logAlex Blasche2014-01-131-0/+63
| | | | | | | | | | | | | | | | | | | | Change-Id: I83dce160ed57ec7a567c815a98cf17fc160a3b2d Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * | | Remove offset attribute from place search requests.Aaron McCarthy2014-01-2018-117/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all service providers support arbitrary search offsets. The offset attribute has been removed, instead service providers can supply a previous and next search query in the form of a QPlaceSearchRequest. Change-Id: If68e969b06f909f3fa62718656cbef70d1bf84a6 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * | | Fix Nokia place recommendation search parsing.Aaron McCarthy2014-01-202-17/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | Place recommendations are no longer wrapped in a "results" object like other search requests. Change-Id: Idef11bf08818e07192657ffbadca0e0d610b6137 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Fix killing timer in different thread.Aaron McCarthy2014-01-175-69/+47
| | | | | | | | | | | | | | | | | | | | | | | | It was possible for another thread to attempt to stop the timer used by the tile fetcher. Change-Id: Ic44cf416bc7e6c987c4b5c9914a1c7d911dbbea5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Fix tryCompare call with 2 parameters.Aaron McCarthy2014-01-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I2a10bd93bfef53af567777c85d794f07621d179d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Use GenericCacheLocation to share downloaded data between applications.Aaron McCarthy2014-01-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I3e075719c950b7c3c380937cbee3aed402d40f8a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Fix coordinate animation test.Aaron McCarthy2014-01-161-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Map was starting at coordinate 0,0, which the test was not expecting. Fixed by disabling animation when setting the starting coordinate. Task-number: QTBUG-31797 Change-Id: I5cadb28ad667d321b2c3e6440e0698e0ad59ed8e Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Don't use QString if not required (Performance improvement)Alex Blasche2014-01-151-3/+7
| | | | | | | | | | | | | | | | | | | | | Change-Id: I80cf4dcd98c45169b31ee1659122020ce27b29ea Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Android: Fix crash while retrieving GPS based location.Alex Blasche2014-01-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The satellite backend was not properly guarded from the location backend. As a consequence satellite updates were triggered while the user only requested position updates. This caused uninitialized satellite code to be exeuted which caused an abort. Change-Id: I4a7511d49ba795fb6a4fc8e9c723ef1260c5c9a5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Android: Avoid unnecessary methodId lookups (use a cache instead)Alex Blasche2014-01-151-16/+45
| | | | | | | | | | | | | | | | | | | | | | | | This is a performance improvement. Change-Id: If3115078ae3247f9f888982b922a77c9cd92fe91 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Remove RouteModel::locale property.Aaron McCarthy2014-01-132-58/+22
| | | | | | | | | | | | | | | | | | | | | | | | I missed that the functionality was already available in Plugin. The measurementSystem property is retained. Change-Id: Id65aa29cb7078d3be7310081278a032edc25bf0d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-1011-64/+62
| |\ \ | | |/ | | | | | | Change-Id: I7f649542227dcdeb062b0b8368a301334fa9969b
| | * Stop skipping declarative_core tests.Aaron McCarthy2014-01-105-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | These test cases were failing due to regressions in QML and have since been fixed. See QTBUG-33542, QTBUG-33546 and QTBUG-33561. Change-Id: Id86e9a8baa29eea851bda27cb668a6ce586c5f25 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Fix declarative_core unit testAlex Blasche2014-01-109-68/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are still some bugs caused by V4 but more dedicated bugs but it is more important to get the current unit test running . We rather skip the problematic cases. A lot of warnings have been fixed as well. Task-number: QTBUG-31798 Change-Id: I1fccf26db5c47563baeaf6c2d6366d3c10aee824 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * | Use QVariantMap instead of QMap<QString, QVariant>.Aaron McCarthy2014-01-0847-67/+68
| | | | | | | | | | | | | | | | | | | | | | | | It is shorter, easier to read, easier to type and it doesn't affect the ABI. Change-Id: Ic4d8a371d00b434ac84382dd75d8d82a963089cb Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Fix warning message about unsupported area types.Aaron McCarthy2014-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | This message is warning about unsupported area types not waypoint types. Change-Id: I6c244ce121140a0fa89dba0bfcc6fe65044d239a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Remove unneeded init() function.Aaron McCarthy2014-01-086-29/+5
| | | | | | | | | | | | | | | | | | | | | | | | Move call to g_type_init() to the constructor and only conditionally call it. g_type_init() has been deprecated since glib 2.35. Change-Id: I425dd7883eef404229e924003fe86924b5f8bb09 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Enhance measurement system support in routing manager.Aaron McCarthy2014-01-079-21/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is useful to be able to set the measurement system independently of the locale used by the routing manager. Add accessor functions for the measurement system to the routing manager classes. Locale and measurement system properties are also added to the RouteModel QML type. Change-Id: I8ee9fbdb5ab94615fef7019914b0f104aebfa9c8 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Android: Use constants to reflect type of occurred errorAlex Blasche2014-01-031-22/+30
| | | | | | | | | | | | | | | | | | Change-Id: I9b4ded2742c513ecfe491231341a8f3a9178929b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | QGeoSatelliteInfoSource backend for AndroidAlex Blasche2014-01-038-32/+590
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android supports status enquiries about GPS/GLONASS satellites in range. Task-number: QTBUG-34102 [ChangeLog][QtPositioning][QGeoSatelliteInfoSource] Android backend added. Android devices can retrieve information about the currently accessible GPS and GLONASS satellites. Change-Id: Ia3627fdcf948586f9e6f04aa64bfc9548fc895e0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Positioning backend for AndroidAlex Blasche2014-01-0319-4/+1428
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it only supports positioning data. Satellite information and potentially geo fencing will follow later on. Task-number: QTBUG-34102 [ChangeLog][QtPositioning][QGeoPositionInfoSource] Android backend added. Android devices can retrieve their current position. Network- and Satellite-based providers are supported. Change-Id: I94ec0d177aaef930f9a3f2a9f6af6fa3c904ec92 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-166-14/+9
| |\ \ | | |/ | | | | | | Change-Id: Ia9f4503d68120e1654552745ae3076a3353b5eff
| | * Remove QtQml dependency from QtPositioning.Aaron McCarthy2013-12-116-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtQml dependency was only required for the QML_DECLARE_TYPE macro. Since Qt 5.0 use of this macro is not required. Add missing includes which were being pulled in via QtQml. Task-number: QTBUG-33220 Change-Id: Ief6ab94e25b4bc5cb753672908b09f7e772df1c8 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Revert "Don't require applications to declare metatypes."Aaron McCarthy2013-12-1010-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5679a86968a6a26f8427b9c979f89f6ea5198d2f Change was source incompatible. Change-Id: Ied25ca3503a41e498a5c9b710e7a0dd3787bbe89 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Don't require applications to declare metatypes.Aaron McCarthy2013-12-1010-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These metatypes need to be declared for common usage of the positioning API. Declare them in the library header files so that applications are not forced to do so. [ChangeLog][QtPositioning][General] Applications no longer need to register common Qt Positioning data types with the metatype system. Change-Id: I1d28ec8e33d20efc748cb6a0a2ad302e2061853f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Add CoreLocation positioning plugin for QtLocationIan Dean2013-12-127-0/+492
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements a QGeoPositionInfoSource plugin using CoreLocation. Implemented by Ian Dean. [ChangeLog][QtPositioning][QGeoPositionInfoSource] iOS position backend added. Change-Id: I09df434f95e5d72b1f6cf6381412334ae45d3d54 Reviewed-by: Ian Dean <ian@mediator-software.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Support position accuracy in QNmeaPositionInfoSource.Aaron McCarthy2013-12-119-12/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract the HDOP and VDOP from the NMEA stream and calculate the twice the distance root mean square (2DRMS) error based on the user provided User equivalent range error value. [ChangeLog][QtPositioning][QNmeaPositionInfoSource] Added support for reporting position accuracy. Change-Id: I59e5f8c32070fa96ae4d0bd02a18f38663920e05 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-057-23/+27
| |\ \ | | |/ | | | | | | Change-Id: I337131891ab2ae97be5be999dcab423571c5b30b
| | * Fix a dangling pointer useRobin Burchell2013-12-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | toLocal8Bit returns a temporary, so we must not keep a pointer to the data inside it Change-Id: I8fa4138c15acce0005e304b5206585fcd1a5e56b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Fix incorrect accuracy values reported by Geoclue plugin.Aaron McCarthy2013-12-031-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize variables to valid (unknown) values as they will not be assigned to if accuracy data is not available with the current position update from Geoclue. Change-Id: Icdca528da86df9a2a95acf1cc6704a9c39485fe2 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Set default preferred positioning methods for Geoclue position source.Aaron McCarthy2013-12-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Set the default positioning methods used by the Geoclue positioning source to all positioning methods. Change-Id: I62196cc0203642838104cb5a0dafa06b1df29190 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Don't rely on qt_example_installs for complete make install rulesAlex Blasche2013-11-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | simplelog.txt was not deployed when running make install from outside Qt source tree. Change-Id: I420a85fc5f74fb1bfc1b3f63e1f88cf0b0e2a0f9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Fix and cleanup of make install related rules in QtLocation examplesAlex Blasche2013-11-294-10/+13
| | | | | | | | | | | | | | | | | | Change-Id: I9ef400e22d46e60d50eed785a71e656a0f93fa26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Add missing translation strings for OSRM TBT instructions.Albin Olsson2013-12-041-35/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | Open Source Routing Machine may return street names in more cases than were previously covered. Also added missing roundabout cases and corrected the spelling of 'roundabout'. Change-Id: I01e5098ddcddcb92e04cd1d230e92c8fa7998f23 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
View Lorry Controller Status