diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-17 10:15:57 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-17 11:22:37 +0000 |
| commit | 96292dc44814e01c4090b7ba5699a67b8736db26 (patch) | |
| tree | 97cbf408f170852d41528fa0f6a240025b6f1f1e | |
| parent | 6eef6e961bada90cdbfd5ef8539eecadf493d7d3 (diff) | |
| download | qtlocation-96292dc44814e01c4090b7ba5699a67b8736db26.tar.gz | |
Fix compilation after recent declarative internal header changes
Some types of the private declarative API became visible through implicit
header file inclusion from qqmlengine_p.h. This was changed in declarative
and requires fixing here, but it's backwards build compatible to before
the changes in declarative.
Change-Id: I3553fada4363e88191c127f9cabae2169916ae46
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
4 files changed, 8 insertions, 0 deletions
diff --git a/src/location/declarativemaps/locationvaluetypehelper.cpp b/src/location/declarativemaps/locationvaluetypehelper.cpp index 8c96c8e7..3e2f3658 100644 --- a/src/location/declarativemaps/locationvaluetypehelper.cpp +++ b/src/location/declarativemaps/locationvaluetypehelper.cpp @@ -38,6 +38,8 @@ #include <QVariantMap> #include <QtQml/QQmlInfo> #include <private/qqmlengine_p.h> +#include <private/qv4scopedvalue_p.h> +#include <private/qv4arrayobject_p.h> QGeoCoordinate parseCoordinate(const QJSValue &value, bool *ok) diff --git a/src/location/declarativemaps/qdeclarativegeoroute.cpp b/src/location/declarativemaps/qdeclarativegeoroute.cpp index 8f5ec5fe..c536b65b 100644 --- a/src/location/declarativemaps/qdeclarativegeoroute.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroute.cpp @@ -43,6 +43,8 @@ #include <QtQml/QQmlEngine> #include <QtQml/qqmlinfo.h> #include <QtQml/private/qqmlengine_p.h> +#include <QtQml/private/qv4scopedvalue_p.h> +#include <QtQml/private/qv4arrayobject_p.h> #include <QtPositioning/QGeoRectangle> QT_BEGIN_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp index 695f6972..f74557c0 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp @@ -43,6 +43,8 @@ #include <QtQml/QQmlEngine> #include <QtQml/qqmlinfo.h> #include <QtQml/private/qqmlengine_p.h> +#include <QtQml/private/qv4scopedvalue_p.h> +#include <QtQml/private/qv4arrayobject_p.h> #include <QtLocation/QGeoRoutingManager> #include <QtPositioning/QGeoRectangle> #include "qdeclarativegeomapparameter_p.h" diff --git a/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp b/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp index b0e05f32..6751a47b 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp @@ -38,6 +38,8 @@ #include <QtQml/QQmlEngine> #include <QtQml/private/qqmlengine_p.h> +#include <QtQml/private/qv4scopedvalue_p.h> +#include <QtQml/private/qv4arrayobject_p.h> QT_BEGIN_NAMESPACE |