diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2021-01-28 12:16:28 +0200 |
|---|---|---|
| committer | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2021-01-28 12:26:47 +0200 |
| commit | 587d44e8077196ed4aa3df1484e69adcba2dc268 (patch) | |
| tree | 2c1e1256a1573cb609418c735868a44f568828d1 /src/datavisualization/global | |
| parent | 2ee3f2cd5b860a6b030cffc54907d6f09ea572f4 (diff) | |
Remove custom namespace
Fixes: QTBUG-90400
Change-Id: Ia2f1974a21112bad97724717d073d367c4413a7f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/datavisualization/global')
| -rw-r--r-- | src/datavisualization/global/datavisualizationglobal_p.h | 4 | ||||
| -rw-r--r-- | src/datavisualization/global/qdatavisualizationglobal.h | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/datavisualization/global/datavisualizationglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h index 7c1b7815..2302105a 100644 --- a/src/datavisualization/global/datavisualizationglobal_p.h +++ b/src/datavisualization/global/datavisualizationglobal_p.h @@ -47,7 +47,7 @@ #include <QtGui/QQuaternion> #include <QtCore/QDebug> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE // Constants used in several files // Distance from camera to origin @@ -84,6 +84,6 @@ static const GLfloat uniformTextureWidth = 2.0f; static const GLfloat labelMargin = 0.05f; static const GLfloat gridLineWidth = 0.005f; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index 1755ba21..8ff90243 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -52,12 +52,4 @@ # 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 |