diff options
| author | David Faure <faure@kde.org> | 2011-12-19 12:50:51 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-22 18:07:34 +0100 |
| commit | eff09a2794bcb4b5373fcee85faa498b36fac27c (patch) | |
| tree | bf1f128ed6181229524ca7f06f3439b9f7cf0211 /src/gui | |
| parent | 1dc86cbe8570a9aea746700c3564beeabc7aede9 (diff) | |
Fix for -Werror -Wshadow
qevent.h:792:49: error: declaration of 'device' shadows a member of 'this' [-Werror=shadow]
Change-Id: Iccb7e79dd97d55b17fbd4dfaf3503b9e251adcfc
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qevent.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 4296078cfd..a4d287f16e 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -789,7 +789,7 @@ public: inline void setTarget(QObject *atarget) { _target = atarget; } inline void setTouchPointStates(Qt::TouchPointStates aTouchPointStates) { _touchPointStates = aTouchPointStates; } inline void setTouchPoints(const QList<QTouchEvent::TouchPoint> &atouchPoints) { _touchPoints = atouchPoints; } - inline void setDevice(QTouchDevice *device) { _device = device; } + inline void setDevice(QTouchDevice *adevice) { _device = adevice; } protected: QWindow *_window; |