From 4162ddeb02ee41fd4217d7f3d93d45cab3313ba8 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Date: Mon, 19 Oct 2015 17:00:39 +0300
Subject: Update license headers

Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
---
 .../declarativerendernode_p.h                      | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'src/datavisualizationqml2/declarativerendernode_p.h')

diff --git a/src/datavisualizationqml2/declarativerendernode_p.h b/src/datavisualizationqml2/declarativerendernode_p.h
index 9fd652c2..d284813b 100644
--- a/src/datavisualizationqml2/declarativerendernode_p.h
+++ b/src/datavisualizationqml2/declarativerendernode_p.h
@@ -1,20 +1,23 @@
-/****************************************************************************
+/******************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd
-** All rights reserved.
-** For any questions to The Qt Company, please use contact form at http://qt.io
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Data Visualization module.
 **
-** Licensees holding valid commercial license for Qt may use this file in
-** accordance with the Qt License Agreement provided with the Software
-** or, alternatively, in accordance with the terms contained in a written
-** agreement between you and The Qt Company.
+** $QT_BEGIN_LICENSE:COMM$
 **
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.io
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
-****************************************************************************/
+** $QT_END_LICENSE$
+**
+******************************************************************************/
 
 //
 //  W A R N I N G
-- 
cgit v1.2.3


From 31f9c57bc50ae053cfaf039a1dfdb128e2494458 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
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ää <tomi.korpipaa@theqtcompany.com>
---
 src/datavisualizationqml2/declarativerendernode_p.h | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/datavisualizationqml2/declarativerendernode_p.h')

diff --git a/src/datavisualizationqml2/declarativerendernode_p.h b/src/datavisualizationqml2/declarativerendernode_p.h
index d284813b..a4fd910c 100644
--- a/src/datavisualizationqml2/declarativerendernode_p.h
+++ b/src/datavisualizationqml2/declarativerendernode_p.h
@@ -37,16 +37,21 @@
 #include <QtQuick/QSGGeometryNode>
 #include <QtQuick/QSGTextureMaterial>
 #include <QtQuick/QQuickWindow>
+#include <QtCore/QMutex>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Abstract3DController;
 class AbstractDeclarative;
 
-class DeclarativeRenderNode : public QSGGeometryNode
+class DeclarativeRenderNode : public QObject, public QSGGeometryNode
 {
+    Q_OBJECT
 public:
-    DeclarativeRenderNode(AbstractDeclarative *declarative);
+    DeclarativeRenderNode(AbstractDeclarative *declarative,
+                          const QSharedPointer<QMutex> &nodeMutex);
     ~DeclarativeRenderNode();
 
     void setSize(const QSize &size);
@@ -61,6 +66,9 @@ public:
 
     void preprocess();
 
+public Q_SLOTS:
+    void handleControllerDestroyed();
+
 private:
     QSGTextureMaterial m_material;
     QSGOpaqueTextureMaterial m_materialO;
@@ -76,6 +84,9 @@ private:
     int m_samples;
 
     bool m_dirtyFBO;
+
+    QSharedPointer<QMutex> m_nodeMutex;
+
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION
-- 
cgit v1.2.3