diff --git a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml index fe636dafa5..76d170cba8 100644 --- a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml +++ b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml @@ -49,7 +49,10 @@ Item { } function pushSource(path) { - d.push(Qt.resolvedUrl("../../" + path)); + // Workaround issue https://bugreports.qt.io/browse/QTBUG-75516 in Qt 5.12.3 + // by creating the manually, instead of letting StackView do it for us. + var item = Qt.createComponent(Qt.resolvedUrl("../../" + path)); + d.push(item); if (d.currentItem.sendToScript !== undefined) { d.currentItem.sendToScript.connect(tabletMenu.sendToScript); } diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 75bea66eeb..6d8e2a31af 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5171,11 +5171,13 @@ ivec2 Application::getMouse() const { } FaceTracker* Application::getActiveFaceTracker() { +#ifdef HAVE_DDE auto dde = DependencyManager::get(); if (dde && dde->isActive()) { return static_cast(dde.data()); } +#endif return nullptr; } @@ -7218,7 +7220,7 @@ void Application::nodeKilled(SharedNodePointer node) { _octreeProcessor.nodeKilled(node); _entityEditSender.nodeKilled(node); - + if (node->getType() == NodeType::AudioMixer) { QMetaObject::invokeMethod(DependencyManager::get().data(), "audioMixerKilled"); } else if (node->getType() == NodeType::EntityServer) {