diff options
Diffstat (limited to 'src')
46 files changed, 46 insertions, 54 deletions
diff --git a/src/datavisualization/CMakeLists.txt b/src/datavisualization/CMakeLists.txt index d0607248..ca75d284 100644 --- a/src/datavisualization/CMakeLists.txt +++ b/src/datavisualization/CMakeLists.txt @@ -91,6 +91,7 @@ qt_internal_add_module(DataVisualization Qt::OpenGL Qt::Qml Qt::Quick + GENERATE_CPP_EXPORTS ) set_source_files_properties("engine/meshes/arrowFlat.obj" diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h index 0ff405dd..79af4377 100644 --- a/src/datavisualization/axis/qabstract3daxis.h +++ b/src/datavisualization/axis/qabstract3daxis.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QAbstract3DAxisPrivate; -class QT_DATAVISUALIZATION_EXPORT QAbstract3DAxis : public QObject +class Q_DATAVISUALIZATION_EXPORT QAbstract3DAxis : public QObject { Q_OBJECT Q_ENUMS(AxisOrientation) diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h index e394b4a3..d7fc8709 100644 --- a/src/datavisualization/axis/qcategory3daxis.h +++ b/src/datavisualization/axis/qcategory3daxis.h @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE class QCategory3DAxisPrivate; -class QT_DATAVISUALIZATION_EXPORT QCategory3DAxis : public QAbstract3DAxis +class Q_DATAVISUALIZATION_EXPORT QCategory3DAxis : public QAbstract3DAxis { Q_OBJECT Q_PROPERTY(QStringList labels READ labels WRITE setLabels NOTIFY labelsChanged) diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter.h b/src/datavisualization/axis/qlogvalue3daxisformatter.h index 8f0e67a5..cdfb157d 100644 --- a/src/datavisualization/axis/qlogvalue3daxisformatter.h +++ b/src/datavisualization/axis/qlogvalue3daxisformatter.h @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE class QLogValue3DAxisFormatterPrivate; -class QT_DATAVISUALIZATION_EXPORT QLogValue3DAxisFormatter : public QValue3DAxisFormatter +class Q_DATAVISUALIZATION_EXPORT QLogValue3DAxisFormatter : public QValue3DAxisFormatter { Q_OBJECT diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h index b1fce675..50e61d0b 100644 --- a/src/datavisualization/axis/qvalue3daxis.h +++ b/src/datavisualization/axis/qvalue3daxis.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE class QValue3DAxisPrivate; -class QT_DATAVISUALIZATION_EXPORT QValue3DAxis : public QAbstract3DAxis +class Q_DATAVISUALIZATION_EXPORT QValue3DAxis : public QAbstract3DAxis { Q_OBJECT Q_PROPERTY(int segmentCount READ segmentCount WRITE setSegmentCount NOTIFY segmentCountChanged) diff --git a/src/datavisualization/axis/qvalue3daxisformatter.h b/src/datavisualization/axis/qvalue3daxisformatter.h index 43a61fd8..658a4166 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter.h +++ b/src/datavisualization/axis/qvalue3daxisformatter.h @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE class QValue3DAxisFormatterPrivate; class QValue3DAxis; -class QT_DATAVISUALIZATION_EXPORT QValue3DAxisFormatter : public QObject +class Q_DATAVISUALIZATION_EXPORT QValue3DAxisFormatter : public QObject { Q_OBJECT protected: diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index c9f355e1..73c95c50 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE class QAbstract3DSeriesPrivate; -class QT_DATAVISUALIZATION_EXPORT QAbstract3DSeries : public QObject +class Q_DATAVISUALIZATION_EXPORT QAbstract3DSeries : public QObject { Q_OBJECT Q_ENUMS(SeriesType) diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h index 89d73bce..08fa4053 100644 --- a/src/datavisualization/data/qabstractdataproxy.h +++ b/src/datavisualization/data/qabstractdataproxy.h @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class QAbstractDataProxyPrivate; -class QT_DATAVISUALIZATION_EXPORT QAbstractDataProxy : public QObject +class Q_DATAVISUALIZATION_EXPORT QAbstractDataProxy : public QObject { Q_OBJECT Q_ENUMS(DataType) diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h index c3a71205..99fbad77 100644 --- a/src/datavisualization/data/qbar3dseries.h +++ b/src/datavisualization/data/qbar3dseries.h @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class QBar3DSeriesPrivate; -class QT_DATAVISUALIZATION_EXPORT QBar3DSeries : public QAbstract3DSeries +class Q_DATAVISUALIZATION_EXPORT QBar3DSeries : public QAbstract3DSeries { Q_OBJECT Q_PROPERTY(QBarDataProxy *dataProxy READ dataProxy WRITE setDataProxy NOTIFY dataProxyChanged) diff --git a/src/datavisualization/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h index 11a8e471..d287868c 100644 --- a/src/datavisualization/data/qbardataitem.h +++ b/src/datavisualization/data/qbardataitem.h @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE class QBarDataItemPrivate; -class QT_DATAVISUALIZATION_EXPORT QBarDataItem +class Q_DATAVISUALIZATION_EXPORT QBarDataItem { public: QBarDataItem(); diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h index 80e5f063..daf9366e 100644 --- a/src/datavisualization/data/qbardataproxy.h +++ b/src/datavisualization/data/qbardataproxy.h @@ -45,7 +45,7 @@ class QBar3DSeries; typedef QList<QBarDataItem> QBarDataRow; typedef QList<QBarDataRow *> QBarDataArray; -class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy +class Q_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy { Q_OBJECT diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h index 8d6d905f..8e65a7f5 100644 --- a/src/datavisualization/data/qcustom3ditem.h +++ b/src/datavisualization/data/qcustom3ditem.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QCustom3DItemPrivate; -class QT_DATAVISUALIZATION_EXPORT QCustom3DItem : public QObject +class Q_DATAVISUALIZATION_EXPORT QCustom3DItem : public QObject { Q_OBJECT Q_PROPERTY(QString meshFile READ meshFile WRITE setMeshFile NOTIFY meshFileChanged) diff --git a/src/datavisualization/data/qcustom3dlabel.h b/src/datavisualization/data/qcustom3dlabel.h index 9ca68fe9..768c3fbf 100644 --- a/src/datavisualization/data/qcustom3dlabel.h +++ b/src/datavisualization/data/qcustom3dlabel.h @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE class QCustom3DLabelPrivate; -class QT_DATAVISUALIZATION_EXPORT QCustom3DLabel : public QCustom3DItem +class Q_DATAVISUALIZATION_EXPORT QCustom3DLabel : public QCustom3DItem { Q_OBJECT Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h index 886019d0..16ecc714 100644 --- a/src/datavisualization/data/qcustom3dvolume.h +++ b/src/datavisualization/data/qcustom3dvolume.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QCustom3DVolumePrivate; -class QT_DATAVISUALIZATION_EXPORT QCustom3DVolume : public QCustom3DItem +class Q_DATAVISUALIZATION_EXPORT QCustom3DVolume : public QCustom3DItem { Q_OBJECT Q_PROPERTY(int textureWidth READ textureWidth WRITE setTextureWidth NOTIFY textureWidthChanged) diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h index f1eff075..a22cb685 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy.h +++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class QHeightMapSurfaceDataProxyPrivate; -class QT_DATAVISUALIZATION_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDataProxy +class Q_DATAVISUALIZATION_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDataProxy { Q_OBJECT diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h index 501d77fe..7340fa82 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.h +++ b/src/datavisualization/data/qitemmodelbardataproxy.h @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class QItemModelBarDataProxyPrivate; -class QT_DATAVISUALIZATION_EXPORT QItemModelBarDataProxy : public QBarDataProxy +class Q_DATAVISUALIZATION_EXPORT QItemModelBarDataProxy : public QBarDataProxy { Q_OBJECT Q_ENUMS(MultiMatchBehavior) diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h index 5d66b12e..6cabcb01 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QItemModelScatterDataProxyPrivate; -class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy +class Q_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy { Q_OBJECT Q_PROPERTY(QAbstractItemModel* itemModel READ itemModel WRITE setItemModel NOTIFY itemModelChanged) diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h index 7a3abbb9..b0128777 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QItemModelSurfaceDataProxyPrivate; -class QT_DATAVISUALIZATION_EXPORT QItemModelSurfaceDataProxy : public QSurfaceDataProxy +class Q_DATAVISUALIZATION_EXPORT QItemModelSurfaceDataProxy : public QSurfaceDataProxy { Q_OBJECT Q_ENUMS(MultiMatchBehavior) diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h index e94aed85..62efebc6 100644 --- a/src/datavisualization/data/qscatter3dseries.h +++ b/src/datavisualization/data/qscatter3dseries.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE class QScatter3DSeriesPrivate; -class QT_DATAVISUALIZATION_EXPORT QScatter3DSeries : public QAbstract3DSeries +class Q_DATAVISUALIZATION_EXPORT QScatter3DSeries : public QAbstract3DSeries { Q_OBJECT Q_PROPERTY(QScatterDataProxy *dataProxy READ dataProxy WRITE setDataProxy NOTIFY dataProxyChanged) diff --git a/src/datavisualization/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h index 6fe749d0..ea1d81a6 100644 --- a/src/datavisualization/data/qscatterdataitem.h +++ b/src/datavisualization/data/qscatterdataitem.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE class QScatterDataItemPrivate; -class QT_DATAVISUALIZATION_EXPORT QScatterDataItem +class Q_DATAVISUALIZATION_EXPORT QScatterDataItem { public: QScatterDataItem(); diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h index 790e37c3..8fd0f695 100644 --- a/src/datavisualization/data/qscatterdataproxy.h +++ b/src/datavisualization/data/qscatterdataproxy.h @@ -42,7 +42,7 @@ class QScatter3DSeries; typedef QList<QScatterDataItem> QScatterDataArray; -class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy +class Q_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy { Q_OBJECT diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h index 4b2c44f0..508cbba0 100644 --- a/src/datavisualization/data/qsurface3dseries.h +++ b/src/datavisualization/data/qsurface3dseries.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE class QSurface3DSeriesPrivate; -class QT_DATAVISUALIZATION_EXPORT QSurface3DSeries : public QAbstract3DSeries +class Q_DATAVISUALIZATION_EXPORT QSurface3DSeries : public QAbstract3DSeries { Q_OBJECT Q_FLAGS(DrawFlag DrawFlags) diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h index a4685e3d..6670bc20 100644 --- a/src/datavisualization/data/qsurfacedataitem.h +++ b/src/datavisualization/data/qsurfacedataitem.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE class QSurfaceDataItemPrivate; -class QT_DATAVISUALIZATION_EXPORT QSurfaceDataItem +class Q_DATAVISUALIZATION_EXPORT QSurfaceDataItem { public: QSurfaceDataItem(); diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h index 0b652d97..769b1fe8 100644 --- a/src/datavisualization/data/qsurfacedataproxy.h +++ b/src/datavisualization/data/qsurfacedataproxy.h @@ -43,7 +43,7 @@ class QSurface3DSeries; typedef QList<QSurfaceDataItem> QSurfaceDataRow; typedef QList<QSurfaceDataRow *> QSurfaceDataArray; -class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy +class Q_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy { Q_OBJECT diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index a2efbd17..30514fb2 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -165,7 +165,7 @@ struct Abstract3DChangeBitField { } }; -class QT_DATAVISUALIZATION_EXPORT Abstract3DController : public QObject +class Q_DATAVISUALIZATION_EXPORT Abstract3DController : public QObject { Q_OBJECT diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h index 3662b43c..818eea4f 100644 --- a/src/datavisualization/engine/bars3dcontroller_p.h +++ b/src/datavisualization/engine/bars3dcontroller_p.h @@ -69,7 +69,7 @@ struct Bars3DChangeBitField { } }; -class QT_DATAVISUALIZATION_EXPORT Bars3DController : public Abstract3DController +class Q_DATAVISUALIZATION_EXPORT Bars3DController : public Abstract3DController { Q_OBJECT diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h index 9f7e7c1d..5e3c2459 100644 --- a/src/datavisualization/engine/bars3drenderer_p.h +++ b/src/datavisualization/engine/bars3drenderer_p.h @@ -57,7 +57,7 @@ class LabelItem; class Q3DScene; class BarSeriesRenderCache; -class QT_DATAVISUALIZATION_EXPORT Bars3DRenderer : public Abstract3DRenderer +class Q_DATAVISUALIZATION_EXPORT Bars3DRenderer : public Abstract3DRenderer { Q_OBJECT diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h index cc4e6634..125b21ed 100644 --- a/src/datavisualization/engine/q3dbars.h +++ b/src/datavisualization/engine/q3dbars.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class Q3DBarsPrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DBars : public QAbstract3DGraph +class Q_DATAVISUALIZATION_EXPORT Q3DBars : public QAbstract3DGraph { Q_OBJECT Q_PROPERTY(bool multiSeriesUniform READ isMultiSeriesUniform WRITE setMultiSeriesUniform NOTIFY multiSeriesUniformChanged) diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h index a758afba..234c926d 100644 --- a/src/datavisualization/engine/q3dcamera.h +++ b/src/datavisualization/engine/q3dcamera.h @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE class Q3DCameraPrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DCamera : public Q3DObject +class Q_DATAVISUALIZATION_EXPORT Q3DCamera : public Q3DObject { Q_OBJECT Q_ENUMS(CameraPreset) diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h index 94067ac4..aad430db 100644 --- a/src/datavisualization/engine/q3dlight.h +++ b/src/datavisualization/engine/q3dlight.h @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE class Q3DLightPrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DLight : public Q3DObject +class Q_DATAVISUALIZATION_EXPORT Q3DLight : public Q3DObject { Q_OBJECT Q_PROPERTY(bool autoPosition READ isAutoPosition WRITE setAutoPosition NOTIFY autoPositionChanged REVISION(1, 3)) diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h index 2b93e3aa..cddfe089 100644 --- a/src/datavisualization/engine/q3dobject.h +++ b/src/datavisualization/engine/q3dobject.h @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE class Q3DObjectPrivate; class Q3DScene; -class QT_DATAVISUALIZATION_EXPORT Q3DObject : public QObject +class Q_DATAVISUALIZATION_EXPORT Q3DObject : public QObject { Q_OBJECT Q_PROPERTY(Q3DScene* parentScene READ parentScene) diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h index 3a163aef..19e5be40 100644 --- a/src/datavisualization/engine/q3dscatter.h +++ b/src/datavisualization/engine/q3dscatter.h @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class Q3DScatterPrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DScatter : public QAbstract3DGraph +class Q_DATAVISUALIZATION_EXPORT Q3DScatter : public QAbstract3DGraph { Q_OBJECT Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h index 4e29c32d..d07d6a14 100644 --- a/src/datavisualization/engine/q3dscene.h +++ b/src/datavisualization/engine/q3dscene.h @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE class Q3DScenePrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DScene : public QObject +class Q_DATAVISUALIZATION_EXPORT Q3DScene : public QObject { Q_OBJECT Q_PROPERTY(QRect viewport READ viewport NOTIFY viewportChanged) diff --git a/src/datavisualization/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h index 434ed9c7..47beeb93 100644 --- a/src/datavisualization/engine/q3dscene_p.h +++ b/src/datavisualization/engine/q3dscene_p.h @@ -77,7 +77,7 @@ struct Q3DSceneChangeBitField { } }; -class QT_DATAVISUALIZATION_EXPORT Q3DScenePrivate : public QObject +class Q_DATAVISUALIZATION_EXPORT Q3DScenePrivate : public QObject { Q_OBJECT public: diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index ae1d67d4..a14e5636 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class Q3DSurfacePrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public QAbstract3DGraph +class Q_DATAVISUALIZATION_EXPORT Q3DSurface : public QAbstract3DGraph { Q_OBJECT Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h index 86e754de..ca99ae7e 100644 --- a/src/datavisualization/engine/qabstract3dgraph.h +++ b/src/datavisualization/engine/qabstract3dgraph.h @@ -45,7 +45,7 @@ class QCustom3DItem; class QAbstract3DAxis; class QAbstract3DSeries; -class QT_DATAVISUALIZATION_EXPORT QAbstract3DGraph : public QWindow, protected QOpenGLFunctions +class Q_DATAVISUALIZATION_EXPORT QAbstract3DGraph : public QWindow, protected QOpenGLFunctions { Q_OBJECT Q_ENUMS(ShadowQuality) diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h index 257eb056..cc64b7df 100644 --- a/src/datavisualization/engine/scatter3dcontroller_p.h +++ b/src/datavisualization/engine/scatter3dcontroller_p.h @@ -60,7 +60,7 @@ struct Scatter3DChangeBitField { } }; -class QT_DATAVISUALIZATION_EXPORT Scatter3DController : public Abstract3DController +class Q_DATAVISUALIZATION_EXPORT Scatter3DController : public Abstract3DController { Q_OBJECT diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index ce43aa9e..13c6be73 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -54,7 +54,7 @@ class Q3DScene; class ScatterSeriesRenderCache; class QScatterDataItem; -class QT_DATAVISUALIZATION_EXPORT Scatter3DRenderer : public Abstract3DRenderer +class Q_DATAVISUALIZATION_EXPORT Scatter3DRenderer : public Abstract3DRenderer { Q_OBJECT diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h index 0c2e31ff..73eda0cb 100644 --- a/src/datavisualization/engine/surface3dcontroller_p.h +++ b/src/datavisualization/engine/surface3dcontroller_p.h @@ -65,7 +65,7 @@ struct Surface3DChangeBitField { } }; -class QT_DATAVISUALIZATION_EXPORT Surface3DController : public Abstract3DController +class Q_DATAVISUALIZATION_EXPORT Surface3DController : public Abstract3DController { Q_OBJECT diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h index 957f44d2..ea5da3b6 100644 --- a/src/datavisualization/engine/surface3drenderer_p.h +++ b/src/datavisualization/engine/surface3drenderer_p.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class ShaderHelper; class Q3DScene; -class QT_DATAVISUALIZATION_EXPORT Surface3DRenderer : public Abstract3DRenderer +class Q_DATAVISUALIZATION_EXPORT Surface3DRenderer : public Abstract3DRenderer { Q_OBJECT diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index 841ac7e4..a769f98c 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -31,6 +31,7 @@ #define QDATAVISUALIZATIONGLOBAL_H #include <QtCore/qglobal.h> +#include <QtDataVisualization/qtdatavisualizationexports.h> QT_BEGIN_NAMESPACE @@ -44,16 +45,6 @@ QT_BEGIN_NAMESPACE */ #define QT_DATAVISUALIZATION_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) -#ifndef QT_STATIC -# if defined(QT_BUILD_DATAVISUALIZATION_LIB) -# define QT_DATAVISUALIZATION_EXPORT Q_DECL_EXPORT -# else -# define QT_DATAVISUALIZATION_EXPORT Q_DECL_IMPORT -# endif -#else -# define QT_DATAVISUALIZATION_EXPORT -#endif - QT_END_NAMESPACE #endif diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index 6e6d1845..d53175a3 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE class Q3DInputHandlerPrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DInputHandler : public QAbstract3DInputHandler +class Q_DATAVISUALIZATION_EXPORT Q3DInputHandler : public QAbstract3DInputHandler { Q_OBJECT Q_PROPERTY(bool rotationEnabled READ isRotationEnabled WRITE setRotationEnabled NOTIFY rotationEnabledChanged) diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index c6e358c3..4715cf85 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE class QAbstract3DInputHandlerPrivate; -class QT_DATAVISUALIZATION_EXPORT QAbstract3DInputHandler : public QObject +class Q_DATAVISUALIZATION_EXPORT QAbstract3DInputHandler : public QObject { Q_OBJECT Q_ENUMS(InputView) diff --git a/src/datavisualization/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h index 51f2e073..0b1bb81d 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.h +++ b/src/datavisualization/input/qtouch3dinputhandler.h @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE class QTouch3DInputHandlerPrivate; -class QT_DATAVISUALIZATION_EXPORT QTouch3DInputHandler : public Q3DInputHandler +class Q_DATAVISUALIZATION_EXPORT QTouch3DInputHandler : public Q3DInputHandler { Q_OBJECT diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h index 4023bc16..3cf02ca7 100644 --- a/src/datavisualization/theme/q3dtheme.h +++ b/src/datavisualization/theme/q3dtheme.h @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE class Q3DThemePrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DTheme : public QObject +class Q_DATAVISUALIZATION_EXPORT Q3DTheme : public QObject { Q_OBJECT Q_ENUMS(ColorStyle) diff --git a/src/datavisualization/theme/q3dtheme_p.h b/src/datavisualization/theme/q3dtheme_p.h index d11b8146..ea7dd3e1 100644 --- a/src/datavisualization/theme/q3dtheme_p.h +++ b/src/datavisualization/theme/q3dtheme_p.h @@ -96,7 +96,7 @@ struct Q3DThemeDirtyBitField { } }; -class QT_DATAVISUALIZATION_EXPORT Q3DThemePrivate : public QObject +class Q_DATAVISUALIZATION_EXPORT Q3DThemePrivate : public QObject { Q_OBJECT public: |