diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 10:32:56 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 10:32:56 +0100 |
| commit | 96ffe48add521e29d883814a35b1130b9dfdd636 (patch) | |
| tree | d0ae779efa69ecb8c39999786af22152db902806 /src/platformsupport | |
| parent | 37217c57fa5595e7cdfd7e19f34de22848dfc370 (diff) | |
| parent | eba652a99f602386127e552740fddf5445b3d7c9 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1ce43c8a214a869c5c4ac4245bb92c88c6bc6999
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp b/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp index dbab2f6a24..b6051aaf3c 100644 --- a/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp +++ b/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp @@ -82,7 +82,7 @@ QEvdevTabletData::QEvdevTabletData(QEvdevTabletHandler *q_ptr) { memset(&minValues, 0, sizeof(minValues)); memset(&maxValues, 0, sizeof(maxValues)); - memset(&state, 0, sizeof(state)); + memset(static_cast<void *>(&state), 0, sizeof(state)); } void QEvdevTabletData::processInputEvent(input_event *ev) |