1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warning for -no-feature-evdev

Browse Source 
Change-Id: I95af276a6d21e67a980cce1d8c6e41900ece7f31
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Tasuku Suzuki 2017-04-25 11:15:27 +09:00
parent 5d61c0882c
commit 36553f8efe
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
View File

@ -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
}

5
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
View File

@ -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
}