Merge lp:~mzanetti/ubuntu/vivid/qtsystems-opensource-src/inputinfo into lp:ubuntu/vivid-proposed/qtsystems-opensource-src

[Michael Zanetti]

Qt input info for mouse & keyboard detection

[Dmitry Shachnev (mitya57)]

I think we are going to move to a new upstream snapshot (it was requested by seb128 and kenvandine), I have already committed that to lp:~kubuntu-packagers/kubuntu-packaging/qtsystems-opensource-src.

Also, we can't remove qstorageinfo right now because it was added to qtbase only in 5.4 which we don't have yet (and ubuntu-system-settings uses that class).

review: Abstain

[Michael Zanetti (mzanetti)]

Yeah, this is not meant to land right now... We just need it for some demo work. The input info api is not final yet and should not end up in the archive yet.

[lp:~mzanetti/ubuntu/vivid/qtsystems-opensource-src/inputinfo]

10. By Timo Jyrinki on 2015-02-13

[ Timo Jyrinki ]
* Rebuild against Qt 5.4.0

[ Dmitry Shachnev ]
* New upstream snapshot.
* Drop all patches that have been applied upstream.
* Update install files.

11. By Michael Zanetti on 2015-02-17

applyinputinfo patch

12. By Michael Zanetti on 2015-02-17

fix pkgconfig

13. By Michael Zanetti on 2015-02-17

fix PKGCONFIG

14. By Michael Zanetti on 2015-02-17

next try

15. By Michael Zanetti on 2015-02-17

add pkg-config to deps

16. By Michael Zanetti on 2015-02-17

disable tests

17. By Michael Zanetti on 2015-02-17

add installs

18. By Michael Zanetti on 2015-02-18

make type a flag

Unmerged revisions

18. By Michael Zanetti on 2015-02-18

make type a flag

17. By Michael Zanetti on 2015-02-17

add installs

16. By Michael Zanetti on 2015-02-17

disable tests

15. By Michael Zanetti on 2015-02-17

add pkg-config to deps

14. By Michael Zanetti on 2015-02-17

next try

13. By Michael Zanetti on 2015-02-17

fix PKGCONFIG

12. By Michael Zanetti on 2015-02-17

fix pkgconfig

11. By Michael Zanetti on 2015-02-17

applyinputinfo patch

=== modified file 'debian/control'
--- debian/control	2015-02-13 06:45:19 +0000
+++ debian/control	2015-02-18 17:03:28 +0000
@@ -3,7 +3,10 @@
 Priority: optional
 Maintainer: Timo Jyrinki <[e-mail]>
 Build-Depends: debhelper (>= 9),
+               libevdev-dev,
                libqt5sql5-sqlite (>= 5.4.0~),
+               libudev-dev,
+               pkg-config,
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.4.0~),
                qtdeclarative5-private-dev (>= 5.4.0~),

