diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:53:01 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:53:01 +0100 |
commit | a78f8d6bef57dd4283094a52551705ee02909970 (patch) | |
tree | a4d42899d2b745a0c3b9d3baa6573c870f8d5328 /src/datavisualization/axis/qabstract3daxis.h | |
parent | 3f5c27908314074f177454ddcb1c18fce123fa6c (diff) | |
parent | 0bf42b29a9fa926e0ec63a33eb496c660960d617 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-rc1v5.8.0
Change-Id: I42fd801107912d52c3e1bcd52d98d4362e2c27ef
Diffstat (limited to 'src/datavisualization/axis/qabstract3daxis.h')
-rw-r--r-- | src/datavisualization/axis/qabstract3daxis.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h index 63dd0340..ff587acf 100644 --- a/src/datavisualization/axis/qabstract3daxis.h +++ b/src/datavisualization/axis/qabstract3daxis.h @@ -124,6 +124,8 @@ private: friend class Abstract3DController; friend class Bars3DController; + friend class QScatterDataProxyPrivate; + friend class QSurfaceDataProxyPrivate; }; QT_END_NAMESPACE_DATAVISUALIZATION |