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

Change-Id: I103882a747cf750dfbfba3f3004b1edfbecaca57

7 files changed, 18 insertions, 22 deletions

diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index 0493543b..14f36253 100644
--- a/src/datavisualization/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -60,14 +60,14 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  */
 
 /*!
- * \typedef QtDataVisualization::QBarDataRow
+ * \typedef QBarDataRow
  * \relates QBarDataProxy
  *
  * A vector of \l {QBarDataItem} objects.
  */
 
 /*!
- * \typedef QtDataVisualization::QBarDataArray
+ * \typedef QBarDataArray
  * \relates QBarDataProxy
  *
  * A list of pointers to \l {QBarDataRow} objects.
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index a9311569..2ea9947b 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -35,17 +35,14 @@
 #include <QtCore/QVector>
 #include <QtCore/QStringList>
 
-namespace QtDataVisualization {
-// typedefs introduced this way because QDoc doesn't understand namespace macros
-typedef QVector<QBarDataItem> QBarDataRow;
-typedef QList<QBarDataRow *> QBarDataArray;
-}
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QBarDataProxyPrivate;
 class QBar3DSeries;
 
+typedef QVector<QBarDataItem> QBarDataRow;
+typedef QList<QBarDataRow *> QBarDataArray;
+
 class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy
 {
     Q_OBJECT
diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp
index 3d81a641..2d0e203a 100644
--- a/src/datavisualization/data/qscatterdataproxy.cpp
+++ b/src/datavisualization/data/qscatterdataproxy.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  */
 
 /*!
- * \typedef QtDataVisualization::QScatterDataArray
+ * \typedef QScatterDataArray
  * \relates QScatterDataProxy
  *
  * A vector of \l {QScatterDataItem} objects.
diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index fd229d1c..ea5a2978 100644
--- a/src/datavisualization/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -33,16 +33,13 @@
 #include <QtDataVisualization/qabstractdataproxy.h>
 #include <QtDataVisualization/qscatterdataitem.h>
 
-namespace QtDataVisualization {
-// typedef introduced this way because QDoc doesn't understand namespace macros
-typedef QVector<QScatterDataItem> QScatterDataArray;
-}
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QScatterDataProxyPrivate;
 class QScatter3DSeries;
 
+typedef QVector<QScatterDataItem> QScatterDataArray;
+
 class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy
 {
     Q_OBJECT
diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index a5339e9d..1c61084c 100644
--- a/src/datavisualization/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -76,14 +76,14 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  */
 
 /*!
- * \typedef QtDataVisualization::QSurfaceDataRow
+ * \typedef QSurfaceDataRow
  * \relates QSurfaceDataProxy
  *
  * A vector of \l {QSurfaceDataItem} objects.
  */
 
 /*!
- * \typedef QtDataVisualization::QSurfaceDataArray
+ * \typedef QSurfaceDataArray
  * \relates QSurfaceDataProxy
  *
  * A list of pointers to \l {QSurfaceDataRow} objects.
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index 427da55d..ed16af88 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -33,17 +33,14 @@
 #include <QtDataVisualization/qabstractdataproxy.h>
 #include <QtDataVisualization/qsurfacedataitem.h>
 
-namespace QtDataVisualization {
-// typedefs introduced this way because QDoc doesn't understand namespace macros
-typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
-typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
-}
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QSurfaceDataProxyPrivate;
 class QSurface3DSeries;
 
+typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
+typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
+
 class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy
 {
     Q_OBJECT
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h
index a1c31a93..1755ba21 100644
--- a/src/datavisualization/global/qdatavisualizationglobal.h
+++ b/src/datavisualization/global/qdatavisualizationglobal.h
@@ -52,7 +52,12 @@
 #  define QT_DATAVISUALIZATION_EXPORT
 #endif
 
+#ifndef Q_CLANG_QDOC
 #define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization {
 #define QT_END_NAMESPACE_DATAVISUALIZATION }
+#else /* Let documentation be generated with the standard Qt namespace */
+#define QT_BEGIN_NAMESPACE_DATAVISUALIZATION QT_BEGIN_NAMESPACE
+#define QT_END_NAMESPACE_DATAVISUALIZATION QT_END_NAMESPACE
+#endif // Q_CLANG_QDOC
 
 #endif