diff --git a/src/graphs3d/qml/qquickgraphsbars.cpp b/src/graphs3d/qml/qquickgraphsbars.cpp index b02d6510..ddb7ab53 100644 --- a/src/graphs3d/qml/qquickgraphsbars.cpp +++ b/src/graphs3d/qml/qquickgraphsbars.cpp @@ -13,7 +13,6 @@ #include "qgraphs3dlogging_p.h" #include -#include #include #include #include @@ -313,8 +312,6 @@ QQuickGraphsBars::QQuickGraphsBars(QQuickItem *parent) QQuickGraphsBars::~QQuickGraphsBars() { - QMutexLocker locker(m_nodeMutex.data()); - const QMutexLocker locker2(mutex()); removeBarModels(); removeSlicedBarModels(); if (m_grabresult) diff --git a/src/graphs3d/qml/qquickgraphsitem.cpp b/src/graphs3d/qml/qquickgraphsitem.cpp index fd0d8262..76d5d159 100644 --- a/src/graphs3d/qml/qquickgraphsitem.cpp +++ b/src/graphs3d/qml/qquickgraphsitem.cpp @@ -829,8 +829,6 @@ QQuickGraphsItem::QQuickGraphsItem(QQuickItem *parent) this, &QQuickGraphsItem::handleSecondarySubViewportChanged); - m_nodeMutex = QSharedPointer::create(); - QQuick3DSceneEnvironment *scene = environment(); scene->setBackgroundMode(QQuick3DSceneEnvironment::QQuick3DEnvironmentBackgroundTypes::Color); scene->setClearColor(Qt::transparent); @@ -875,12 +873,6 @@ QQuickGraphsItem::~QQuickGraphsItem() delete m_gridGeometryModel; delete m_subgridGeometryModel; delete m_sliceGridGeometryModel; - - // Make sure not deleting locked mutex - QMutexLocker locker(&m_mutex); - locker.unlock(); - - m_nodeMutex.clear(); } void QQuickGraphsItem::handleAxisTitleChanged(const QString &title) @@ -5555,7 +5547,6 @@ void QQuickGraphsItem::itemChange(ItemChange change, const ItemChangeData &value void QQuickGraphsItem::updateWindowParameters() { - const QMutexLocker locker(&m_mutex); // Update the device pixel ratio, window size and bounding box QQuickWindow *win = window(); if (win) { diff --git a/src/graphs3d/qml/qquickgraphsitem_p.h b/src/graphs3d/qml/qquickgraphsitem_p.h index 4f481acf..75c8324e 100644 --- a/src/graphs3d/qml/qquickgraphsitem_p.h +++ b/src/graphs3d/qml/qquickgraphsitem_p.h @@ -399,8 +399,6 @@ public: void setMargin(qreal margin); qreal margin() const; - QMutex *mutex() { return &m_mutex; } - bool isReady() { return isComponentComplete(); } QQuick3DNode *rootNode() const; @@ -779,8 +777,6 @@ protected: QAbstract3DAxis **axisPtr); virtual void startRecordingRemovesAndInserts(); - QSharedPointer m_nodeMutex; - QMap m_customVolumes; Q3DScene *m_scene = nullptr; @@ -811,7 +807,6 @@ protected: qsizetype m_selectedCustomItemIndex = -1; qreal m_margin = -1.0; - QMutex m_renderMutex; QQuickGraphsItem *m_qml = nullptr; QQuick3DViewport *m_customView = nullptr; @@ -877,7 +872,6 @@ private: int m_windowSamples = 0; QSize m_initialisedSize = QSize(0, 0); bool m_runningInDesigner; - QMutex m_mutex; bool m_xFlipped = false; bool m_yFlipped = false; diff --git a/src/graphs3d/qml/qquickgraphsscatter.cpp b/src/graphs3d/qml/qquickgraphsscatter.cpp index d9b36291..4c0d326a 100644 --- a/src/graphs3d/qml/qquickgraphsscatter.cpp +++ b/src/graphs3d/qml/qquickgraphsscatter.cpp @@ -11,7 +11,6 @@ #include "qgraphs3dlogging_p.h" #include -#include #include #include #include @@ -186,9 +185,6 @@ QQuickGraphsScatter::QQuickGraphsScatter(QQuickItem *parent) QQuickGraphsScatter::~QQuickGraphsScatter() { - QMutexLocker locker(m_nodeMutex.data()); - const QMutexLocker locker2(mutex()); - for (auto &graphModel : m_scatterGraphs) { delete graphModel; } diff --git a/src/graphs3d/qml/qquickgraphssurface.cpp b/src/graphs3d/qml/qquickgraphssurface.cpp index 10e32149..a072b444 100644 --- a/src/graphs3d/qml/qquickgraphssurface.cpp +++ b/src/graphs3d/qml/qquickgraphssurface.cpp @@ -1,7 +1,6 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include #include "private/qquick3drepeater_p.h" #include "q3dscene.h" #include "qabstractdataproxy.h" @@ -218,8 +217,6 @@ QQuickGraphsSurface::QQuickGraphsSurface(QQuickItem *parent) QQuickGraphsSurface::~QQuickGraphsSurface() { - QMutexLocker locker(m_nodeMutex.data()); - const QMutexLocker locker2(mutex()); for (const auto &model : std::as_const(m_model)) delete model; if (m_grabresult)