diff options
Diffstat (limited to 'src/location/declarativeplaces')
7 files changed, 7 insertions, 6 deletions
diff --git a/src/location/declarativeplaces/qdeclarativecategory.cpp b/src/location/declarativeplaces/qdeclarativecategory.cpp index c58ec3a2..4161c1a1 100644 --- a/src/location/declarativeplaces/qdeclarativecategory.cpp +++ b/src/location/declarativeplaces/qdeclarativecategory.cpp @@ -37,7 +37,7 @@ #include "qdeclarativecategory_p.h" #include "qdeclarativeplaceicon_p.h" #include "qdeclarativegeoserviceprovider_p.h" -#include "error_messages.h" +#include "error_messages_p.h" #include <QtQml/QQmlInfo> #include <QtLocation/QGeoServiceProvider> diff --git a/src/location/declarativeplaces/qdeclarativeplace.cpp b/src/location/declarativeplaces/qdeclarativeplace.cpp index 91ef2026..0e1a19aa 100644 --- a/src/location/declarativeplaces/qdeclarativeplace.cpp +++ b/src/location/declarativeplaces/qdeclarativeplace.cpp @@ -39,7 +39,7 @@ #include "qdeclarativegeoserviceprovider_p.h" #include "qdeclarativeplaceattribute_p.h" #include "qdeclarativeplaceicon_p.h" -#include "error_messages.h" +#include "error_messages_p.h" #include <QtCore/QCoreApplication> #include <QtCore/QMetaObject> diff --git a/src/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp b/src/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp index faf7e418..1920583b 100644 --- a/src/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp +++ b/src/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp @@ -38,7 +38,7 @@ #include "qdeclarativeplace_p.h" #include "qdeclarativegeoserviceprovider_p.h" #include "qdeclarativeplaceuser_p.h" -#include "error_messages.h" +#include "error_messages_p.h" #include <QtQml/QQmlInfo> #include <QtLocation/QGeoServiceProvider> diff --git a/src/location/declarativeplaces/qdeclarativeplaceicon.cpp b/src/location/declarativeplaces/qdeclarativeplaceicon.cpp index 24891138..ba542792 100644 --- a/src/location/declarativeplaces/qdeclarativeplaceicon.cpp +++ b/src/location/declarativeplaces/qdeclarativeplaceicon.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qdeclarativeplaceicon_p.h" -#include "error_messages.h" +#include "error_messages_p.h" #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QPlaceManager> diff --git a/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp b/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp index 3a3faa56..4dfdd25d 100644 --- a/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp +++ b/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp @@ -36,7 +36,7 @@ #include "qdeclarativesearchmodelbase_p.h" #include "qdeclarativeplace_p.h" -#include "error_messages.h" +#include "error_messages_p.h" #include <QtCore/QCoreApplication> #include <QtQml/QQmlInfo> diff --git a/src/location/declarativeplaces/qdeclarativesearchresultmodel.cpp b/src/location/declarativeplaces/qdeclarativesearchresultmodel.cpp index 31d152db..3450e3ea 100644 --- a/src/location/declarativeplaces/qdeclarativesearchresultmodel.cpp +++ b/src/location/declarativeplaces/qdeclarativesearchresultmodel.cpp @@ -631,6 +631,7 @@ QVariant QDeclarativeSearchResultModel::data(const QModelIndex &index, int role) case PlaceRole: if (result.type() == QPlaceSearchResult::PlaceResult) return QVariant::fromValue(static_cast<QObject *>(m_places.at(index.row()))); + break; case SponsoredRole: if (result.type() == QPlaceSearchResult::PlaceResult) { QPlaceResult placeResult = result; diff --git a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp index d832ff40..780eb98a 100644 --- a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp +++ b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp @@ -38,7 +38,7 @@ #include "qdeclarativesupportedcategoriesmodel_p.h" #include "qdeclarativeplaceicon_p.h" #include "qgeoserviceprovider.h" -#include "error_messages.h" +#include "error_messages_p.h" #include <QCoreApplication> #include <QtQml/QQmlInfo> |