diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-11 07:47:32 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-11 06:48:58 +0000 |
| commit | 26f91fcec40d1bd50febb6ca6853489115f58a3b (patch) | |
| tree | 2f6265e26fa9482746e0efb32ef2f693b0d21cff /src/location/places | |
| parent | e79664336f35f55a0241fdc0a45c7f15911e4da5 (diff) | |
| parent | 4a6807bca5f4452ea7a9d6ed2ff19b8e4259a372 (diff) | |
| download | qtlocation-26f91fcec40d1bd50febb6ca6853489115f58a3b.tar.gz | |
Merge remote-tracking branch 'gerrit/5.4' into dev
Change-Id: I5ef7649f02455269a8e2caa2f2d2241503586be3
Diffstat (limited to 'src/location/places')
| -rw-r--r-- | src/location/places/qplaceattribute.h | 6 | ||||
| -rw-r--r-- | src/location/places/qplacecontactdetail.h | 6 | ||||
| -rw-r--r-- | src/location/places/qplacecontent.h | 6 | ||||
| -rw-r--r-- | src/location/places/qplacecontentrequest.h | 2 | ||||
| -rw-r--r-- | src/location/places/qplaceimage.h | 4 | ||||
| -rw-r--r-- | src/location/places/qplacemanager.h | 8 | ||||
| -rw-r--r-- | src/location/places/qplacesearchresult.h | 6 | ||||
| -rw-r--r-- | src/location/places/qplacesearchsuggestionreply.h | 2 |
8 files changed, 20 insertions, 20 deletions
diff --git a/src/location/places/qplaceattribute.h b/src/location/places/qplaceattribute.h index da6a7c06..43fd2e47 100644 --- a/src/location/places/qplaceattribute.h +++ b/src/location/places/qplaceattribute.h @@ -34,9 +34,9 @@ #ifndef QPLACEATTRIBUTE_H #define QPLACEATTRIBUTE_H -#include <QString> -#include <QVariant> -#include <QSharedDataPointer> +#include <QtCore/QString> +#include <QtCore/QVariant> +#include <QtCore/QSharedDataPointer> #include <QtLocation/qlocationglobal.h> diff --git a/src/location/places/qplacecontactdetail.h b/src/location/places/qplacecontactdetail.h index 8d96bca2..b4729398 100644 --- a/src/location/places/qplacecontactdetail.h +++ b/src/location/places/qplacecontactdetail.h @@ -34,9 +34,9 @@ #ifndef QPLACECONTACTDETAIL_H #define QPLACECONTACTDETAIL_H -#include <QString> -#include <QVariant> -#include <QSharedDataPointer> +#include <QtCore/QString> +#include <QtCore/QVariant> +#include <QtCore/QSharedDataPointer> #include <QtLocation/qlocationglobal.h> diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h index 3724a418..530ee02c 100644 --- a/src/location/places/qplacecontent.h +++ b/src/location/places/qplacecontent.h @@ -35,9 +35,9 @@ #include <QtLocation/qlocationglobal.h> -#include <QMap> -#include <QMetaType> -#include <QSharedDataPointer> +#include <QtCore/QMap> +#include <QtCore/QMetaType> +#include <QtCore/QSharedDataPointer> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h index 95cc8075..23485e0c 100644 --- a/src/location/places/qplacecontentrequest.h +++ b/src/location/places/qplacecontentrequest.h @@ -34,7 +34,7 @@ #ifndef QPLACECONTENTREQUEST_H #define QPLACECONTENTREQUEST_H -#include <QSharedDataPointer> +#include <QtCore/QSharedDataPointer> #include <QtLocation/QPlaceContent> diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h index f6b0758a..d7aa63d6 100644 --- a/src/location/places/qplaceimage.h +++ b/src/location/places/qplaceimage.h @@ -34,8 +34,8 @@ #ifndef QPLACEIMAGE_H #define QPLACEIMAGE_H -#include <QSharedDataPointer> -#include <QString> +#include <QtCore/QSharedDataPointer> +#include <QtCore/QString> #include <QtLocation/QPlaceSupplier> #include <QtLocation/QPlaceContent> diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h index e57a286b..21daadb5 100644 --- a/src/location/places/qplacemanager.h +++ b/src/location/places/qplacemanager.h @@ -45,10 +45,10 @@ #include <QtLocation/QPlaceSearchRequest> #include <QtLocation/QPlaceSearchResult> -#include <QLocale> -#include <QVector> -#include <QString> -#include <QObject> +#include <QtCore/QLocale> +#include <QtCore/QVector> +#include <QtCore/QString> +#include <QtCore/QObject> #include <QtLocation/QPlaceIcon> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h index a3285d9b..92da39f7 100644 --- a/src/location/places/qplacesearchresult.h +++ b/src/location/places/qplacesearchresult.h @@ -34,9 +34,9 @@ #ifndef QPLACESEARCHRESULT_H #define QPLACESEARCHRESULT_H -#include <QSharedDataPointer> -#include <QVariant> -#include <QString> +#include <QtCore/QSharedDataPointer> +#include <QtCore/QVariant> +#include <QtCore/QString> #include <QtLocation/QPlace> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h index e53873c1..950ad040 100644 --- a/src/location/places/qplacesearchsuggestionreply.h +++ b/src/location/places/qplacesearchsuggestionreply.h @@ -36,7 +36,7 @@ #include <QtLocation/QPlaceReply> -#include <QStringList> +#include <QtCore/QStringList> QT_BEGIN_NAMESPACE |