Merge pull request #11086 from highfidelity/revert-11079-disable_web_touch_emulation

Revert "Disable touch event emulation for tablet until we fix crash"
This commit is contained in:
Brad Hefta-Gaub 2017-07-29 13:11:32 -07:00 committed by GitHub
commit 3bd2464a01

View file

@ -337,19 +337,11 @@ void Web3DOverlay::setProxyWindow(QWindow* proxyWindow) {
}
void Web3DOverlay::handlePointerEvent(const PointerEvent& event) {
// FIXME touch event emulation is broken in some way. Do NOT enable this code
// unless you have done a debug build of the application and verified that
// you are not getting assertion errors on handling the touch events inside
// Qt.
#if 0
if (_inputMode == Touch) {
handlePointerEventAsTouch(event);
} else {
handlePointerEventAsMouse(event);
}
#else
handlePointerEventAsMouse(event);
#endif
}
void Web3DOverlay::handlePointerEventAsTouch(const PointerEvent& event) {