=== added file 'debian/patches/inputinfo.patch'
--- debian/patches/inputinfo.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/inputinfo.patch	2015-02-18 17:03:28 +0000
@@ -0,0 +1,1487 @@
+=== added directory 'examples/systeminfo/inputinfo'
+=== added file 'examples/systeminfo/inputinfo/inputinfo.pro'
+--- old/examples/systeminfo/inputinfo/inputinfo.pro	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/inputinfo/inputinfo.pro	2015-02-18 12:13:36 +0000
+@@ -0,0 +1,22 @@
++#-------------------------------------------------
++#
++# Project created by QtCreator 2014-11-28T12:25:04
++#
++#-------------------------------------------------
++
++QT       += core systeminfo
++
++QT       -= gui
++
++TARGET = inputinfo
++CONFIG   += console
++CONFIG   -= app_bundle
++
++TEMPLATE = app
++
++
++SOURCES += main.cpp \
++    inputtest.cpp
++
++HEADERS += \
++    inputtest.h
+
+=== added file 'examples/systeminfo/inputinfo/inputtest.cpp'
+--- old/examples/systeminfo/inputinfo/inputtest.cpp	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/inputinfo/inputtest.cpp	2015-02-18 16:30:59 +0000
+@@ -0,0 +1,83 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "inputtest.h"
++#include <qinputinfo.h>
++#include <QDebug>
++
++Inputtest::Inputtest(QObject *parent) :
++    QObject(parent)
++{
++    inputDeviceInfo = new QInputDeviceInfo(this);
++    connect(inputDeviceInfo, &QInputDeviceInfo::deviceAdded,this,&Inputtest::deviceAdded);
++    connect(inputDeviceInfo, &QInputDeviceInfo::deviceRemoved,this,&Inputtest::deviceRemoved);
++
++}
++
++void Inputtest::deviceAdded(const QString &devicePath)
++{
++    QInputDevice *device = inputDeviceInfo->deviceMap().value(devicePath);
++
++    qDebug() <<  inputDeviceInfo->deviceMap().count();
++    qDebug() << device->name() << device->devicePath();
++    qDebug() << "buttons count"<< device->buttons().count();
++    qDebug() << "switch count"<< device->switches().count();
++    qDebug() << "relativeAxis count"<< device->relativeAxis().count();
++    qDebug() << "absoluteAxis count"<< device->absoluteAxis().count();
++    qDebug() << "types" << device->types();
++    qDebug();
++
++    QMapIterator<QString, QInputDevice*> i(inputDeviceInfo->deviceMap());
++    while (i.hasNext()) {
++        i.next();
++       qDebug() << i.value()->name();
++    }
++}
++
++void Inputtest::deviceRemoved(const QString &path)
++{
++    qDebug() << Q_FUNC_INFO << path;
++    QMapIterator<QString, QInputDevice*> i(inputDeviceInfo->deviceMap());
++    while (i.hasNext()) {
++        i.next();
++       qDebug() << i.value()->name();
++    }
++}
+
+=== added file 'examples/systeminfo/inputinfo/inputtest.h'
+--- old/examples/systeminfo/inputinfo/inputtest.h	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/inputinfo/inputtest.h	2015-02-18 12:13:36 +0000
+@@ -0,0 +1,63 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef INPUTTEST_H
++#define INPUTTEST_H
++
++#include <QObject>
++#include <qinputinfo.h>
++
++class Inputtest : public QObject
++{
++    Q_OBJECT
++public:
++    explicit Inputtest(QObject *parent = 0);
++
++    QInputDeviceInfo *inputDeviceInfo;
++signals:
++
++public slots:
++
++ void deviceAdded(const QString &);
++ void deviceRemoved(const QString &path);
++};
++
++#endif // INPUTTEST_H
+
+=== added file 'examples/systeminfo/inputinfo/main.cpp'
+--- old/examples/systeminfo/inputinfo/main.cpp	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/inputinfo/main.cpp	2015-02-18 12:13:36 +0000
+@@ -0,0 +1,50 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++#include <QCoreApplication>
++#include "inputtest.h"
++
++int main(int argc, char *argv[])
++{
++    QCoreApplication a(argc, argv);
++
++    Inputtest inputest(&a);
++    return a.exec();
++}
+
+=== added directory 'examples/systeminfo/qml-inputinfo'
+=== added file 'examples/systeminfo/qml-inputinfo/main.cpp'
+--- old/examples/systeminfo/qml-inputinfo/main.cpp	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/qml-inputinfo/main.cpp	2015-02-18 12:13:36 +0000
+@@ -0,0 +1,43 @@
++/****************************************************************************
++**
++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include"../stub.h"
++SYSINFO_EXAMPLE_MAIN(qml-inputinfo)
+
+=== added file 'examples/systeminfo/qml-inputinfo/qml-inputinfo.pro'
+--- old/examples/systeminfo/qml-inputinfo/qml-inputinfo.pro	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/qml-inputinfo/qml-inputinfo.pro	2015-02-18 12:13:36 +0000
+@@ -0,0 +1,14 @@
++TEMPLATE = app
++TARGET = qml-inputinfo
++QT += quick
++SOURCES = main.cpp
++
++app.files = \
++    $$files(*.qml) \
++
++target.path = $$[QT_INSTALL_EXAMPLES]/sysinfo/qml-inputinfo
++app.path = $$[QT_INSTALL_EXAMPLES]/sysinfo/qml-inputinfo
++INSTALLS += target app
++
++RESOURCES += \
++    qml-inputinfo.qrc
+
+=== added file 'examples/systeminfo/qml-inputinfo/qml-inputinfo.qml'
+--- old/examples/systeminfo/qml-inputinfo/qml-inputinfo.qml	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/qml-inputinfo/qml-inputinfo.qml	2015-02-18 12:13:36 +0000
+@@ -0,0 +1,97 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++import QtQuick 2.0
++import QtSystemInfo 5.0
++
++Rectangle {
++    width: 640
++    height: 480
++
++    ListView {
++        anchors.fill: parent
++     id: inputModel
++     model: systemInputs
++     delegate: deviceDelegate
++    }
++
++    Component {
++        id: deviceDelegate
++        Row {
++            spacing: 10
++            Text { text: systemInputs.get(index).name}
++            Text { text: typeToString(systemInputs.get(index).type)}
++        }
++    }
++
++    InputDeviceInfo {
++        id: systemInputs
++    }
++
++    function typeToString(deviceType) {
++        console.log(deviceType +" "+systemInputs.Keyboard)
++
++        switch (deviceType) {
++        case 0:
++            return "Unknown"
++            break;
++        case 1:
++            return "Button"
++            break;
++        case 2:
++            return "Mouse"
++            break;
++        case 3:
++            return "TouchPad"
++            break;
++        case 4:
++            return "TouchScreen"
++            break;
++        case 5:
++            return "Keyboard"
++            break;
++        case 6:
++            return "Switch"
++            break;
++        }
++        return ""
++    }
++
++}
+
+=== added file 'examples/systeminfo/qml-inputinfo/qml-inputinfo.qrc'
+--- old/examples/systeminfo/qml-inputinfo/qml-inputinfo.qrc	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/qml-inputinfo/qml-inputinfo.qrc	2015-02-18 12:13:36 +0000
+@@ -0,0 +1,5 @@
++<RCC>
++    <qresource prefix="/">
++        <file>qml-inputinfo.qml</file>
++    </qresource>
++</RCC>
+
+=== modified file 'examples/systeminfo/systeminfo.pro'
+--- old/examples/systeminfo/systeminfo.pro	2015-02-13 06:45:19 +0000
++++ new/examples/systeminfo/systeminfo.pro	2015-02-18 12:13:36 +0000
+@@ -2,7 +2,9 @@
+ 
+ SUBDIRS += \
+     qml-deviceinfo \
+-    qml-battery
++    qml-battery \
++    qml-inputinfo\
++    inputinfo
+ 
+ #qtHaveModule(widgets): SUBDIRS += \
+ 
+
+=== modified file 'src/imports/systeminfo/plugins.qmltypes'
+--- old/src/imports/systeminfo/plugins.qmltypes	2015-02-13 06:45:19 +0000
++++ new/src/imports/systeminfo/plugins.qmltypes	2015-02-18 12:13:36 +0000
+@@ -378,6 +378,43 @@
+         }
+     }
+     Component {
++        name: "QInputDevice"
++        prototype: "QObject"
++        exports: ["QtSystemInfo/InputInfo 5.0"]
++        exportMetaObjectRevisions: [0]
++        Enum {
++            name: "InputType"
++            values: {
++                "Unknown": 0,
++                "Button": 1,
++                "Mouse": 2,
++                "TouchPad": 3,
++                "TouchScreen": 4,
++                "Keyboard": 5,
++                "Switch": 6
++            }
++        }
++        Property { name: "name"; type: "string"; isReadonly: true }
++        Property { name: "devicePath"; type: "string"; isReadonly: true }
++        Property { name: "buttons"; type: "QList<int>"; isReadonly: true }
++        Property { name: "switches"; type: "QList<int>"; isReadonly: true }
++        Property { name: "relativeAxis"; type: "QList<int>"; isReadonly: true }
++        Property { name: "absoluteAxis"; type: "QList<int>"; isReadonly: true }
++        Property { name: "type"; type: "QInputDevice::InputType"; isReadonly: true }
++    }
++    Component {
++        name: "QInputDeviceInfo"
++        prototype: "QObject"
++        exports: ["QtSystemInfo/InputDeviceInfo 5.0"]
++        exportMetaObjectRevisions: [0]
++        Property { name: "deviceCount"; type: "int"; isReadonly: true }
++        Signal { name: "deviceAdded" }
++        Signal { name: "deviceRemoved" }
++        Signal { name: "ready" }
++        Method { name: "addedDevice" }
++        Method { name: "deviceList"; type: "QList<QInputDevice*>" }
++    }
++    Component {
+         name: "QScreenSaver"
+         prototype: "QObject"
+         exports: ["QtSystemInfo/ScreenSaver 5.0"]
+
+=== added file 'src/imports/systeminfo/qdeclarativeinputdeviceinfo.cpp'
+--- old/src/imports/systeminfo/qdeclarativeinputdeviceinfo.cpp	1970-01-01 00:00:00 +0000
++++ new/src/imports/systeminfo/qdeclarativeinputdeviceinfo.cpp	2015-02-18 12:13:36 +0000
+@@ -0,0 +1,143 @@
++/****************************************************************************
++**
++** Copyright (C) 2015 Jolla.
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++#include "qdeclarativeinputdeviceinfo_p.h"
++
++QDeclarativeInputDeviceInfo::QDeclarativeInputDeviceInfo(QObject *parent) :
++    QAbstractListModel(parent),
++    deviceInfo(new QInputDeviceInfo)
++{
++    connect(deviceInfo,SIGNAL(ready()),this,SLOT(updateDeviceList()));
++    connect(deviceInfo, &QInputDeviceInfo::deviceAdded,this,&QDeclarativeInputDeviceInfo::addedDevice);
++    connect(deviceInfo, &QInputDeviceInfo::deviceRemoved,this,&QDeclarativeInputDeviceInfo::removedDevice);
++}
++
++QDeclarativeInputDeviceInfo::~QDeclarativeInputDeviceInfo()
++{
++    delete deviceInfo;
++}
++
++QVariant QDeclarativeInputDeviceInfo::data(const QModelIndex &index, int role) const
++{
++    switch (role) {
++    case ServiceRole:
++        return QVariant::fromValue(static_cast<QObject *>(inputDevices.value(index.row())));
++    }
++
++    return QVariant();
++}
++
++int QDeclarativeInputDeviceInfo::rowCount(const QModelIndex &parent) const
++{
++    Q_UNUSED(parent);
++
++    return inputDevices.count();
++}
++
++int QDeclarativeInputDeviceInfo::indexOf(const QString &devicePath) const
++{
++    int idx(-1);
++    Q_FOREACH (QInputDevice *device, inputDevices) {
++        idx++;
++        if (device->devicePath() == devicePath) return idx;
++    }
++
++    return -1;
++}
++
++QInputDevice *QDeclarativeInputDeviceInfo::get(int index) const
++{
++    if (index < 0 || index > inputDevices.count())
++        return 0;
++    return inputDevices.value(index);
++}
++
++void QDeclarativeInputDeviceInfo::updateDeviceList()
++{
++   QVector <QInputDevice *> newDevices = deviceInfo->deviceList();
++
++    int numNew = newDevices.count();
++
++    for (int i = 0; i < numNew; i++) {
++        int j = inputDevices.indexOf(newDevices.value(i));
++        if (j == -1) {
++            // not found -> remove from list
++            beginInsertRows(QModelIndex(), i, i);
++            inputDevices.insert(i, newDevices.value(i));
++            endInsertRows();
++        } else if (i != j) {
++            // changed its position -> move it
++            QInputDevice* device = inputDevices.value(j);
++            beginMoveRows(QModelIndex(), j, j, QModelIndex(), i);
++            inputDevices.remove(j);
++            inputDevices.insert(i, device);
++            endMoveRows();
++        } else {
++            QModelIndex changedIndex(this->index(j, 0, QModelIndex()));
++            Q_EMIT dataChanged(changedIndex, changedIndex);
++        }
++    }
++
++    int numOld = inputDevices.count();
++    if (numOld > numNew) {
++        beginRemoveRows(QModelIndex(), numNew, numOld - 1);
++        inputDevices.remove(numNew, numOld - numNew);
++        endRemoveRows();
++    }
++}
++
++void QDeclarativeInputDeviceInfo::addedDevice(const QString &devicePath)
++{
++    updateDeviceList();
++    Q_EMIT newDevice(devicePath);
++}
++
++void QDeclarativeInputDeviceInfo::removedDevice(const QString &devicePath)
++{
++    updateDeviceList();
++    Q_EMIT deviceRemoved(devicePath);
++}
++
++QHash<int, QByteArray> QDeclarativeInputDeviceInfo::roleNames() const
++{
++    QHash<int, QByteArray> roles;
++    roles.insert(ServiceRole, "service");
++    return roles;
++}
+
+=== added file 'src/imports/systeminfo/qdeclarativeinputdeviceinfo_p.h'
+--- old/src/imports/systeminfo/qdeclarativeinputdeviceinfo_p.h	1970-01-01 00:00:00 +0000
++++ new/src/imports/systeminfo/qdeclarativeinputdeviceinfo_p.h	2015-02-18 12:13:36 +0000
+@@ -0,0 +1,86 @@
++/****************************************************************************
++**
++** Copyright (C) 2015 Jolla.
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef QDECLARATIVEINPUTDEVICEINFO_H
++#define QDECLARATIVEINPUTDEVICEINFO_H
++
++#include <QObject>
++#include <QAbstractListModel>
++#include "qinputinfo.h"
++
++class QDeclarativeInputDeviceInfo : public QAbstractListModel
++{
++    Q_OBJECT
++    Q_DISABLE_COPY(QDeclarativeInputDeviceInfo)
++
++public:
++    enum ItemRoles {
++        ServiceRole = Qt::UserRole + 1
++    };
++
++    explicit QDeclarativeInputDeviceInfo(QObject *parent = 0);
++    virtual ~QDeclarativeInputDeviceInfo();
++
++    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
++    int rowCount(const QModelIndex &parent = QModelIndex()) const;
++
++    QHash<int, QByteArray> roleNames() const;
++
++    Q_INVOKABLE int indexOf(const QString &devicePath) const;
++
++    Q_INVOKABLE QInputDevice *get(int index) const;
++
++signals:
++    void newDevice(const QString &devicePath);
++    void deviceRemoved(const QString &devicePath);
++
++public slots:
++    void updateDeviceList();
++private:
++    QInputDeviceInfo *deviceInfo;
++    QVector<QInputDevice *> inputDevices;
++private slots:
++    void addedDevice(const QString &);
++    void removedDevice(const QString &path);
++
++};
++
++#endif // QDECLARATIVEINPUTDEVICEINFO_H
+
+=== modified file 'src/imports/systeminfo/qsysteminfo.cpp'
+--- old/src/imports/systeminfo/qsysteminfo.cpp	2015-02-13 06:45:19 +0000
++++ new/src/imports/systeminfo/qsysteminfo.cpp	2015-02-18 12:13:36 +0000
+@@ -45,7 +45,10 @@
+ #include "qbatteryinfo.h"
+ #include "qdeclarativedeviceinfo_p.h"
+ #include "qdeclarativenetworkinfo_p.h"
++#include "qdeclarativeinputdeviceinfo_p.h"
++
+ #include <qscreensaver.h>
++#include "qinputinfo.h"
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -65,6 +68,8 @@
+         qmlRegisterType<QDeclarativeDeviceInfo>(uri, major, minor, "DeviceInfo");
+         qmlRegisterType<QDeclarativeNetworkInfo>(uri, major, minor, "NetworkInfo");
+         qmlRegisterType<QScreenSaver>(uri, major, minor, "ScreenSaver");
++        qmlRegisterType<QDeclarativeInputDeviceInfo>(uri, major, minor, "InputDeviceInfo");
++        qmlRegisterType<QInputDevice>(uri, major, minor, "InputInfo");
+     }
+ };
+ 
+
+=== modified file 'src/imports/systeminfo/systeminfo.pro'
+--- old/src/imports/systeminfo/systeminfo.pro	2015-02-13 06:45:19 +0000
++++ new/src/imports/systeminfo/systeminfo.pro	2015-02-18 12:13:36 +0000
+@@ -3,11 +3,13 @@
+ 
+ HEADERS += \
+     qdeclarativedeviceinfo_p.h \
+-    qdeclarativenetworkinfo_p.h
++    qdeclarativenetworkinfo_p.h \
++    qdeclarativeinputdeviceinfo_p.h
+ 
+ SOURCES += \
+     qdeclarativedeviceinfo.cpp \
+     qdeclarativenetworkinfo.cpp \
+-    qsysteminfo.cpp
++    qsysteminfo.cpp \
++    qdeclarativeinputdeviceinfo.cpp
+ 
+ load(qml_plugin)
+
+=== added file 'src/systeminfo/linux/qinputdeviceinfo_linux.cpp'
+--- old/src/systeminfo/linux/qinputdeviceinfo_linux.cpp	1970-01-01 00:00:00 +0000
++++ new/src/systeminfo/linux/qinputdeviceinfo_linux.cpp	2015-02-18 15:35:06 +0000
+@@ -0,0 +1,249 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "qinputdeviceinfo_linux_p.h"
++
++#include <libudev.h>
++#include <libevdev/libevdev.h>
++#include <fcntl.h>
++#include <QDebug>
++#include <QSocketNotifier>
++#include <QTimer>
++
++QInputDeviceInfoPrivate::QInputDeviceInfoPrivate(QObject *parent) :
++    QObject(parent)
++  , udev(0)
++{
++    QTimer::singleShot(250,this,SLOT(init()));
++}
++
++void QInputDeviceInfoPrivate::init()
++{
++    if (!udev)
++        udev = udev_new();
++
++    struct udev_list_entry *devices, *dev_list_entry;
++    struct udev_device *dev;
++
++    QString subsystem = QStringLiteral("input");
++    struct udev_enumerate *enumerate = 0;
++
++    if (udev) {
++
++        udevMonitor = udev_monitor_new_from_netlink(udev, "udev");
++        udev_monitor_filter_add_match_subsystem_devtype(udevMonitor, subsystem.toLatin1(), NULL);
++        enumerate = udev_enumerate_new(udev);
++        udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());
++
++
++        udev_monitor_enable_receiving(udevMonitor);
++        notifierFd = udev_monitor_get_fd(udevMonitor);
++
++        notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);
++        connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));
++
++
++        udev_enumerate_scan_devices(enumerate);
++        devices = udev_enumerate_get_list_entry(enumerate);
++
++        udev_list_entry_foreach(dev_list_entry, devices) {
++            const char *path;
++            path = udev_list_entry_get_name(dev_list_entry);
++
++            dev = udev_device_new_from_syspath(udev, path);
++
++            QString eventPath = QString::fromLatin1(udev_device_get_sysname(dev));
++
++            if (qstrcmp(udev_device_get_subsystem(dev), "input") == 0 ) {
++
++                if (eventPath.contains(QStringLiteral("event"))) {
++                    eventPath.prepend(QStringLiteral("/dev/input/"));
++
++                    QInputDevice *iDevice = addDevice(eventPath);
++                    if (!iDevice)
++                        continue;
++
++                    qDebug() << "*** ADDING DEVICE" << eventPath;
++
++                    iDevice->setTypes(getInputTypes(dev));
++
++                if (iDevice->switches().count() > 0 && iDevice->buttons().count() == 0)
++                    iDevice->setTypes(iDevice->types() | QInputDeviceInfo::Switch);
++
++                if (iDevice->buttons().count() > 0 && iDevice->types() == QInputDeviceInfo::Unknown)
++                    iDevice->setTypes(iDevice->types() | QInputDeviceInfo::Button);
++
++                deviceList.append(iDevice);
++                deviceMap.insert(eventPath,iDevice);
++                Q_EMIT newDevice(eventPath);
++
++                }
++            }
++        }
++        udev_enumerate_unref(enumerate);
++    }
++    Q_EMIT ready();
++}
++
++QInputDeviceInfo::InputTypes QInputDeviceInfoPrivate::getInputTypes( struct udev_device *dev)
++{
++    qDebug() << "******* have input type Keyboard" << udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD");
++    qDebug() << "******* have input type Mouse" << udev_device_get_property_value(dev, "ID_INPUT_MOUSE");
++    qDebug() << "******* have input type Touchpad" << udev_device_get_property_value(dev, "ID_INPUT_TOUCHPAD");
++    qDebug() << "******* have input type Touchscreen" << udev_device_get_property_value(dev, "ID_INPUT_TOUCHSCREEN");
++    qDebug() << "******* have input type Tablet" << udev_device_get_property_value(dev, "ID_INPUT_TABLET");
++    qDebug() << "******* have input type joystick" << udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK");
++    QInputDeviceInfo::InputTypes types = QInputDeviceInfo::Unknown;
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD"), "1") == 0 )
++       types |= QInputDeviceInfo::Keyboard;
++
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_MOUSE"), "1") == 0)
++        types |= QInputDeviceInfo::Mouse;
++
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TOUCHPAD"), "1") == 0)
++       types |= QInputDeviceInfo::TouchPad;
++
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TOUCHSCREEN"), "1") == 0
++            || qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TABLET"), "1") == 0)
++      types |= QInputDeviceInfo::TouchScreen;
++
++    return types;
++}
++
++QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)
++{
++    QInputDevice *inputDevice = new QInputDevice(this);
++
++    struct libevdev *dev = NULL;
++    int fd;
++    int rc = 1;
++    fd = open(path.toLatin1(), O_RDONLY|O_NONBLOCK);
++
++    if (fd == -1) {
++        qDebug() << "Failed to open";
++        return inputDevice;
++    }
++    rc = libevdev_new_from_fd(fd, &dev);
++    if (rc < 0) {
++        qDebug() << "Failed to init libevdev ("<< strerror(-rc) << ")";
++        return inputDevice;
++    }
++
++    inputDevice->setName(QString::fromLatin1(libevdev_get_name(dev)));
++    inputDevice->setDevicePath(path);
++    for (int i = 0; i < EV_MAX; i++) {
++        if (i == EV_KEY || i == EV_SW || i == EV_REL
++                || i == EV_REL || i == EV_ABS) {
++            for (int j = 0; j <  libevdev_event_type_get_max(i); j++) {
++                if (libevdev_has_event_code(dev, i, j)) {
++                    switch (i) {
++                    case EV_KEY:
++                        inputDevice->addButton(j);
++                        break;
++                    case EV_SW:
++                        inputDevice->addSwitch(j);
++                        break;
++                    case EV_REL:
++                        inputDevice->addRelativeAxis(j);
++                        break;
++                    case EV_ABS:
++                        inputDevice->addAbsoluteAxis(j);
++                        break;
++                    };
++                }
++            }
++        }
++    }
++    return inputDevice;
++}
++
++void QInputDeviceInfoPrivate::removeDevice(const QString &path)
++{
++    for (int i = 0; i < deviceList.size(); ++i) {
++        if (deviceList.at(i)->devicePath() == path) {
++            delete deviceList.takeAt(i);
++            deviceMap.remove(path);
++            Q_EMIT deviceRemoved(path);
++        }
++    }
++}
++
++void QInputDeviceInfoPrivate::onUDevChanges()
++{
++    struct udev_device *dev = udev_monitor_receive_device(udevMonitor);
++    if (dev) {
++        if (qstrcmp(udev_device_get_subsystem(dev), "input") == 0 ) {
++            QString eventPath = QString::fromLatin1(udev_device_get_sysname(dev));
++
++            if (eventPath.contains(QStringLiteral("input")))
++                return;
++
++            QString action = QString::fromStdString(udev_device_get_action(dev));
++
++            if (!eventPath.contains(QStringLiteral("/dev/input/")))
++                eventPath.prepend(QStringLiteral("/dev/input/"));
++
++            if (action == QStringLiteral("add")) {
++
++                QInputDevice *iDevice = addDevice(eventPath);
++                if (!iDevice)
++                    return;
++
++                    iDevice->setTypes(getInputTypes(dev));
++                    udev_device_unref(dev);
++
++                if (iDevice->switches().count() > 0 && iDevice->buttons().count() == 0)
++                    iDevice->setTypes(iDevice->types() | QInputDeviceInfo::Switch);
++
++                if (iDevice->buttons().count() > 0 && iDevice->types() == QInputDeviceInfo::Unknown)
++                    iDevice->setTypes(iDevice->types() | QInputDeviceInfo::Button);
++
++                deviceList.append(iDevice);
++                deviceMap.insert(eventPath,iDevice);
++
++                Q_EMIT newDevice(eventPath);
++
++            } else if (action == QStringLiteral("remove")) {
++                removeDevice(eventPath);
++            }
++        }
++    }
++}
+
+=== added file 'src/systeminfo/linux/qinputdeviceinfo_linux_p.h'
+--- old/src/systeminfo/linux/qinputdeviceinfo_linux_p.h	1970-01-01 00:00:00 +0000
++++ new/src/systeminfo/linux/qinputdeviceinfo_linux_p.h	2015-02-18 13:36:29 +0000
+@@ -0,0 +1,91 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef QINPUTDEVICEINFO_LINUX_P_H
++#define QINPUTDEVICEINFO_LINUX_P_H
++
++#include <QObject>
++#include "qinputinfo.h"
++#include <libudev.h>
++
++class QInputDevicePrivate : public QObject
++{
++    Q_OBJECT
++public:
++    explicit QInputDevicePrivate(QObject *parent = 0);
++
++    QString name;
++    QString devicePath;
++    QList <int> buttons; //keys
++    QList <int> switches;
++    QList <int> relativeAxis;
++    QList <int> absoluteAxis;
++    QInputDeviceInfo::InputTypes types;
++};
++
++class QInputDeviceInfoPrivate : public QObject
++{
++    Q_OBJECT
++public:
++    explicit QInputDeviceInfoPrivate(QObject *parent = 0);
++    QVector <QInputDevice *> deviceList;
++    QMap <QString, QInputDevice *> deviceMap;
++
++signals:
++    void newDevice(const QString &);
++    void deviceRemoved(const QString &);
++    void ready();
++
++private:
++    struct udev *udev;
++    QInputDevice *addDevice(const QString &path);
++    void removeDevice(const QString &path);
++    QSocketNotifier *notifier;
++    int notifierFd;
++    struct udev_monitor *udevMonitor;
++    QInputDeviceInfo::InputTypes getInputTypes( struct udev_device *);
++
++private Q_SLOTS:
++    void onUDevChanges();
++    void init();
++};
++
++#endif // QINPUTDEVICEINFO_LINUX_P_H
+
+=== added file 'src/systeminfo/qinputinfo.cpp'
+--- old/src/systeminfo/qinputinfo.cpp	1970-01-01 00:00:00 +0000
++++ new/src/systeminfo/qinputinfo.cpp	2015-02-18 15:30:58 +0000
+@@ -0,0 +1,159 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "qinputinfo.h"
++
++#if defined(Q_OS_LINUX)
++#include "linux/qinputdeviceinfo_linux_p.h"
++#endif
++
++QT_BEGIN_NAMESPACE
++
++
++QInputDevicePrivate::QInputDevicePrivate(QObject *parent) :
++    QObject(parent),
++    types(QInputDeviceInfo::Unknown)
++{
++}
++
++QInputDevice::QInputDevice(QObject *parent) :
++    QObject(parent),
++    d_ptr(new QInputDevicePrivate(this))
++{
++}
++
++QString QInputDevice::name() const
++{
++    return d_ptr->name;
++}
++
++void QInputDevice::setName(const QString &name)
++{
++    d_ptr->name = name;
++}
++
++QString QInputDevice::devicePath() const
++{
++    return d_ptr->devicePath;
++}
++
++void QInputDevice::setDevicePath(const QString &path)
++{
++    d_ptr->devicePath = path;
++}
++
++QList <int> QInputDevice::buttons() const
++{
++    return d_ptr->buttons;
++}
++
++void QInputDevice::addButton(int buttonCode)
++{
++    d_ptr->buttons.append(buttonCode);
++}
++
++QList <int> QInputDevice::switches() const
++{
++    return d_ptr->switches;
++}
++
++void QInputDevice::addSwitch(int switchCode)
++{
++    d_ptr->switches.append(switchCode);
++}
++
++QList <int> QInputDevice::relativeAxis() const
++{
++    return d_ptr->relativeAxis;
++}
++
++void QInputDevice::addRelativeAxis(int axisCode)
++{
++    d_ptr->relativeAxis.append(axisCode);
++}
++
++QList <int> QInputDevice::absoluteAxis() const
++{
++    return d_ptr->absoluteAxis;
++}
++
++void QInputDevice::addAbsoluteAxis(int axisCode)
++{
++    d_ptr->absoluteAxis.append(axisCode);
++}
++
++QInputDeviceInfo::InputTypes QInputDevice::types()
++{
++    return d_ptr->types;
++}
++
++void QInputDevice::setTypes(QInputDeviceInfo::InputTypes types)
++{
++    d_ptr->types = types;
++}
++
++
++QInputDeviceInfo::QInputDeviceInfo(QObject *parent) :
++    QObject(parent),
++    d_ptr(new QInputDeviceInfoPrivate(this))
++{
++    connect(d_ptr, &QInputDeviceInfoPrivate::newDevice,this,&QInputDeviceInfo::addedDevice);
++    connect(d_ptr, &QInputDeviceInfoPrivate::deviceRemoved,this,&QInputDeviceInfo::deviceRemoved);
++
++    connect(d_ptr,SIGNAL(ready()),this,SIGNAL(ready()));
++}
++
++QVector <QInputDevice *> QInputDeviceInfo::deviceList()
++{
++    return d_ptr->deviceList;
++}
++
++QMap <QString, QInputDevice *> QInputDeviceInfo::deviceMap()
++{
++    return d_ptr->deviceMap;
++}
++
++void QInputDeviceInfo::addedDevice(const QString & devicePath)
++{
++    Q_EMIT deviceAdded(devicePath);
++}
++
++QT_END_NAMESPACE
+
+=== added file 'src/systeminfo/qinputinfo.h'
+--- old/src/systeminfo/qinputinfo.h	1970-01-01 00:00:00 +0000
++++ new/src/systeminfo/qinputinfo.h	2015-02-18 16:44:32 +0000
+@@ -0,0 +1,144 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef QINPUTINFO_H
++#define QINPUTINFO_H
++
++#include <QtSystemInfo/qsysteminfoglobal.h>
++#include <QObject>
++#include <QVector>
++#include <QMap>
++#include <QSocketNotifier>
++#include <QDebug>
++
++class QInputDeviceInfoPrivate;
++class QInputDevicePrivate;
++class QInputDevice;
++
++class QInputDeviceInfoPrivate;
++class Q_SYSTEMINFO_EXPORT QInputDeviceInfo : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(int deviceCount READ deviceCount)
++public:
++
++    enum InputType {
++        Unknown = 0,
++        Button = 1,
++        Mouse = 2,
++        TouchPad = 4,
++        TouchScreen = 8,
++        Keyboard = 16,
++        Switch = 32
++    };
++    Q_ENUMS(InputType)
++    Q_FLAGS(InputTypes)
++    Q_DECLARE_FLAGS(InputTypes, InputType)
++
++    explicit QInputDeviceInfo(QObject *parent = 0);
++
++    Q_INVOKABLE QVector <QInputDevice *> deviceList();
++
++    Q_INVOKABLE QMap <QString, QInputDevice *> deviceMap();
++    int deviceCount() { return deviceList().count(); }
++signals:
++
++    void deviceAdded(const QString & devicePath);
++    void deviceRemoved(const QString & devicePath);
++
++    void ready();
++
++public slots:
++    void addedDevice(const QString & devicePath);
++
++private:
++    Q_DISABLE_COPY(QInputDeviceInfo)
++#if !defined(QT_SIMULATOR)
++    QInputDeviceInfoPrivate *const d_ptr;
++    Q_DECLARE_PRIVATE(QInputDeviceInfo)
++#endif
++};
++
++class Q_SYSTEMINFO_EXPORT QInputDevice : public QObject
++{
++    friend class QInputDeviceInfoPrivate;
++    Q_OBJECT
++    Q_ENUMS(InputType)
++    Q_FLAGS(InputTypes)
++    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
++    Q_PROPERTY(QString devicePath READ devicePath NOTIFY devicePathChanged)
++    Q_PROPERTY(QList <int> buttons READ buttons NOTIFY buttonsChanged)
++    Q_PROPERTY(QList <int> switches READ switches NOTIFY switchesChanged)
++    Q_PROPERTY(QList <int> relativeAxis READ relativeAxis NOTIFY relativeAxisChanged)
++    Q_PROPERTY(QList <int> absoluteAxis READ absoluteAxis NOTIFY absoluteAxisChanged)
++    Q_PROPERTY(QInputDeviceInfo::InputTypes types READ types NOTIFY typesChanged)
++
++public:
++    explicit QInputDevice(QObject *parent = 0);
++
++    QString name() const;
++    QString devicePath() const;
++    QList <int> buttons() const; //keys event code
++    QList <int> switches() const;
++    QList <int> relativeAxis() const;
++    QList <int> absoluteAxis() const;
++
++    QInputDeviceInfo::InputTypes types();
++signals:
++    void nameChanged();
++    void devicePathChanged();
++    void buttonsChanged();
++    void switchesChanged();
++    void relativeAxisChanged();
++    void absoluteAxisChanged();
++    void typesChanged();
++private:
++    QInputDevicePrivate *d_ptr;
++    void setName(const QString &);
++    void setDevicePath(const QString &);
++    void addButton(int);
++    void addSwitch(int);
++    void addRelativeAxis(int);
++    void addAbsoluteAxis(int);
++    void setTypes(QInputDeviceInfo::InputTypes);
++};
++
++#endif // QINPUTINFO_H
+
+=== modified file 'src/systeminfo/systeminfo.pro'
+--- old/src/systeminfo/systeminfo.pro	2015-02-13 06:45:19 +0000
++++ new/src/systeminfo/systeminfo.pro	2015-02-18 12:13:36 +0000
+@@ -11,7 +11,9 @@
+ SOURCES += qdeviceinfo.cpp \
+            qscreensaver.cpp \
+            qbatteryinfo.cpp \
+-           qnetworkinfo.cpp
++           qnetworkinfo.cpp \
++    qinputinfo.cpp \
++    linux/qinputdeviceinfo_linux.cpp
+ 
+ win32: !simulator: {
+     # Wbemidl.h violates C/C++ strict strings
+@@ -116,9 +118,13 @@
+         SOURCES += linux/qbatteryinfo_linux.cpp
+     }
+ 
++CONFIG += link_pkgconfig
++PKGCONFIG += libudev libevdev
++LIBS += -ludev -levdev
++
+     config_udev {
+         CONFIG += link_pkgconfig
+-        PKGCONFIG += udev
++        PKGCONFIG += libudev
+         LIBS += -ludev
+         PRIVATE_HEADERS += linux/qudevwrapper_p.h
+         SOURCES += linux/qudevwrapper.cpp
+@@ -225,7 +231,9 @@
+ 
+ QMAKE_DOCS = $$PWD/../../doc/config/systeminfo/qtsysteminfo.qdocconf
+ 
+-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
++HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS \
++    qinputinfo.h \
++    linux/qinputdeviceinfo_linux_p.h
+ load(qt_module)
+ 
+ # This must be done after loading qt_module.prf
+@@ -242,3 +250,6 @@
+     }
+ }
+ 
++OTHER_FILES += \
++    notes.txt
++
+
+=== modified file 'tests/auto/systeminfo/systeminfo.pro'
+--- old/tests/auto/systeminfo/systeminfo.pro	2015-02-13 06:45:19 +0000
++++ new/tests/auto/systeminfo/systeminfo.pro	2015-02-18 12:13:36 +0000
+@@ -3,4 +3,5 @@
+ SUBDIRS = \
+     qdeviceinfo \
+     qscreensaver \
+-    qbatteryinfo
++    qbatteryinfo \
++#    qinputdeviceinfo
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-02-13 06:45:19 +0000
+++ debian/patches/series	2015-02-18 17:03:28 +0000
@@ -1,2 +1,4 @@
 build_with_udisk.patch
 skip_failing_tests.patch
+inputinfo.patch
+

=== modified file 'debian/qtsystems5-dev.install'
--- debian/qtsystems5-dev.install	2015-02-13 06:45:19 +0000
+++ debian/qtsystems5-dev.install	2015-02-18 17:03:28 +0000
@@ -39,6 +39,9 @@
 usr/include/*/qt5/QtSystemInfo/qscreensaver.h
 usr/include/*/qt5/QtSystemInfo/qsysteminfoglobal.h
 usr/include/*/qt5/QtSystemInfo/qtsysteminfoversion.h
