diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:03:59 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:03:59 +0200 |
| commit | e95ef6fdb6401325e5aecd2806788a5dc33a0b47 (patch) | |
| tree | d02ddeae7cba7c9ec571418c6c928ce8bfe6e50e | |
| parent | 57e3001aabe4147317f9935c87d55c566980e49a (diff) | |
| parent | e14f45692d5a0ffc15bfd3b85e4fd31d7e578d31 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I625d71174c9a396827d60f4f93530a93ade93868
| -rw-r--r-- | src/plugins/platforms/webgl/qwebglwebsocketserver.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/webgl/webqt.jsx | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/platforms/webgl/qwebglwebsocketserver.cpp b/src/plugins/platforms/webgl/qwebglwebsocketserver.cpp index 1c1e6a1..dfeaa58 100644 --- a/src/plugins/platforms/webgl/qwebglwebsocketserver.cpp +++ b/src/plugins/platforms/webgl/qwebglwebsocketserver.cpp @@ -275,6 +275,7 @@ void QWebGLWebSocketServer::onNewConnection() #endif }, { QStringLiteral("loadingScreen"), qgetenv("QT_WEBGL_LOADINGSCREEN") }, + { QStringLiteral("mouseTracking"), qgetenv("QT_WEBGL_MOUSETRACKING") }, { QStringLiteral("supportedFunctions"), QVariant::fromValue(QWebGLContext::supportedFunctions()) }, { "sysinfo", @@ -287,7 +288,7 @@ void QWebGLWebSocketServer::onNewConnection() { QStringLiteral("machineHostName"), QSysInfo::machineHostName() }, { QStringLiteral("prettyProductName"), QSysInfo::prettyProductName() }, { QStringLiteral("productType"), QSysInfo::productType() }, - { QStringLiteral("productVersion"), QSysInfo::productVersion() } + { QStringLiteral("productVersion"), QSysInfo::productVersion() }, } } }; diff --git a/src/plugins/platforms/webgl/webqt.jsx b/src/plugins/platforms/webgl/webqt.jsx index a7de04d..78d56d3 100644 --- a/src/plugins/platforms/webgl/webqt.jsx +++ b/src/plugins/platforms/webgl/webqt.jsx @@ -34,6 +34,7 @@ function physicalSizeRatio() { window.onload = function () { var DEBUG = 0; + var MOUSETRACKING = 0; var LOADINGSCREEN = 1; var canvas; var socket = new WebSocket("ws://" + host + ":" + port); @@ -234,8 +235,9 @@ window.onload = function () { }; canvas.onmousemove = function (event) { - sendMouseEvent(qtButtons, event.layerX, event.layerY, event.clientX, event.clientY, - name); + if (MOUSETRACKING || event.buttons > 0) + sendMouseEvent(qtButtons, event.layerX, event.layerY, event.clientX, event.clientY, + name); }; canvas.onmouseup = function (event) { @@ -1126,6 +1128,8 @@ window.onload = function () { var sysinfo = obj.sysinfo; if (obj.debug) DEBUG = 1; + if (obj.mouseTracking) + MOUSETRACKING = 1; if (obj.loadingScreen === "0") LOADINGSCREEN = 0; console.log(sysinfo); |