diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2019-05-03 14:24:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-06 11:34:18 +0000 |
| commit | 0cf1f9e5cfaf3fdab8f7dcf1d07bb67bda66020c (patch) | |
| tree | b4c0dc3c127590eef055345f7af48112c2a8fd88 | |
| parent | 70752a28042b68f1f086c80371d31dc968d44dcc (diff) | |
| download | qtlocation-0cf1f9e5cfaf3fdab8f7dcf1d07bb67bda66020c.tar.gz | |
Fix changed import for delegate model
This is needed after 2b91e2bca3 in qtdeclarative.
Need to be adjusted to QtQmlModels/private/qqmldelegatemodel_p.h
later.
Task-number: QTBUG-75607
Change-Id: Ic6db50798edc47f6bca307be3acd1611282d2e83
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapitemview.cpp | 1 | ||||
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapitemview_p.h | 2 | ||||
| -rw-r--r-- | src/location/labs/qmapobjectview.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp index f7a251a2..43e24620 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp @@ -42,7 +42,6 @@ #include <QtCore/QAbstractItemModel> #include <QtQml/QQmlContext> -#include <QtQml/private/qqmldelegatemodel_p.h> #include <QtQml/private/qqmlopenmetaobject_p.h> #include <QtQuick/private/qquickanimation_p.h> #include <QtQml/QQmlListProperty> diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview_p.h b/src/location/declarativemaps/qdeclarativegeomapitemview_p.h index abac5bd5..8b2ab034 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitemview_p.h +++ b/src/location/declarativemaps/qdeclarativegeomapitemview_p.h @@ -56,7 +56,7 @@ #include <QtQml/QQmlParserStatus> #include <QtQml/QQmlIncubator> #include <QtQml/qqml.h> -#include <QtQml/private/qqmldelegatemodel_p.h> +#include <private/qqmldelegatemodel_p.h> #include <QtQuick/private/qquicktransition_p.h> #include <QtLocation/private/qdeclarativegeomapitemgroup_p.h> diff --git a/src/location/labs/qmapobjectview.cpp b/src/location/labs/qmapobjectview.cpp index 90234ea6..8cbf8ded 100644 --- a/src/location/labs/qmapobjectview.cpp +++ b/src/location/labs/qmapobjectview.cpp @@ -36,7 +36,7 @@ #include "qmapobjectview_p.h" #include "qmapobjectview_p_p.h" -#include <QtQml/private/qqmldelegatemodel_p.h> +#include <private/qqmldelegatemodel_p.h> #include <QtLocation/private/qgeomap_p.h> QT_BEGIN_NAMESPACE |