Merge pull request #4591 from Holzhaus/qml-library-model-type-fix

QML: Don't use parented_ptr for model in QmlLibraryProxy
mixxxdj · Jan 3, 2022 · c65c54a · c65c54a
2 parents 6680a31 + e68a4d6
commit c65c54a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/qml/qmllibraryproxy.cpp b/src/qml/qmllibraryproxy.cpp
@@ -10,7 +10,7 @@ namespace qml {
 QmlLibraryProxy::QmlLibraryProxy(std::shared_ptr<Library> pLibrary, QObject* parent)
         : QObject(parent),
           m_pLibrary(pLibrary),
-          m_pModel(make_parented<QmlLibraryTrackListModel>(m_pLibrary->trackTableModel(), this)) {
+          m_pModelProperty(new QmlLibraryTrackListModel(m_pLibrary->trackTableModel(), this)) {
 }
 
 } // namespace qml

diff --git a/src/qml/qmllibraryproxy.h b/src/qml/qmllibraryproxy.h
@@ -14,14 +14,16 @@ class QmlLibraryTrackListModel;
 
 class QmlLibraryProxy : public QObject {
     Q_OBJECT
-    Q_PROPERTY(mixxx::qml::QmlLibraryTrackListModel* model MEMBER m_pModel CONSTANT)
+    Q_PROPERTY(mixxx::qml::QmlLibraryTrackListModel* model MEMBER m_pModelProperty CONSTANT)
 
   public:
     explicit QmlLibraryProxy(std::shared_ptr<Library> pLibrary, QObject* parent = nullptr);
 
   private:
     std::shared_ptr<Library> m_pLibrary;
-    parented_ptr<QmlLibraryTrackListModel> m_pModel;
+
+    /// This needs to be a plain pointer because it's used as a `Q_PROPERTY` member variable.
+    QmlLibraryTrackListModel* m_pModelProperty;
 };
 
 } // namespace qml