From 31f9c57bc50ae053cfaf039a1dfdb128e2494458 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 20 Oct 2015 13:18:59 +0300 Subject: Fix issues with COIN builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -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ää --- src/datavisualization/engine/abstract3dcontroller_p.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/datavisualization/engine/abstract3dcontroller_p.h') 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 #include #include +#include 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: -- cgit v1.2.3