+usr/include/*/qt5/QtSystemInfo/QInputDeviceInfo
+usr/include/*/qt5/QtSystemInfo/QInputDevice
+usr/include/*/qt5/QtSystemInfo/qinputinfo.h
 usr/lib/*/cmake/*
 usr/lib/*/libQt5PublishSubscribe.prl
 usr/lib/*/libQt5PublishSubscribe.so

=== modified file 'debian/qtsystems5-examples.install'
--- debian/qtsystems5-examples.install	2015-02-13 06:45:19 +0000
+++ debian/qtsystems5-examples.install	2015-02-18 17:03:28 +0000
@@ -2,3 +2,5 @@
 usr/lib/*/qt5/examples/sysinfo/qml-battery/qml-battery.qml
 usr/lib/*/qt5/examples/systeminfo/qml-deviceinfo/qml-deviceinfo
 usr/lib/*/qt5/examples/systeminfo/qml-deviceinfo/qml-deviceinfo.qml
+usr/lib/*/qt5/examples/sysinfo/qml-inputinfo/qml-inputinfo
+usr/lib/*/qt5/examples/sysinfo/qml-inputinfo/qml-inputinfo.qml

=== modified file 'debian/qtsystems5-private-dev.install'
--- debian/qtsystems5-private-dev.install	2015-02-13 06:45:19 +0000
+++ debian/qtsystems5-private-dev.install	2015-02-18 17:03:28 +0000
@@ -54,3 +54,5 @@
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qsysteminfoglobal_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qudevwrapper_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qwmihelper_win_p.h
+usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qinputdeviceinfo_linux_p.h
+

=== modified file 'debian/rules'
--- debian/rules	2015-02-13 06:45:19 +0000
+++ debian/rules	2015-02-18 17:03:28 +0000
@@ -30,5 +30,5 @@
 	dh_install --fail-missing
 
 override_dh_auto_test:
-	export LD_LIBRARY_PATH=$(CURDIR)/lib
-	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && make -f Makefile check
+	[ ! -d $(CURDIR)/home ] && mkdir $(CURDIR)/home
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && env LD_LIBRARY_PATH=$(CURDIR)/lib HOME=$(CURDIR)/home make -f Makefile check