diff --git a/libraries/script-engine/src/TabletScriptingInterface.cpp b/libraries/script-engine/src/TabletScriptingInterface.cpp index 7747e1b6dc..fcf41d0335 100644 --- a/libraries/script-engine/src/TabletScriptingInterface.cpp +++ b/libraries/script-engine/src/TabletScriptingInterface.cpp @@ -49,13 +49,14 @@ QObject* TabletScriptingInterface::getTablet(const QString& tabletId) { auto iter = _tabletProxies.find(tabletId); if (iter != _tabletProxies.end()) { // tablet already exists, just return it. - return iter->second.data(); + return iter->second; } else { // allocate a new tablet, add it to the map then return it. - auto tabletProxy = QSharedPointer(new TabletProxy(tabletId)); + auto tabletProxy = new TabletProxy(tabletId); + tabletProxy->setParent(this); _tabletProxies[tabletId] = tabletProxy; tabletProxy->setToolbarMode(_toolbarMode); - return tabletProxy.data(); + return tabletProxy; } } @@ -176,7 +177,6 @@ class TabletRootWindow : public QmlWindowClass { }; TabletProxy::TabletProxy(QString name) : _name(name) { - } void TabletProxy::setToolbarMode(bool toolbarMode) { diff --git a/libraries/script-engine/src/TabletScriptingInterface.h b/libraries/script-engine/src/TabletScriptingInterface.h index 195db02789..5029919c22 100644 --- a/libraries/script-engine/src/TabletScriptingInterface.h +++ b/libraries/script-engine/src/TabletScriptingInterface.h @@ -70,7 +70,7 @@ private: protected: std::mutex _mutex; - std::map> _tabletProxies; + std::map _tabletProxies; QObject* _toolbarScriptingInterface { nullptr }; bool _toolbarMode { false }; };