diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-09-21 13:42:09 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-09-21 13:13:13 +0000 |
| commit | 981213f0ad5266debf5fe791e9871960fe320e62 (patch) | |
| tree | 25f0fcd9b930c664d3a4535c3bf71b8d9e6d2328 /src | |
| parent | dc6dcf918bcf4f350ab92ab659506b4a0f8d80f6 (diff) | |
Fix compilation with namespaced Qt.
Task-number: QTRD-3655
Change-Id: Id68e9cec8d1093fe1557b07a148ae04a27656284
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualization/engine/abstract3dcontroller_p.h | 2 | ||||
| -rw-r--r-- | src/datavisualization/engine/abstract3drenderer_p.h | 2 | ||||
| -rw-r--r-- | src/datavisualization/engine/bars3drenderer_p.h | 2 | ||||
| -rw-r--r-- | src/datavisualization/engine/qabstract3dgraph_p.h | 2 | ||||
| -rw-r--r-- | src/datavisualization/engine/scatter3drenderer_p.h | 2 | ||||
| -rw-r--r-- | src/datavisualization/input/qtouch3dinputhandler_p.h | 2 | ||||
| -rw-r--r-- | src/datavisualization/utils/camerahelper_p.h | 2 | ||||
| -rw-r--r-- | src/datavisualization/utils/shaderhelper_p.h | 2 | ||||
| -rw-r--r-- | src/datavisualization/utils/utils_p.h | 2 |
9 files changed, 12 insertions, 6 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index 9c24711b..32c17c45 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -40,7 +40,7 @@ #include <QtCore/QTime> #include <QtCore/QLocale> -class QOpenGLFramebufferObject; +QT_FORWARD_DECLARE_CLASS(QOpenGLFramebufferObject) QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index 2d912e40..bbc903bf 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -39,7 +39,7 @@ #include "seriesrendercache_p.h" #include "customrenderitem_p.h" -class QOffscreenSurface; +QT_FORWARD_DECLARE_CLASS(QOffscreenSurface) QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h index dcb7764e..f71d91a9 100644 --- a/src/datavisualization/engine/bars3drenderer_p.h +++ b/src/datavisualization/engine/bars3drenderer_p.h @@ -34,8 +34,10 @@ #include "abstract3drenderer_p.h" #include "barrenderitem_p.h" +QT_BEGIN_NAMESPACE class QPoint; class QSizeF; +QT_END_NAMESPACE QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/qabstract3dgraph_p.h b/src/datavisualization/engine/qabstract3dgraph_p.h index 4161f32b..e95e7d9e 100644 --- a/src/datavisualization/engine/qabstract3dgraph_p.h +++ b/src/datavisualization/engine/qabstract3dgraph_p.h @@ -31,8 +31,10 @@ #include "datavisualizationglobal_p.h" +QT_BEGIN_NAMESPACE class QOpenGLContext; class QOffscreenSurface; +QT_END_NAMESPACE QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index 8d72af84..cb6decde 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -34,7 +34,7 @@ #include "abstract3drenderer_p.h" #include "scatterrenderitem_p.h" -class QSizeF; +QT_FORWARD_DECLARE_CLASS(QSizeF) QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h index 4c8f5df8..8702306e 100644 --- a/src/datavisualization/input/qtouch3dinputhandler_p.h +++ b/src/datavisualization/input/qtouch3dinputhandler_p.h @@ -22,7 +22,7 @@ #include "q3dinputhandler_p.h" #include "qtouch3dinputhandler.h" -class QTimer; +QT_FORWARD_DECLARE_CLASS(QTimer) QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h index 5b317b00..f4e16774 100644 --- a/src/datavisualization/utils/camerahelper_p.h +++ b/src/datavisualization/utils/camerahelper_p.h @@ -32,8 +32,10 @@ #include "datavisualizationglobal_p.h" #include "q3dcamera.h" +QT_BEGIN_NAMESPACE class QMatrix4x4; class QPoint; +QT_END_NAMESPACE QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h index 3b399e81..9cd7cf14 100644 --- a/src/datavisualization/utils/shaderhelper_p.h +++ b/src/datavisualization/utils/shaderhelper_p.h @@ -31,7 +31,7 @@ #include "datavisualizationglobal_p.h" -class QOpenGLShaderProgram; +QT_FORWARD_DECLARE_CLASS(QOpenGLShaderProgram) QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h index 12e70095..f845d894 100644 --- a/src/datavisualization/utils/utils_p.h +++ b/src/datavisualization/utils/utils_p.h @@ -31,7 +31,7 @@ #include "datavisualizationglobal_p.h" -class QLinearGradient; +QT_FORWARD_DECLARE_CLASS(QLinearGradient) QT_BEGIN_NAMESPACE_DATAVISUALIZATION |