summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2
diff options
context:
space:
mode:
authorSami Varanka <sami.varanka@qt.io>2021-05-12 13:03:07 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-05-18 10:18:16 +0000
commit9802dbcf01236da02f79f270535093fb53fabb5a (patch)
tree4f4d14c69b8905b5f52069565e4046a3acce6272 /src/datavisualizationqml2
parentb315cb478add70e746b5f625c94702d12b64d77c (diff)
Fix Gradients don't show
Added pointer to graph in Abstract3DController. Controller can use that pointer to check whether the graph is ready when receiving a themetypeChanged signal. Added manual test for gradients. Fixes: QTBUG-93506 Change-Id: I13df962b807feb615e3267f580ef57dd62a0b058 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit c9768c1e2440e52976c3456a9a4d302edf49f56a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r--src/datavisualizationqml2/abstractdeclarative.cpp1
-rw-r--r--src/datavisualizationqml2/abstractdeclarative_p.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index d0830f70..ccc03d19 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -293,6 +293,7 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller)
{
Q_ASSERT(controller);
m_controller = controller;
+ m_controller->m_qml = this;
if (!m_controller->isOpenGLES())
m_samples = 4;
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index f0ebf4cf..dd560150 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -231,6 +231,8 @@ public:
QMutex *mutex() { return &m_mutex; }
+ bool isReady() { return isComponentComplete(); }
+
public Q_SLOTS:
virtual void handleAxisXChanged(QAbstract3DAxis *axis) = 0;
virtual void handleAxisYChanged(QAbstract3DAxis *axis) = 0;