Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I23c874c5dcd0452142c3cf8abff65415ad31a1e7

2 files changed, 13 insertions, 0 deletions

diff --git a/src/positioning/doc/src/examples/weatherinfo.qdoc b/src/positioning/doc/src/examples/weatherinfo.qdoc
index e32127d4..3db6fcbf 100644
--- a/src/positioning/doc/src/examples/weatherinfo.qdoc
+++ b/src/positioning/doc/src/examples/weatherinfo.qdoc
@@ -45,6 +45,8 @@
 
     \include examples-run.qdocinc
 
+    The example uses weather data provided by \l http://www.openweathermap.org.
+
     The key part of this example is the application's data model, contained
     in the WeatherData and AppModel classes. WeatherData represents the weather
     information taken from the HTTP service. It is a simple data class, but we
diff --git a/src/positioning/qpositioningglobal_p.h b/src/positioning/qpositioningglobal_p.h
index 653fcf77..747e450e 100644
--- a/src/positioning/qpositioningglobal_p.h
+++ b/src/positioning/qpositioningglobal_p.h
@@ -39,6 +39,17 @@
 #ifndef QPOSITIONINGGLOBAL_P_H
 #define QPOSITIONINGGLOBAL_P_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 "qpositioningglobal.h"
 
 QT_BEGIN_NAMESPACE