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/datavisualizationqml2/abstractdeclarative_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/datavisualizationqml2/abstractdeclarative_p.h')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index bc99f25b..c4152619 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -39,6 +39,8 @@ #include <QtQuick/QQuickItem> #include <QtCore/QPointer> #include <QtCore/QThread> +#include <QtCore/QMutex> +#include <QtCore/QSharedPointer> #if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_WINRT) #define USE_SHARED_CONTEXT @@ -50,8 +52,6 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION -class DeclarativeRenderNode; - class AbstractDeclarative : public QQuickItem { Q_OBJECT @@ -274,6 +274,9 @@ Q_SIGNALS: Q_REVISION(2) void queriedGraphPositionChanged(const QVector3D &data); Q_REVISION(2) void marginChanged(qreal margin); +protected: + QSharedPointer<QMutex> m_nodeMutex; + private: QPointer<Abstract3DController> m_controller; QRectF m_cachedGeometry; |