diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-03 14:29:41 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-03 14:30:21 +0100 |
| commit | b5ab7ee0d78a30863e3d11bd2ba10ba5f4854bf5 (patch) | |
| tree | d4ab3471f9f92e153fe320e0435a5740c794746b /src/platformsupport/input/evdevtouch/qevdevtouch_p.h | |
| parent | ad9554a7f2d4b8a2af3efabc7bc69b9a0ae3751d (diff) | |
| parent | aff3e3c4a20aae52fdafaede8dfcbde2bc990104 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id13badc270db98806048753fd7fb658aa17f1ede
Diffstat (limited to 'src/platformsupport/input/evdevtouch/qevdevtouch_p.h')
| -rw-r--r-- | src/platformsupport/input/evdevtouch/qevdevtouch_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouch_p.h b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h index be7dbfba14..dbd401c297 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouch_p.h +++ b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QSocketNotifier; class QEvdevTouchScreenData; -#ifdef USE_MTDEV +#if !defined(QT_NO_MTDEV) struct mtdev; #endif @@ -71,7 +71,7 @@ private: QSocketNotifier *m_notify; int m_fd; QEvdevTouchScreenData *d; -#ifdef USE_MTDEV +#if !defined(QT_NO_MTDEV) mtdev *m_mtdev; #endif }; |