diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-20 13:18:59 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-22 10:08:51 +0000 |
| commit | 31f9c57bc50ae053cfaf039a1dfdb128e2494458 (patch) | |
| tree | 316138cb73c49877f5a80a8496c2f1b737122fb5 /src/datavisualization/engine/abstract3dcontroller_p.h | |
| parent | 4162ddeb02ee41fd4217d7f3d93d45cab3313ba8 (diff) | |
Fix issues with COIN builds
-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL
Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3dcontroller_p.h')
| -rw-r--r-- | src/datavisualization/engine/abstract3dcontroller_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index e6209bb3..9ed5a7d7 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -42,6 +42,7 @@ #include <QtGui/QLinearGradient> #include <QtCore/QTime> #include <QtCore/QLocale> +#include <QtCore/QMutex> QT_FORWARD_DECLARE_CLASS(QOpenGLFramebufferObject) @@ -215,6 +216,8 @@ protected: int m_selectedCustomItemIndex; qreal m_margin; + QMutex m_renderMutex; + explicit Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent = 0); public: |