diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2021-01-29 07:12:22 +0200 |
|---|---|---|
| committer | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2021-01-29 07:15:50 +0200 |
| commit | 8bf87c7bcb2ffa83f3273147222859ab623390e1 (patch) | |
| tree | fc8e710ed85f0390a8b5fc8659b76672363af226 | |
| parent | 587d44e8077196ed4aa3df1484e69adcba2dc268 (diff) | |
Fix conan build errors
Fixes: QTBUG-90737
Change-Id: Iab4a0f9d4ff3618dfb4c1675dfd731421de29f9f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| -rw-r--r-- | src/datavisualization/engine/qabstract3dgraph.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualization/global/qdatavisualizationglobal.h | 4 | ||||
| -rw-r--r-- | src/datavisualization/utils/qutils.h | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index 78f3a7c5..b1bb3a61 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -186,7 +186,7 @@ QAbstract3DGraph::QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFor // Make sure renderable type is correct surfaceFormat.setRenderableType(QSurfaceFormat::DefaultRenderableType); } else { - surfaceFormat = QtDataVisualization::qDefaultSurfaceFormat(); + surfaceFormat = qDefaultSurfaceFormat(); } d_ptr->m_context = new QOpenGLContext(this); diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index 8ff90243..841ac7e4 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -32,6 +32,8 @@ #include <QtCore/qglobal.h> +QT_BEGIN_NAMESPACE + #define QT_DATAVISUALIZATION_VERSION_STR QT_VERSION_STR /* QT_DATAVISUALIZATION_VERSION is (major << 16) + (minor << 8) + patch. @@ -52,4 +54,6 @@ # define QT_DATAVISUALIZATION_EXPORT #endif +QT_END_NAMESPACE + #endif diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h index 65fb8047..87bc0f33 100644 --- a/src/datavisualization/utils/qutils.h +++ b/src/datavisualization/utils/qutils.h @@ -36,7 +36,7 @@ #include <QtGui/QOffscreenSurface> #include <QtCore/QCoreApplication> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE #ifndef Q_QDOC static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true); @@ -111,6 +111,6 @@ static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias) return surfaceFormat; } -} +QT_END_NAMESPACE #endif |