diff options
Diffstat (limited to 'src/location')
14 files changed, 25 insertions, 15 deletions
diff --git a/src/location/declarativemaps/declarativemaps.pri b/src/location/declarativemaps/declarativemaps.pri index 1da5c7b8..34c9f588 100644 --- a/src/location/declarativemaps/declarativemaps.pri +++ b/src/location/declarativemaps/declarativemaps.pri @@ -2,10 +2,8 @@ QT += quick-private network positioning-private qml-private core-private gui-pri INCLUDEPATH += declarativemaps -PUBLIC_HEADERS += \ - declarativemaps/error_messages.h - PRIVATE_HEADERS += \ + declarativemaps/error_messages_p.h \ declarativemaps/qdeclarativegeomapitemview_p.h \ declarativemaps/qdeclarativegeomapitemview_p_p.h \ declarativemaps/qdeclarativegeoserviceprovider_p.h \ diff --git a/src/location/declarativemaps/error_messages.cpp b/src/location/declarativemaps/error_messages.cpp index a2557f79..7b51b7ad 100644 --- a/src/location/declarativemaps/error_messages.cpp +++ b/src/location/declarativemaps/error_messages.cpp @@ -33,7 +33,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "error_messages.h" +#include "error_messages_p.h" QT_BEGIN_NAMESPACE diff --git a/src/location/declarativemaps/error_messages.h b/src/location/declarativemaps/error_messages_p.h index 81c43b34..cdd531d1 100644 --- a/src/location/declarativemaps/error_messages.h +++ b/src/location/declarativemaps/error_messages_p.h @@ -37,6 +37,18 @@ #ifndef ERROR_MESSAGES_H #define ERROR_MESSAGES_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + + #include <QtCore/qglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeocodemodel.cpp b/src/location/declarativemaps/qdeclarativegeocodemodel.cpp index f7422ec2..d874f9a2 100644 --- a/src/location/declarativemaps/qdeclarativegeocodemodel.cpp +++ b/src/location/declarativemaps/qdeclarativegeocodemodel.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qdeclarativegeocodemodel_p.h" -#include "error_messages.h" +#include "error_messages_p.h" #include <QtCore/QCoreApplication> #include <QtQml/QQmlInfo> diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp index 135323e6..1947531f 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp @@ -36,7 +36,7 @@ #include "qdeclarativegeoroutemodel_p.h" #include "qdeclarativegeoroute_p.h" -#include "error_messages.h" +#include "error_messages_p.h" #include "locationvaluetypehelper_p.h" #include <QtCore/QCoreApplication> diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp index 0b93a294..daa1a9fc 100644 --- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp @@ -36,7 +36,7 @@ #include "qdeclarativepolygonmapitem_p.h" #include "qlocationutils_p.h" -#include "error_messages.h" +#include "error_messages_p.h" #include "locationvaluetypehelper_p.h" #include <QtLocation/private/qgeomap_p.h> diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp index 7c75cd7a..aedb9811 100644 --- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp @@ -36,7 +36,7 @@ #include "qdeclarativepolylinemapitem_p.h" #include "qlocationutils_p.h" -#include "error_messages.h" +#include "error_messages_p.h" #include "locationvaluetypehelper_p.h" #include "qdoublevector2d_p.h" #include <QtLocation/private/qgeomap_p.h> diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp index c28c2a28..13c667e6 100644 --- a/src/location/declarativemaps/qquickgeomapgesturearea.cpp +++ b/src/location/declarativemaps/qquickgeomapgesturearea.cpp @@ -37,7 +37,7 @@ #include "qquickgeomapgesturearea_p.h" #include "qquickgeocoordinateanimation_p.h" #include "qdeclarativegeomap_p.h" -#include "error_messages.h" +#include "error_messages_p.h" #include <QtGui/QGuiApplication> #include <QtGui/qevent.h> 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/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> |