diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-04 15:27:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-04 15:27:15 +0200 |
| commit | 96a20440093aff70e78d01d6f014630bda5b0713 (patch) | |
| tree | b9e6b6da88b8a0b909d3fa51ac0d191c61efc2ce /src/platformsupport | |
| parent | 3598ffcc26dbae14d88c32fabfc8be465eed8f61 (diff) | |
| parent | a3790681a58ff0ff5f3a7dd53c473013a792e949 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
src/network/access/qnetworkreplyhttpimpl.cpp
Change-Id: I059be651604623616fd31e8616be8ae61b4f8883
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/input/tslib/qtslib.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/platformsupport/input/tslib/qtslib.cpp b/src/platformsupport/input/tslib/qtslib.cpp index df57147af6..e105f5ea98 100644 --- a/src/platformsupport/input/tslib/qtslib.cpp +++ b/src/platformsupport/input/tslib/qtslib.cpp @@ -68,7 +68,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, return; } +#ifdef TSLIB_VERSION_EVENTPATH /* also introduced in 1.15 */ qCDebug(qLcTsLib) << "tslib device is" << ts_get_eventpath(m_dev); +#endif m_notify = new QSocketNotifier(ts_fd(m_dev), QSocketNotifier::Read, this); connect(m_notify, &QSocketNotifier::activated, this, &QTsLibMouseHandler::readMouseData); } |