From 2b5deabbdc72f278ea112139999f6e91b8e571b7 Mon Sep 17 00:00:00 2001
From: Chethan2k1 <40890937+Chethan2k1@users.noreply.github.com>
Date: Thu, 10 Sep 2020 14:50:10 +0530
Subject: Fix breaking while using qmlRegisterSingletonInstance

---
 src/timeline/TimelineViewManager.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/timeline/TimelineViewManager.cpp')

diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index f199578f..97c119bf 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -140,8 +140,12 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<UserSettings> userSettin
           0,
           "UserProfileModel",
           "UserProfile needs to be instantiated on the C++ side");
-        qmlRegisterSingletonInstance("im.nheko", 1, 0, "TimelineManager", this);
-        qmlRegisterSingletonInstance("im.nheko", 1, 0, "Settings", settings.data());
+        qmlRegisterSingletonType<TimelineViewManager>(
+          "im.nheko", 1, 0, "TimelineManager", [this](QQmlEngine *, QJSEngine *) { return this; });
+        qmlRegisterSingletonType<UserSettings>(
+          "im.nheko", 1, 0, "Settings", [this](QQmlEngine *, QJSEngine *) {
+                  return this->settings.data();
+          });
 
         qRegisterMetaType<mtx::events::collections::TimelineEvents>();
         qRegisterMetaType<std::vector<DeviceInfo>>();
-- 
cgit 1.5.1