diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-09 13:00:13 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-09 13:00:13 -0500 |
| commit | 30aa36ec6c2e34642e80608eaa3275fc3ff06adf (patch) | |
| tree | 93fab4b99caabfd37606915d38a065e941dd9d94 /src/kernel/qapplication_x11.cpp | |
| parent | a236ea2ad383387255621fc8eaddc3c5d17f1e30 (diff) | |
| parent | 8805afa8c607ac6028207434f78a7cd90a9df64b (diff) | |
| download | qt3-30aa36ec6c2e34642e80608eaa3275fc3ff06adf.tar.gz qt3-30aa36ec6c2e34642e80608eaa3275fc3ff06adf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
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 ef6571a..6a68604 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -4445,7 +4445,9 @@ bool QETWidget::translateXinputEvent( const XEvent *ev ) QPair<int, int> tId; XEvent xinputMotionEvent; XEvent mouseMotionEvent; +#if defined (Q_OS_IRIX) XDevice *dev; +#endif const XDeviceMotionEvent *motion = 0; XDeviceButtonEvent *button = 0; QEvent::Type t; @@ -4501,18 +4503,14 @@ bool QETWidget::translateXinputEvent( const XEvent *ev ) #else if ( ev->type == xinput_motion ) { if ( motion->deviceid == devStylus->device_id ) { - dev = devStylus; deviceType = QTabletEvent::Stylus; } else if ( motion->deviceid == devEraser->device_id ) { - dev = devEraser; deviceType = QTabletEvent::Eraser; } } else { if ( button->deviceid == devStylus->device_id ) { - dev = devStylus; deviceType = QTabletEvent::Stylus; } else if ( button->deviceid == devEraser->device_id ) { - dev = devEraser; deviceType = QTabletEvent::Eraser; } } |