diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-25 08:23:31 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-26 08:14:59 +0100 |
commit | 51c361b85ca7fe4194b3c2d2a0e5ebead6cf30ae (patch) | |
tree | 3c5b28244fc3dd38150a3bf501499c9324d6c75c /src | |
parent | 57029b2a392951eecee8be7d5540762de546ac49 (diff) |
Update dependencies
Add missing Q_MOC_INCLUDE and adapt to OpenGL split.
Change-Id: I6150876a62ca55ad63c09a128226c2bac428b821
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/datavisualization/data/qbardataproxy.h | 2 | ||||
-rw-r--r-- | src/datavisualization/data/qscatterdataproxy.h | 2 | ||||
-rw-r--r-- | src/datavisualization/data/qsurfacedataproxy.h | 2 | ||||
-rw-r--r-- | src/datavisualization/datavisualization.pro | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dobject.h | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/qabstract3dgraph.cpp | 4 | ||||
-rw-r--r-- | src/datavisualization/utils/shaderhelper.cpp | 2 | ||||
-rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2.pro | 2 | ||||
-rw-r--r-- | src/datavisualizationqml2/declarativerendernode.cpp | 2 |
10 files changed, 15 insertions, 7 deletions
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h index 2ea9947b..67d8cb59 100644 --- a/src/datavisualization/data/qbardataproxy.h +++ b/src/datavisualization/data/qbardataproxy.h @@ -35,6 +35,8 @@ #include <QtCore/QVector> #include <QtCore/QStringList> +Q_MOC_INCLUDE(<QtDataVisualization/qbar3dseries.h>) + QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QBarDataProxyPrivate; diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h index ea5a2978..086621e0 100644 --- a/src/datavisualization/data/qscatterdataproxy.h +++ b/src/datavisualization/data/qscatterdataproxy.h @@ -33,6 +33,8 @@ #include <QtDataVisualization/qabstractdataproxy.h> #include <QtDataVisualization/qscatterdataitem.h> +Q_MOC_INCLUDE(<QtDataVisualization/qscatter3dseries.h>) + QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QScatterDataProxyPrivate; diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h index ed16af88..8284d9ba 100644 --- a/src/datavisualization/data/qsurfacedataproxy.h +++ b/src/datavisualization/data/qsurfacedataproxy.h @@ -33,6 +33,8 @@ #include <QtDataVisualization/qabstractdataproxy.h> #include <QtDataVisualization/qsurfacedataitem.h> +Q_MOC_INCLUDE(<QtDataVisualization/qsurface3dseries.h>) + QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QSurfaceDataProxyPrivate; diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index 41d0f54b..beb1c512 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -1,6 +1,6 @@ TARGET = QtDataVisualization -QT += core gui +QT += core gui opengl osx: QT += gui-private QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 02a435aa..0fe0aa6d 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -38,7 +38,7 @@ #include "qcustom3ditem_p.h" #include "utils_p.h" #include <QtCore/QThread> -#include <QtGui/QOpenGLFramebufferObject> +#include <QtOpenGL/QOpenGLFramebufferObject> #include <QtCore/QMutexLocker> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h index e0fa0a08..812e89cb 100644 --- a/src/datavisualization/engine/q3dobject.h +++ b/src/datavisualization/engine/q3dobject.h @@ -34,6 +34,8 @@ #include <QtCore/QObject> #include <QtGui/QVector3D> +Q_MOC_INCLUDE(<QtDataVisualization/q3dscene.h>) + QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DObjectPrivate; diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index 284ab408..cb972779 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -37,9 +37,9 @@ #include <QtGui/QGuiApplication> #include <QtGui/QOpenGLContext> -#include <QtGui/QOpenGLPaintDevice> +#include <QtOpenGL/QOpenGLPaintDevice> #include <QtGui/QPainter> -#include <QtGui/QOpenGLFramebufferObject> +#include <QtOpenGL/QOpenGLFramebufferObject> #include <QtGui/QOffscreenSurface> #if defined(Q_OS_OSX) #include <qpa/qplatformnativeinterface.h> diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp index e83f7c55..92f46a2b 100644 --- a/src/datavisualization/utils/shaderhelper.cpp +++ b/src/datavisualization/utils/shaderhelper.cpp @@ -29,7 +29,7 @@ #include "shaderhelper_p.h" -#include <QtGui/QOpenGLShader> +#include <QtOpenGL/QOpenGLShader> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index 4c378c3b..8f5fcb68 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -1,6 +1,6 @@ TARGET = datavisualizationqml2 CXX_MODULE = datavisualization -QT += qml quick datavisualization +QT += opengl qml quick datavisualization osx: QT += gui-private TARGETPATH = QtDataVisualization diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml2/declarativerendernode.cpp index 1e3c3542..a1d65a94 100644 --- a/src/datavisualizationqml2/declarativerendernode.cpp +++ b/src/datavisualizationqml2/declarativerendernode.cpp @@ -29,7 +29,7 @@ #include "declarativerendernode_p.h" #include "abstractdeclarative_p.h" -#include <QtGui/QOpenGLFramebufferObject> +#include <QtOpenGL/QOpenGLFramebufferObject> #include <QtCore/QMutexLocker> QT_BEGIN_NAMESPACE_DATAVISUALIZATION |