diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-05-13 13:20:23 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-05-27 11:50:39 +0000 |
| commit | 3311d92d8ed46426e19000d1e3b94029b9058983 (patch) | |
| tree | 5437425f3897171fc1454a4abfaa0559f20d03ec /src/gui/kernel | |
| parent | d2da14a9e05381eb3dd70071001dce72b2a465f3 (diff) | |
Fix failing input device notifications on embedded
The connection to the deviceListChanged() signal may be queued. To make it
work our custom types have to be registered.
The problem is only visible with input backends like evdevtouch that live
on their own thread.
Task-number: QTBUG-46069
Change-Id: I4c03e8031e4337b5e711a3bd2cf405d15d6ce214
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qinputdevicemanager.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qinputdevicemanager_p.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qinputdevicemanager.cpp b/src/gui/kernel/qinputdevicemanager.cpp index d0dd8a4e7c..dbdb03adbb 100644 --- a/src/gui/kernel/qinputdevicemanager.cpp +++ b/src/gui/kernel/qinputdevicemanager.cpp @@ -58,6 +58,7 @@ QT_BEGIN_NAMESPACE QInputDeviceManager::QInputDeviceManager(QObject *parent) : QObject(*new QInputDeviceManagerPrivate, parent) { + qRegisterMetaType<DeviceType>(); } int QInputDeviceManager::deviceCount(DeviceType type) const diff --git a/src/gui/kernel/qinputdevicemanager_p.h b/src/gui/kernel/qinputdevicemanager_p.h index 15c84d1a82..d64793c23c 100644 --- a/src/gui/kernel/qinputdevicemanager_p.h +++ b/src/gui/kernel/qinputdevicemanager_p.h @@ -77,4 +77,6 @@ signals: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QInputDeviceManager::DeviceType) + #endif // QINPUTDEVICEMANAGER_P_H |