From 255e58fe67885dc47e25e685ac3666c514d60740 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 4 May 2018 11:40:46 +0200
Subject: 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>
---
 src/location/labs/qsg/qqsgmapobject_p.h | 11 +++++++++++
 src/location/qlocationglobal.h          |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.1