From f1d5df59263daeb3b0e08817ecf4f89e4dd09dd4 Mon Sep 17 00:00:00 2001 From: vladest Date: Thu, 12 Oct 2017 18:26:50 +0200 Subject: [PATCH] Restore lost-in-merge context property --- interface/src/ui/overlays/Web3DOverlay.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp index 2d154f30a2..363c85b395 100644 --- a/interface/src/ui/overlays/Web3DOverlay.cpp +++ b/interface/src/ui/overlays/Web3DOverlay.cpp @@ -247,6 +247,9 @@ void Web3DOverlay::setupQmlSurface() { _webSurface->getSurfaceContext()->setContextProperty("pathToFonts", "../../"); + // Tablet inteference with Tablet.qml. Need to avoid this in QML space + _webSurface->getSurfaceContext()->setContextProperty("tabletInterface", DependencyManager::get().data()); + tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", _webSurface.data()); // mark the TabletProxy object as cpp ownership. QObject* tablet = tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system");