diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-05-22 13:00:38 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-05-25 10:09:56 +0000 |
| commit | 295b2dde7f0b9e28e7d450dc8b028c7b1900e419 (patch) | |
| tree | 97c9b31beb903564293338b2c5877d57d610110d | |
| parent | 4524cb8c98b1efe650915788f6f58cf9f35591a1 (diff) | |
VNC plugin: explicitly cast int to uint16_t before calling htons
Otherwise there is a -Werror=narrowing error on big-endian
architectures (where htons does nothing).
Task-number: QTBUG-68390
Change-Id: Idb204a81aaedb9f4fde1d5fae406da36c7a1953e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit b206d1c8082a9e01ad3755d311a4cf683ec35161)
| -rw-r--r-- | src/plugins/platforms/vnc/qvnc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/vnc/qvnc.cpp b/src/plugins/platforms/vnc/qvnc.cpp index fa65e8c9a4..79cdef6f52 100644 --- a/src/plugins/platforms/vnc/qvnc.cpp +++ b/src/plugins/platforms/vnc/qvnc.cpp @@ -551,9 +551,9 @@ void QVncClientCursor::write(QVncClient *client) const { const quint16 tmp[6] = { htons(0), htons(1), - htons(hotspot.x()), htons(hotspot.y()), - htons(cursor.width()), - htons(cursor.height()) }; + htons(uint16_t(hotspot.x())), htons(uint16_t(hotspot.y())), + htons(uint16_t(cursor.width())), + htons(uint16_t(cursor.height())) }; socket->write((char*)tmp, sizeof(tmp)); const qint32 encoding = qToBigEndian(-239); |