diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2015-01-13 16:27:41 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-01-15 15:34:12 +0100 |
| commit | 31f87f39b6cedd0a99f26161e88782d26f9ad8de (patch) | |
| tree | 28029c22bc8cf8941fd17830eaa346c52df9223a /src/plugins | |
| parent | 7eafe74804d94ec59df71539ea8791aa560a8e6b (diff) | |
Avoid warning about QString from char in xcb
Change-Id: I013f0caa8aba7fef07c7dbe90ed01dfb85347223
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp index 90d323ed34..07303f4e22 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp @@ -420,7 +420,7 @@ XInput2TouchDeviceData *QXcbConnection::touchDeviceForId(int id) } if (type >= QTouchDevice::TouchScreen && type <= QTouchDevice::TouchPad) { dev->qtTouchDevice = new QTouchDevice; - dev->qtTouchDevice->setName(dev->xiDeviceInfo->name); + dev->qtTouchDevice->setName(QString::fromUtf8(dev->xiDeviceInfo->name)); dev->qtTouchDevice->setType((QTouchDevice::DeviceType)type); dev->qtTouchDevice->setCapabilities(caps); dev->qtTouchDevice->setMaximumTouchPoints(maxTouchPoints); |