| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
For some mystical reason Polygon is redefined by an unknown Windows
header preventing this file from compiling if Qt is compiled
with pre-compiled headers.
The workaround is to simply rename this private type.
Discussed-in: http://lists.qt-project.org/pipermail/development/2014-May/017125.html
Task-number: QTBUG-39692
Change-Id: If71e1a12394dfde7729d0505417a37b9fd407c82
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
|
|
|
|
|
|
|
|
| |
Similar to the mobile property this property allows applications to
determine if the tile set is optimized for night time use.
Change-Id: Ibaaffe6f745d90817b5938f493742fb019be0312
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
| |
-url inherited from the url variable set in qtbase/doc/global
Change-Id: I44a5496055123030a65464f808505d6d18b3f164
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
|
|
|
|
|
|
|
|
| |
Workaround to make location compile while the actual issue is
investigated.
Task-number: QTBUG-39692
Change-Id: I0320181594b0b87ed037827dc8cf3608ba5c776e
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
| |
This replaces a lot of old QLatin1String cases
Change-Id: I47aec711f5e00de68bde6c2c8ee09506f577cfd4
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|\
| |
| |
| | |
Change-Id: Ib061722a7ebc4b26bf132c67a005910f2d39400f
|
| |
| |
| |
| |
| |
| |
| |
| | |
The synchronizes the API doc's front page layout with qtconnectivity and
qtsensors.
Change-Id: I91e966f3c3ac3638e697340eabbfb529f9feaf2c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I04183182a9db9dc169390fe5c77a92588f40347b
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It causes random linker errors on Windows. Now the conversions are
done manually.
Task-number: QTBUG-37785
Change-Id: I5586b314d1f55a75464920f23a23f77a08b45d89
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|\ \
| |/
| |
| | |
Change-Id: I77d4df804eb31a2b63c9d664d63baec840225abd
|
| |
| |
| |
| |
| |
| |
| | |
Member initialization order.
Change-Id: I83ad846c6297909ad8595114dccf8bf118b467b0
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QtLocation now links against QtQuick and the QGeoMap has a
updateSceneGraph(QSGNode *, QQuickWindow *) function to populate the
scene graph with map content in what ever style the implementation
decides. The only implementation right now is the QGeoTileMapData
(same as with the Qt3D code).
Camera positioning, zooming, panning, etc has been preserved in the
interest of minimzing the change and keeping things "as they were".
All rendering logic is moved into the updateSceneGraph function, where
we find the delta between what is shown in the scene graph and what
the scene things should be visible. Nodes are added removed
accordingly. This logic is isolated from the rest of the code as it
primarily lives in the scene graph render thread and may be released
at an arbitrary time. Doing this every frame might seem daunting, but
for the most, it is a couple of checks on a few tens of nodes,
compared to rendering millions of pixels afterwards, so this is not
going to be a bottleneck.
Texture uploads are now done in the scene graph's rendering phase, so
the map item's sync is fast. This means the map element doesn't block
both GUI and render threads for extended time periods. In contrast,
the Qt3D code path uploaded tiles and rendered them to an FBO in the
sync phase, resulting in very poor parallelization.
We cache the textures designated as visible and nothing
else. Primarily in the interest of simplicity, but also because
uploading 256x256 textures is a no-brainer on modern GPU's, including
lower-end mobile and embedded. The QGeoTileTexture sits on a QImage
instead of an actual texture to keep a strict separation between
render thread and GUI thread clean. Texture cleanup is done by the
scene graph structure.
The Qt3D codepath rendered to an FBO, so it was implicitly clipped to
its bounds. To preserve this behavior, the scene graph implementation
does the same. Not doing so looks a bit odd, at least when zooming all
the way out so the world is significantly smaller than the viewport.
The scene graph code also adds a rectangle of solid 0.9 gray to match
the default color of the old FBO code.
Change-Id: Ia736cea6e3616721c2de6beb5d72e570adcb21e6
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: If46057e48040fda7b61b81e735c171daf2cc7d06
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added to avoid mixing of different map versions in map view.
Generic cache versioning by adding an incremental version number to
tile specs and filenames. Default version -1 falls back to not using
version in file names for backward compatibility.
Nokia specific version management by implementing the version request,
comparing all version information and increment the version if anything
has changed.
Task-number: QTBUG-25559
Change-Id: I6820f2efbe7458701475cc833d3077022797b2df
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: Ic00ce63f769e87e222759c5c896e7cc741e31795
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
|
|
| |
Profiling shows Qt Creator spends 2% of its load time normalizing
Change-Id: Ica52c45e34fe53823b31faaa7d77a633458549d5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
| |
It is the baseline for all subsequent additions.
Change-Id: Ia56da45b8b92dd0224dbeff97976cd06aa25d943
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
|
|
| |
MODULE_PLUGIN_TYPES was missing from location.pro
It was needed to deploy QtLocation to Android device.
Change-Id: Ic93a3711039d679fa2d859c6d54599b121464b82
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QPointer holds a guarded pointer to a QObject. It must always be tested
prior to use.
Changed the parameter type to remove the need for the static_cast when
setting the QPointer member.
The root cause was that the tile fetcher object was not being destroyed
when the mapping manager engine was. Which was because the two objects
were in different threads. Some of the service specific tile fetchers
were directly calling into the engine objects across thread. Gah.
Since Qt 5 QNAM uses an application global thread for processing
requests, there is no need to use threads in the tile fetcher.
Change-Id: Id9df35ddfa78df2cbf334006fe5fc9726a75f92d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: I16b4f9116a651edaebc54957daf528278785bc55
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Updated URLs for places and map tiler to current ones. Added URL
management for additional hosts for hybrid, terrain and satellite maps.
Added new languages and map types available in the new tiler API.
Bug fixes for code evaluating copyrights text to show. Now only
copyrights related to viewed maps are shown and each name is shown only
once.
Updated drawing of copyright information to show HERE logo and
copyrights text side by side. This is to avoid having logo jumping
up and down.
Change-Id: Ide18a95335c4299c8219c4dbcfb0cc60b43d46c3
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I don't see a reason for keeping this. First of all, only half of it is
implemented. Second we can have the same behavior with a normal
MouseArea. The only advantage a MapMouseArea has is that mouse events
are only received in the boundaries of the parent map item. However
with a bit of work in the parent map item we can have this behavior as
well for a normal mouse area.
The only thing we are eventually loosing is the geocoordinate property
of the MapMouseEvent. But this can be easily obtained with the
"toCoordinate" function in the Map item.
Change-Id: Icb176ee7d7c2881df714ab3191fa1f7f5c8915e2
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
The tile cache can sometimes end up with null pointers which causes a
crash when saving the state of the cache queues to disk. Fixed by
skipping over these entries.
Task-number: QTBUG-36486
Change-Id: Ifa359bd1f9dbe37da0d5b208a7c4ee7a26f8bd44
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
| |
Requesting a negative number of alternative routes does not make sense.
Fall back to the default value of 0 if a negative number of alternative
routes is requested.
Change-Id: Iecc1b7ba8bfa25b59b2a4c2efeafa33fd528377d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: I66bb2ef931384d5894d445a81d66e109dc0b946a
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
|
| |
This was introduced by 1e5476a2f50cacbd349c43868701eeac6f056014.
Change-Id: Ie216dd56978d467483d4b80798cfd5d17ca49e48
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I3e075719c950b7c3c380937cbee3aed402d40f8a
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: I337131891ab2ae97be5be999dcab423571c5b30b
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: I43e7398a35d963081f5d3eb91598308ea00700e6
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-34907
Change-Id: Id119523528c7cd2419be638048f4faf7bf0f2cb9
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Update the .qdocconf files for both Qt Location and Positioning
documentation sets to match the new example folder structure.
Also add 'examplesinstallpath' configuration value, needed for
correct paths in example manifest files.
Task-number: QTBUG-34907
Change-Id: I6115377044418b251757a18524de4fcf02502fa5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
qdeclarativegeomapgesturearea.cpp: In member function 'void QDeclarativeGeoMapGestureArea::startTwoTouchPoints()':
qdeclarativegeomapgesturearea.cpp:834:66: warning: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: [enabled by default]
QPointF startPos = (sceneStartPoint1_ + sceneStartPoint2_) * 0.5;
^
In file included from /home/ablasche/dev/qt/androidqt/qtbase/include/QtCore/qpoint.h:1:0,
from /home/ablasche/dev/qt/androidqt/qtbase/include/QtCore/../../src/corelib/tools/qrect.h:46,
from /home/ablasche/dev/qt/androidqt/qtbase/include/QtCore/qrect.h:1,
from /home/ablasche/dev/qt/androidqt/qtbase/include/QtGui/../../src/gui/painting/qregion.h:46,
from /home/ablasche/dev/qt/androidqt/qtbase/include/QtGui/qregion.h:1,
from /home/ablasche/dev/qt/androidqt/qtbase/include/QtGui/../../src/gui/kernel/qevent.h:47,
from /home/ablasche/dev/qt/androidqt/qtbase/include/QtGui/qevent.h:1,
from /home/ablasche/dev/qt/androidqt/qtbase/include/QtGui/QTouchEvent:1,
from qdeclarativegeomapgesturearea_p.h:46,
from qdeclarativegeomapgesturearea.cpp:42:
/home/ablasche/dev/qt/androidqt/qtbase/include/QtCore/../../src/corelib/tools/qpoint.h:357:39: note: candidate 1: constexpr const QPointF operator*(const QPointF&, qreal)
Q_DECL_CONSTEXPR inline const QPointF operator*(const QPointF &p, qreal c)
^
In file included from /home/ablasche/dev/qt/androidqt/qtbase/include/QtPositioning/5.3.0/QtPositioning/private/qdoublevector2d_p.h:1:0,
from ../../location/maps/qgeomap_p.h:59,
from qdeclarativegeomap_p.h:73,
from qdeclarativegeomapgesturearea.cpp:43:
/home/ablasche/dev/qt/androidqt/qtbase/include/QtPositioning/5.3.0/QtPositioning/private/../../../../../../qtlocation/src/positioning/qdoublevector2d_p.h:208:30: note: candidate 2: const QDoubleVector2D operator*(const QDoubleVector2D&, double)
inline const QDoubleVector2D operator*(const QDoubleVector2D &vector, double factor)
^
Change-Id: Ic9f56a14f5222b54f24443f3546b97f88a3dcf53
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|\ \
| |/
| |
| | |
Change-Id: Ia0af08e46e39b783ffa0773bbc43a9a5a78c28bc
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In 5.2, the HTML output is in a flatter structure and when they are
hosted in qt-project.org/doc, the documentation will be found at
http://qt-project.org/doc/qt-$QT_VER
The url variable is used by projects outside of Qt 5 which need
to link to Qt 5 documentation, such as Qt Creator.
Task-number: QTBUG-34584
Change-Id: Ibc0d4b9ef43bfb0e584d95fac8e97ec472e1e0e8
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This simplifies various position backend implementations
as they don't have to cast 0 to QGeoPositionInfoSource::PositioningMethods
At the same time we synchronize the same QML enum and its value name.
Change-Id: Ic0b258161a6319da238b265ad5d9926349f461f1
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since the 7.2 API supports many more lanugages(23 compared to 4) and is the
only version that supports China it was necessary to upgrade the nokia route
plugin to 7.2.
The major change is that 7.2 does not support multiple mode parameters which
6.2 did. Now if the user selects multiple route optimizations multiple
requests will be made, one for each optimization. Nokia has also reduced
the amount of different route modes, only fastest and shortest are supported
now.
In the response part noting has changed, so no parsing fixes were necessary.
Task-number: QTBUG-24808
Change-Id: I256079f9a1e91e11c961849c95b95b712021ace0
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch is to remedy rounding errors on ARM devices where
qreal is defined as a float instead of double.
The main change is to replace QPointF with QDoubleVector2D when using
screenPositionToCoordinate and coordinateToScreenPosition. In many
cases the QDoubleVector2D is converted to QPointF when the increased
precision is not used. This because many of the surounding classes uses
qreal so the precsision would be lost anyway. These classes include
QVectorPath, QPainterPath and QQuickItem.
The most important change is in polyline and polygon map item in the
updateSourcePoints methods. Using floating point precision here resulted
in many precision errors that caused for example route lines to be
chopped of as the method erroneously thought it needed to wrap to the other
side of the datum line.
The external uses of the coordinate lookup functions in declarative geo map
has been left untouched so they still use QPointF for compatibility reasons. Not
sure how the process goes when updating externally visible parts of the API
Change-Id: I01ed67a0563cfb5c4ff2db6395b7a62eaa8e4a19
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/location/qdeclarativegeomap.cpp
src/imports/location/qdeclarativegeoroute.cpp
src/imports/location/qdeclarativegeoroutemodel.cpp
src/imports/location/qdeclarativegeoroutesegment.cpp
src/imports/location/qdeclarativepolygonmapitem.cpp
src/imports/location/qdeclarativepolylinemapitem.cpp
src/imports/positioning/positioning.cpp
Change-Id: Ieaa5f567d2144d0267e7eef5bd75bde7e0079fbe
|
| |
| |
| |
| |
| |
| |
| |
| | |
Convert to std algorithms to avoid warnings
Change-Id: I348e693fc14d67ad18fddfccd184858386373d23
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The QML API remains available under 5.0 though.
Change-Id: I037b82e5b12825db610e8458d6c82122ecde4f44
Reviewed-by: Erik Mattsson <erik.mattsson@appello.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Convert to std algorithms to avoid warnings. One qSort case is still
left since it seems to require a more elaborate fix.
Task-number: QTBUG-11022
Change-Id: Ieccc5050b127a58ff1f0aa7c488909f2acfa2972
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
-Documentation should not have the version number.
-Links and documentation with type version number no longer recommended
because it is a maintainability and consistency issue.
Use <Module name>::<type> to link to a QML type.
Change-Id: I830407e68f0a91f3fb9a5deb3fb5a9a02a100a34
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
-Links and documentation with type version number no longer recommended
because it is a maintainability and consistency issue.
Use <Module name>::<type> to link to a QML type.
Change-Id: I0f5dcb833c32c3845fc48c18fa29a2c89b13f1d0
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|