diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-04 11:40:46 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-04 13:52:27 +0000 |
| commit | 255e58fe67885dc47e25e685ac3666c514d60740 (patch) | |
| tree | d47f642415a535fb9830ea2a3f35dc5a4366b583 | |
| parent | 7e8cdbcc24c340bdd874c107211bbf9ee76b5caa (diff) | |
| download | qtlocation-255e58fe67885dc47e25e685ac3666c514d60740.tar.gz | |
QtLocation: Fix build warnings
QtLocation: WARNING: qtlocation/src/location/qlocationglobal.h includes qlocation.h when it should include QtLocation/qlocation.h
QtLocation: WARNING: qtlocation/src/location/labs/qsg/qqsgmapobject_p.h does not have the "We mean it." warning
Amends 2782765e20ba3bc6af92375574456fd54d4243f7.
Change-Id: I6c225c8af70ebc5753b3b20aec1900efd1bc2c5c
Reviewed-by: Martin Smith <martin.smith@qt.io>
| -rw-r--r-- | src/location/labs/qsg/qqsgmapobject_p.h | 11 | ||||
| -rw-r--r-- | src/location/qlocationglobal.h | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/location/labs/qsg/qqsgmapobject_p.h b/src/location/labs/qsg/qqsgmapobject_p.h index 1aecc990..52036805 100644 --- a/src/location/labs/qsg/qqsgmapobject_p.h +++ b/src/location/labs/qsg/qqsgmapobject_p.h @@ -37,6 +37,17 @@ #ifndef QQSGMAPOBJECT_H #define QQSGMAPOBJECT_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 <QtLocation/private/qlocationglobal_p.h> #include <QtQuick/QSGOpacityNode> #include <QtLocation/private/qgeomapobject_p.h> diff --git a/src/location/qlocationglobal.h b/src/location/qlocationglobal.h index e7355f04..ee3d9c8c 100644 --- a/src/location/qlocationglobal.h +++ b/src/location/qlocationglobal.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE #endif #ifdef Q_CLANG_QDOC -#include "qlocation.h" +#include "QtLocation/qlocation.h" #endif QT_END_NAMESPACE |