diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-24 14:47:20 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-02-24 14:47:20 +0000 |
| commit | b736151c2bb6c68f700d38274d740a6e0cf59a49 (patch) | |
| tree | 83e110a7205757addba6e86a3c2367e4b52afa05 /src/plugins/platforms/windows/qwindowstabletsupport.cpp | |
| parent | ff76300a5c9f209f625384f35ad0fdb0acebd799 (diff) | |
| parent | 1fadc7292b66d4b3984bf5ef36c70b46b07a1c6b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/plugins/platforms/windows/qwindowstabletsupport.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowstabletsupport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/src/plugins/platforms/windows/qwindowstabletsupport.cpp index 165154345d..8db6895999 100644 --- a/src/plugins/platforms/windows/qwindowstabletsupport.cpp +++ b/src/plugins/platforms/windows/qwindowstabletsupport.cpp @@ -322,7 +322,7 @@ QDebug operator<<(QDebug d, const QWindowsTabletDeviceData &t) } #endif // !QT_NO_DEBUG_STREAM -QWindowsTabletDeviceData QWindowsTabletSupport::tabletInit(const quint64 uniqueId, const UINT cursorType) const +QWindowsTabletDeviceData QWindowsTabletSupport::tabletInit(qint64 uniqueId, UINT cursorType) const { QWindowsTabletDeviceData result; result.uniqueId = uniqueId; |