diff options
| author | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2017-04-25 11:15:27 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2017-04-26 09:09:22 +0000 |
| commit | 36553f8efe9c041785b3500defbc56966af413ae (patch) | |
| tree | 0f88351ba72137a176e3f5e21ef9d0f7b6a64992 /src/plugins | |
| parent | 5d61c0882c4e4dfef1630a59c3a3f5f73b6fab2f (diff) | |
Fix warning for -no-feature-evdev
Change-Id: I95af276a6d21e67a980cce1d8c6e41900ece7f31
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfsintegration.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp index 73110dba61..8b751a72bf 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp @@ -452,9 +452,8 @@ void QEglFSIntegration::createInputHandlers() } #endif - bool useTslib = false; #if QT_CONFIG(tslib) - useTslib = qEnvironmentVariableIntValue("QT_QPA_EGLFS_TSLIB"); + bool useTslib = qEnvironmentVariableIntValue("QT_QPA_EGLFS_TSLIB"); if (useTslib) new QTsLibMouseHandler(QLatin1String("TsLib"), QString() /* spec */); #endif @@ -462,7 +461,9 @@ void QEglFSIntegration::createInputHandlers() #if QT_CONFIG(evdev) m_kbdMgr = new QEvdevKeyboardManager(QLatin1String("EvdevKeyboard"), QString() /* spec */, this); new QEvdevMouseManager(QLatin1String("EvdevMouse"), QString() /* spec */, this); +#if QT_CONFIG(tslib) if (!useTslib) +#endif new QEvdevTouchManager(QLatin1String("EvdevTouch"), QString() /* spec */, this); #endif } diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp index ce193bdf90..6f79cd96d3 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp @@ -156,9 +156,8 @@ void QLinuxFbIntegration::createInputHandlers() } #endif - bool useTslib = false; #if QT_CONFIG(tslib) - useTslib = qEnvironmentVariableIntValue("QT_QPA_FB_TSLIB"); + bool useTslib = qEnvironmentVariableIntValue("QT_QPA_FB_TSLIB"); if (useTslib) new QTsLibMouseHandler(QLatin1String("TsLib"), QString()); #endif @@ -166,7 +165,9 @@ void QLinuxFbIntegration::createInputHandlers() #if QT_CONFIG(evdev) && !defined(Q_OS_ANDROID) new QEvdevKeyboardManager(QLatin1String("EvdevKeyboard"), QString(), this); new QEvdevMouseManager(QLatin1String("EvdevMouse"), QString(), this); +#if QT_CONFIG(tslib) if (!useTslib) +#endif new QEvdevTouchManager(QLatin1String("EvdevTouch"), QString() /* spec */, this); #endif } |