diff options
| author | Darrell Anderson <[email protected]> | 2012-08-09 13:00:30 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-09 13:00:30 -0500 |
| commit | 34ddcfd05b2b4772eeb70493726e0f8c8b40a3af (patch) | |
| tree | 8b1d100ee7f3ff0a997338b2e0424392121c09fa /src/kernel/qapplication_x11.cpp | |
| parent | 785106b36c47923c338b6d3d61584eea448863ca (diff) | |
| parent | b6053b1b40b51e3d9b1b679a8a1751e5472e06e2 (diff) | |
| download | tqt3-34ddcfd05b2b4772eeb70493726e0f8c8b40a3af.tar.gz tqt3-34ddcfd05b2b4772eeb70493726e0f8c8b40a3af.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qapplication_x11.cpp')
| -rw-r--r-- | src/kernel/qapplication_x11.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 03e7a7794..aba4fcd50 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -4445,7 +4445,9 @@ bool TQETWidget::translateXinputEvent( const XEvent *ev ) TQPair<int, int> tId; XEvent xinputMotionEvent; XEvent mouseMotionEvent; +#if defined (Q_OS_IRIX) XDevice *dev; +#endif const XDeviceMotionEvent *motion = 0; XDeviceButtonEvent *button = 0; TQEvent::Type t; @@ -4501,18 +4503,14 @@ bool TQETWidget::translateXinputEvent( const XEvent *ev ) #else if ( ev->type == xinput_motion ) { if ( motion->deviceid == devStylus->device_id ) { - dev = devStylus; deviceType = TQTabletEvent::Stylus; } else if ( motion->deviceid == devEraser->device_id ) { - dev = devEraser; deviceType = TQTabletEvent::Eraser; } } else { if ( button->deviceid == devStylus->device_id ) { - dev = devStylus; deviceType = TQTabletEvent::Stylus; } else if ( button->deviceid == devEraser->device_id ) { - dev = devEraser; deviceType = TQTabletEvent::Eraser; } } |