diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:47:32 +0100 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-12-12 12:23:04 +0200 |
| commit | 54910f8cf827d6f9474de9f6f88b3a158a058c56 (patch) | |
| tree | f8b425821436f02d099299799f794d26345e0d5a /src/datavisualization/axis/qabstract3daxis_p.h | |
| parent | 470330e69b7ee34beb27ed905fcb923d9cfdae31 (diff) | |
| parent | 21c82c7e0db0a567c11ed80eac955d86ad0e1dff (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tests/auto/cpptest/q3dscene/tst_scene.cpp
tests/auto/qmltest/scene3d/tst_scene.qml
Change-Id: I0aef5e7d8fe202e7f4c7565922938d1627ab8124
Diffstat (limited to 'src/datavisualization/axis/qabstract3daxis_p.h')
| -rw-r--r-- | src/datavisualization/axis/qabstract3daxis_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/datavisualization/axis/qabstract3daxis_p.h b/src/datavisualization/axis/qabstract3daxis_p.h index deb53266..418fa449 100644 --- a/src/datavisualization/axis/qabstract3daxis_p.h +++ b/src/datavisualization/axis/qabstract3daxis_p.h @@ -84,6 +84,8 @@ protected: friend class QAbstract3DAxis; friend class QValue3DAxis; friend class QCategory3DAxis; + friend class QScatterDataProxyPrivate; + friend class QSurfaceDataProxyPrivate; }; QT_END_NAMESPACE_DATAVISUALIZATION |