Unity 8

Merge lp:~mzanetti/unity8/update-inputinfo into lp:unity8

update-inputinfo
Merge into trunk

Proposed by Michael Zanetti on 2015-10-02

Status:	Merged
Approved by:	Albert Astals Cid on 2015-11-09
Approved revision:	2001
Merged at revision:	2050
Proposed branch:	lp:~mzanetti/unity8/update-inputinfo
Merge into:	lp:unity8
Diff against target:	2544 lines (+903/-1079) 26 files modified plugins/Unity/InputInfo/CMakeLists.txt (+1/-1) plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp (+146/-98) plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h (+13/-6) plugins/Unity/InputInfo/plugin.cpp (+2/-2) plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo.cpp (+0/-143) plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo_p.h (+0/-86) plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cpp (+196/-0) plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h (+102/-0) plugins/Unity/InputInfo/qinputinfo.cpp (+140/-29) plugins/Unity/InputInfo/qinputinfo.h (+57/-57) qml/Components/UnityInputInfo/UnityInputInfo.qml (+0/-93) qml/Components/UnityInputInfo/qmldir (+0/-1) qml/OrientedShell.qml (+16/-7) tests/mocks/Unity/InputInfo/CMakeLists.txt (+7/-2) tests/mocks/Unity/InputInfo/mockcontroller.cpp (+35/-0) tests/mocks/Unity/InputInfo/mockcontroller.h (+34/-0) tests/mocks/Unity/InputInfo/mockqdeclarativeinputdeviceinfo.cpp (+0/-173) tests/mocks/Unity/InputInfo/mockqdeclarativeinputdeviceinfo_p.h (+0/-94) tests/mocks/Unity/InputInfo/mockqinputinfo.cpp (+0/-124) tests/mocks/Unity/InputInfo/mockqinputinfo.h (+0/-139) tests/mocks/Unity/InputInfo/plugin.cpp (+17/-3) tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp (+52/-0) tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock_p.h (+58/-0) tests/qmltests/Notifications/tst_Notifications.qml (+5/-6) tests/qmltests/Notifications/tst_SwipeToAct.qml (+5/-6) tests/qmltests/tst_OrientedShell.qml (+17/-9)
To merge this branch:	bzr merge lp:~mzanetti/unity8/update-inputinfo
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2015-10-02	Abstain on 2015-11-09
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-11-09
Lukáš Tinkl (community)			Approve on 2015-11-02
Daniel d'Andrada (community)			Abstain on 2015-10-28
Review via email: mp+273248@code.launchpad.net

Commit message

update inputinfo api to the latest upstream snapshot

* Import latest update of api from gerrit.
* drop all the old mock code
* instead of mocking the whole api, add mocks for the backend only. This should simplify future updates and moving to upstream implementation a lot.
* update tests to use new mocking system

Description of the change

Everything in plugins/Unity/InputInfo is taken from https://codereview.qt-project.org/#/c/101049/ as is.

Everything in tests/mocks is our own additions for testing it.

* Are there any related MPs required for this MP to build/function as expected? Please list.

nope

* Did you perform an exploratory manual test run of your code change and any related functionality?

yes

* Did you make sure that your branch does not contain spurious tags?

yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

* If you changed the UI, has there been a design review?

n/a

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-02:

FAILED: Continuous integration, rev:1990
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mzanetti/unity8/update-inputinfo/+merge/273248/+edit-commit-message

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6412/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-09:

FAILED: Continuous integration, rev:1991
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mzanetti/unity8/update-inputinfo/+merge/273248/+edit-commit-message

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6446/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6512/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6515/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6520/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-10-23:

Given that this is (i understand) upstream code, how much review do we want to put in it?

review: Needs Information

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-10-23:

I'd say it'd be good to check it for big mistakes, test if it doesn't break the switching of windowed mode and osk show/hide.

Wouldn't spend to much time reviewing the code itself, as this is basically a review of upstream code. If you spot something, you are welcome to add comments here: https://codereview.qt-project.org/#/c/101049/

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-10-23:

I had a look at the code and it looks good, i'll leave someone else with more experience in the windowed mode to have a look at it.

review: Approve (code)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-10-23:

+ onCountChanged: print("*****************", count)

Forgotten debug output, otherwise code looks good. Gonna test it locally

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-10-28:

> + onCountChanged: print("*****************", count)
>
> Forgotten debug output, otherwise code looks good. Gonna test it locally

oops. fixed

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-10-28:

Does the new upstream code fix the bug I explained in revision 1918?

Copy pasting it here:
"""
- QInputDeviceInfoPrivate::addDevice was bailing out before
  setting the device path, making it impossible for
  indexOf() to find the input device.
  This happens on a desktop/laptop as the user where unity8
  runs cannot open input device files but it's still able to
  get info about it trough udev API
"""

review: Needs Information

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-10-28:

> Does the new upstream code fix the bug I explained in revision 1918?
>
> Copy pasting it here:
> """
> - QInputDeviceInfoPrivate::addDevice was bailing out before
> setting the device path, making it impossible for
> indexOf() to find the input device.
> This happens on a desktop/laptop as the user where unity8
> runs cannot open input device files but it's still able to
> get info about it trough udev API
> """

Yes. Seems wherever a valid QInputDevice object is created, the setDevicePath() call always happens immediately after the "new" call now.

Revision history for this message

Daniel d'Andrada (dandrader) on 2015-10-28:

review: Abstain

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-28:

FAILED: Continuous integration, rev:1996
http://jenkins.qa.ubuntu.com/job/unity8-ci/6581/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4882
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/965/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1293
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/609/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1189
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/820/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/821/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3926
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4879
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4879/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24640
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/965/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6581/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-31:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6606/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-11-02:

Code works fine but this test doesn't succeed: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1318

Running it locally, it crashes with:

Totals: 31 passed, 0 failed, 0 skipped, 0 blacklisted
********* Finished testing of qmltestrunner *********
*** Error in `/usr/lib/x86_64-linux-gnu/qt5/bin/qmltestrunner': free(): invalid pointer: 0x00007fbb3acbb380 ***

review: Needs Fixing

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-11-02:

^^ make testOrientedShell

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-11-02:

Here's the backtrace:

[Thread 0x7fffe09d9700 (LWP 30234) exited]
*** Error in `/usr/lib/x86_64-linux-gnu/qt5/bin/qmltestrunner': free(): invalid pointer: 0x00007fffda0b6380 ***
[New Thread 0x7fffd355d700 (LWP 30235)]
[New Thread 0x7fffeb5df700 (LWP 30233)]

Program received signal SIGABRT, Aborted.
0x00007ffff7a44267 in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:55
55 ../sysdeps/unix/sysv/linux/raise.c: No such file or directory.
(gdb) bt
#0 0x00007ffff7a44267 in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:55
#1 0x00007ffff7a45eca in __GI_abort () at abort.c:89
#2 0x00007ffff7a87c53 in __libc_message (do_abort=do_abort@entry=1, fmt=fmt@entry=0x7ffff7ba01a8 "*** Error in `%s': %s: 0x%s ***\n") at ../sysdeps/posix/libc_fatal.c:175
#3 0x00007ffff7a8fc69 in malloc_printerr (ptr=<optimized out>, str=0x7ffff7b9c2fa "free(): invalid pointer", action=1) at malloc.c:4965
#4 _int_free (av=<optimized out>, p=<optimized out>, have_lock=0) at malloc.c:3834
#5 0x00007ffff7a9389c in __GI___libc_free (mem=<optimized out>) at malloc.c:2950
#6 0x00007ffff631de91 in QQmlType::SingletonInstanceInfo::destroy(QQmlEngine*) () from /usr/lib/x86_64-linux-gnu/libQt5Qml.so.5
#7 0x00007ffff62f4373 in QQmlEngine::~QQmlEngine() () from /usr/lib/x86_64-linux-gnu/libQt5Qml.so.5
#8 0x00007ffff62f4499 in QQmlEngine::~QQmlEngine() () from /usr/lib/x86_64-linux-gnu/libQt5Qml.so.5
#9 0x00007ffff6be869c in QObjectPrivate::deleteChildren() () from /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
#10 0x00007ffff6bf2d03 in QObject::~QObject() () from /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
#11 0x00007ffff668a959 in QQuickWindow::~QQuickWindow() () from /usr/lib/x86_64-linux-gnu/libQt5Quick.so.5
#12 0x00007ffff6739f79 in QQuickView::~QQuickView() () from /usr/lib/x86_64-linux-gnu/libQt5Quick.so.5
#13 0x00007ffff7fbf393 in quick_test_main(int, char**, char const*, char const*) () from /usr/lib/x86_64-linux-gnu/libQt5QuickTest.so.5
#14 0x00007ffff7a2fa40 in __libc_start_main (main=0x4005d0, argc=7, argv=0x7fffffffd9e8, init=<optimized out>, fini=<optimized out>, rtld_fini=<optimized out>, stack_end=0x7fffffffd9d8) at libc-start.c:289
#15 0x0000000000400619 in ?? ()

Here's the backtrace:

Program received signal SIGABRT, Aborted.
0x00007ffff7a44267 in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:55
55	../sysdeps/unix/sysv/linux/raise.c: No such file or directory.
(gdb) bt
#0  0x00007ffff7a44267 in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:55
#1  0x00007ffff7a45eca in __GI_abort () at abort.c:89
#2  0x00007ffff7a87c53 in __libc_message (do_abort=do_abort@entry=1, fmt=fmt@entry=0x7ffff7ba01a8 "*** Error in `%s': %s: 0x%s ***\n") at ../sysdeps/posix/libc_fatal.c:175
#3  0x00007ffff7a8fc69 in malloc_printerr (ptr=<optimized out>, str=0x7ffff7b9c2fa "free(): invalid pointer", action=1) at malloc.c:4965
#4  _int_free (av=<optimized out>, p=<optimized out>, have_lock=0) at malloc.c:3834
#5  0x00007ffff7a9389c in __GI___libc_free (mem=<optimized out>) at malloc.c:2950
#6  0x00007ffff631de91 in QQmlType::SingletonInstanceInfo::destroy(QQmlEngine*) () from /usr/lib/x86_64-linux-gnu/libQt5Qml.so.5
#7  0x00007ffff62f4373 in QQmlEngine::~QQmlEngine() () from /usr/lib/x86_64-linux-gnu/libQt5Qml.so.5
#8  0x00007ffff62f4499 in QQmlEngine::~QQmlEngine() () from /usr/lib/x86_64-linux-gnu/libQt5Qml.so.5
#9  0x00007ffff6be869c in QObjectPrivate::deleteChildren() () from /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
#10 0x00007ffff6bf2d03 in QObject::~QObject() () from /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
#11 0x00007ffff668a959 in QQuickWindow::~QQuickWindow() () from /usr/lib/x86_64-linux-gnu/libQt5Quick.so.5
#12 0x00007ffff6739f79 in QQuickView::~QQuickView() () from /usr/lib/x86_64-linux-gnu/libQt5Quick.so.5
#13 0x00007ffff7fbf393 in quick_test_main(int, char**, char const*, char const*) () from /usr/lib/x86_64-linux-gnu/libQt5QuickTest.so.5
#14 0x00007ffff7a2fa40 in __libc_start_main (main=0x4005d0, argc=7, argv=0x7fffffffd9e8, init=<optimized out>, fini=<optimized out>, rtld_fini=<optimized out>, stack_end=0x7fffffffd9d8) at libc-start.c:289
#15 0x0000000000400619 in ?? ()

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-11-02:

Turns out the crash was caused by Q_GLOBAL_STATIC and qmlRegisterSingletonType both wanting to delete the object. Had to resort to a rather ugly workaround of adding a proxy object to control the mock backend through qml. This way everyone can delete things and is happy.

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-11-02:

Yup, that works for me

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Xenial tests still broken

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-02:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6624/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-03:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6634/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-11-06:

Note: was already top approved

Conflict: can't delete qml/Components/UnityInputInfo because it is not empty. Not deleting.
Conflict because qml/Components/UnityInputInfo is not versioned, but has versioned children. Versioned directory.
Contents conflict in qml/Components/UnityInputInfo/UnityInputInfo.qml
Text conflict in qml/OrientedShell.qml
Text conflict in tests/qmltests/Notifications/tst_Notifications.qml
Text conflict in tests/qmltests/Notifications/tst_SwipeToAct.qml
6 conflicts encountered.

review: Needs Fixing

lp:~mzanetti/unity8/update-inputinfo updated on 2015-11-06

2000. By Michael Zanetti on 2015-11-06: merge trunk

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-11-06:

> Note: was already top approved
>
> Conflict: can't delete qml/Components/UnityInputInfo because it is not empty.
> Not deleting.
> Conflict because qml/Components/UnityInputInfo is not versioned, but has
> versioned children. Versioned directory.
> Contents conflict in qml/Components/UnityInputInfo/UnityInputInfo.qml
> Text conflict in qml/OrientedShell.qml
> Text conflict in tests/qmltests/Notifications/tst_Notifications.qml
> Text conflict in tests/qmltests/Notifications/tst_SwipeToAct.qml
> 6 conflicts encountered.

merged

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-11-06:

merged

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-06:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6660/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-11-09:

tests/mocks/Unity/InputInfo/mockcontroller.cpp UNKNOWN *No copyright*

review: Needs Fixing

lp:~mzanetti/unity8/update-inputinfo updated on 2015-11-09

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-11-09:

> tests/mocks/Unity/InputInfo/mockcontroller.cpp UNKNOWN *No copyright*

fixed

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6681/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-11-09:

Merged and CI is "good"

review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/Unity/InputInfo/CMakeLists.txt'
 --- plugins/Unity/InputInfo/CMakeLists.txt	2015-06-22 12:16:38 +0000
 +++ plugins/Unity/InputInfo/CMakeLists.txt	2015-11-09 09:23:42 +0000
@@ -21,7 +21,7 @@
  set(InputInfo_SOURCES
      plugin.cpp
      qinputinfo.cpp
--    qdeclarativeinputdeviceinfo.cpp
++    qdeclarativeinputdevicemodel.cpp
      linux/qinputdeviceinfo_linux.cpp
+ )
 === modified file 'plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp'
 --- plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp	2015-08-19 13:56:21 +0000
 +++ plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp	2015-11-09 09:23:42 +0000
@@ -47,39 +47,46 @@
  #include <QDebug>
  #include <QSocketNotifier>
  #include <QTimer>
--
--QInputDeviceInfoPrivate::QInputDeviceInfoPrivate(QObject *parent) :
--    QObject(parent)
--  , udev(0)
--{
--    QTimer::singleShot(250, this, &QInputDeviceInfoPrivate::init);
--}
--
--void QInputDeviceInfoPrivate::init()
--{
--    if (!udev)
--        udev = udev_new();
--
--    struct udev_list_entry *devices, *dev_list_entry;
--    struct udev_device *dev;
++#include <QDir>
++
++QInputDeviceManagerPrivate::QInputDeviceManagerPrivate(QObject *parent) :
++    QObject(parent),
++    currentFilter(QInputDevice::Unknown),
++    udevice(0)
++{
++    QTimer::singleShot(250,this,SLOT(init()));
++}
++
++QInputDeviceManagerPrivate::~QInputDeviceManagerPrivate()
++{
++    udev_unref(udevice);
++    udev_monitor_unref(udevMonitor);
++}
++
++void QInputDeviceManagerPrivate::init()
++{
++    if (!udevice)
++        udevice = udev_new();
++
++    udev_list_entry *devices;
++    udev_list_entry *dev_list_entry;
++    udev_device *dev;
      QString subsystem = QStringLiteral("input");
      struct udev_enumerate *enumerate = 0;
--    if (udev) {
++    if (udevice) {
--        udevMonitor = udev_monitor_new_from_netlink(udev, "udev");
++        udevMonitor = udev_monitor_new_from_netlink(udevice, "udev");
          udev_monitor_filter_add_match_subsystem_devtype(udevMonitor, subsystem.toLatin1(), NULL);
--        enumerate = udev_enumerate_new(udev);
++        enumerate = udev_enumerate_new(udevice);
          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, &QSocketNotifier::activated, this, &QInputDeviceInfoPrivate::onUDevChanges);
--
++        connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));
          udev_enumerate_scan_devices(enumerate);
          devices = udev_enumerate_get_list_entry(enumerate);
@@ -88,78 +95,80 @@
              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));
--
++            dev = udev_device_new_from_syspath(udevice, path);
              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;
--
--                    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);
--
++                QInputDevice *iDevice = addDevice(dev);
++                if (iDevice && !iDevice->devicePath().isEmpty()) {
++                    deviceMap.insert(iDevice->devicePath(),iDevice);
+                 }
+             }
++            udev_device_unref(dev);
+         }
          udev_enumerate_unref(enumerate);
+     }
++ //   udev_unref(udevice);
++    Q_FOREACH (const QString &devicePath, deviceMap.keys()) {
++        Q_EMIT deviceAdded(devicePath);
++    }
      Q_EMIT ready();
+ }
--QInputDeviceInfo::InputTypes QInputDeviceInfoPrivate::getInputTypes( struct udev_device *dev)
++QInputDevice::InputTypeFlags QInputDeviceManagerPrivate::getInputTypeFlags(struct udev_device *dev)
+ {
--    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;
--
++    QInputDevice::InputTypeFlags flags = QInputDevice::Unknown;
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEY"), "1") == 0 ) {
++        flags |= QInputDevice::Button;
++    }
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_MOUSE"), "1") == 0) {
++        flags |= QInputDevice::Mouse;
++    }
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TOUCHPAD"), "1") == 0) {
++        flags |= QInputDevice::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;
++            || qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TABLET"), "1") == 0) {
++        flags |= QInputDevice::TouchScreen;
++    }
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD"), "1") == 0 ) {
++        flags |= QInputDevice::Keyboard;
++    }
++    if (!QString::fromLatin1(udev_device_get_property_value(dev, "SW")).isEmpty()) {
++        flags |= QInputDevice::Switch;
++    }
--    return types;
++    return flags;
+ }
--QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)
++QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)
+ {
--    QInputDevice *inputDevice = new QInputDevice(this);
--    inputDevice->setDevicePath(path);
--
++    QString eventPath = QString::fromLatin1(udev_device_get_sysname(udev));
++
++    if (eventPath.contains(QStringLiteral("event")))
++        eventPath.prepend(QStringLiteral("/dev/input/"));
++
++    if (deviceMap.contains(eventPath)) {
++        return Q_NULLPTR;
++    }
      struct libevdev *dev = NULL;
      int fd;
      int rc = 1;
--    fd = open(path.toLatin1(), O_RDONLY|O_NONBLOCK);
++    QInputDevice *inputDevice;
++    inputDevice = addUdevDevice(udev);
++    if (!inputDevice) {
++        return Q_NULLPTR;
++    }
++    eventPath = inputDevice->devicePath();
++    fd = open(eventPath.toLatin1(), O_RDONLY|O_NONBLOCK);
      if (fd == -1) {
          return inputDevice;
+     }
      rc = libevdev_new_from_fd(fd, &dev);
      if (rc < 0) {
          qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";
--        return inputDevice;
++        return Q_NULLPTR;
+     }
--    inputDevice->setName(QString::fromLatin1(libevdev_get_name(dev)));
      for (int i = 0; i < EV_MAX; i++) {
          if (i == EV_KEY || i == EV_SW || i == EV_REL
                  || i == EV_REL || i == EV_ABS) {
@@ -183,54 +192,93 @@
+             }
+         }
+     }
++
      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);
++void QInputDeviceManagerPrivate::addDetails(struct udev_device *)
++{
++}
++
++void QInputDeviceManagerPrivate::removeDevice(const QString &path)
++{
++    // this path is not a full evdev path
++    Q_FOREACH (const QString devicePath, deviceMap.keys()) {
++        if (devicePath.contains(path)) {
++            deviceMap.remove(devicePath);
++            Q_EMIT deviceRemoved(devicePath);
++        }
++    }
++}
++
++QInputDevice *QInputDeviceManagerPrivate::addUdevDevice(struct udev_device *udev)
++{
++    QInputDevice *iDevice;
++
++    struct udev_list_entry *list;
++    struct udev_list_entry *node;
++
++    list = udev_device_get_properties_list_entry (udev);
++    QString syspath = QString::fromLatin1(udev_device_get_syspath(udev));
++    QDir sysdir(syspath);
++
++    QStringList infoList = sysdir.entryList(QStringList() << QStringLiteral("event*"),QDir::Dirs);
++
++    if (infoList.count() > 0) {
++        QString token = infoList.at(0);
++
++        token.prepend(QStringLiteral("/dev/input/"));
++        iDevice = new QInputDevice(this);
++        iDevice->setDevicePath(token);
++    } else {
++        return Q_NULLPTR;
++    }
++    udev_list_entry_foreach (node, list) {
++
++        QString key = QString::fromLatin1(udev_list_entry_get_name(node));
++        QString value = QString::fromLatin1(udev_list_entry_get_value(node));
++
++        if (key == QStringLiteral("NAME")) {
++            iDevice->setName(value.remove(QStringLiteral("\"")));
++        }
++    }
++    iDevice->setType(getInputTypeFlags(udev));
++    return iDevice;
++}
++
++void QInputDeviceManagerPrivate::onUDevChanges()
++{
++    if (!udevMonitor)
++        return;
++
++    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));
++                if (deviceMap.contains(eventPath)){
                      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);
++                    return;
++                }
++
++                QInputDevice *iDevice = addDevice(dev);
++                if (!iDevice) {
++                    delete iDevice;
++                    return;
++                }
++                iDevice->setType(getInputTypeFlags(dev));
++                udev_device_unref(dev);
++
                  deviceMap.insert(eventPath,iDevice);
--                Q_EMIT newDevice(eventPath);
++                Q_EMIT deviceAdded(eventPath);
              } else if (action == QStringLiteral("remove")) {
                  removeDevice(eventPath);
 === modified file 'plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h'
 --- plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h	2015-05-05 11:19:15 +0000
 +++ plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h	2015-11-09 09:23:42 +0000
@@ -58,30 +58,37 @@
      QList <int> switches;
      QList <int> relativeAxis;
      QList <int> absoluteAxis;
--    QInputDeviceInfo::InputTypes types;
++    QInputDevice::InputTypeFlags type;
  };
--class QInputDeviceInfoPrivate : public QObject
++class QInputDeviceManagerPrivate : public QObject
+ {
      Q_OBJECT
  public:
--    explicit QInputDeviceInfoPrivate(QObject *parent = 0);
++    explicit QInputDeviceManagerPrivate(QObject *parent = 0);
++    ~QInputDeviceManagerPrivate();
      QVector <QInputDevice *> deviceList;
      QMap <QString, QInputDevice *> deviceMap;
++    static QInputDeviceManagerPrivate * instance();
++    QInputDevice::InputType currentFilter;
  Q_SIGNALS:
--    void newDevice(const QString &);
++    void deviceAdded(const QString &);
      void deviceRemoved(const QString &);
      void ready();
  private:
--    struct udev *udev;
++    QInputDevice *addDevice(struct udev_device *udev);
++    QInputDevice *addUdevDevice(struct udev_device *);
++
      QInputDevice *addDevice(const QString &path);
      void removeDevice(const QString &path);
      QSocketNotifier *notifier;
      int notifierFd;
      struct udev_monitor *udevMonitor;
--    QInputDeviceInfo::InputTypes getInputTypes( struct udev_device *);
++    QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);
++    struct udev *udevice;
++    void addDetails(struct udev_device *);
  private Q_SLOTS:
      void onUDevChanges();
 === modified file 'plugins/Unity/InputInfo/plugin.cpp'
 --- plugins/Unity/InputInfo/plugin.cpp	2015-05-05 11:19:15 +0000
 +++ plugins/Unity/InputInfo/plugin.cpp	2015-11-09 09:23:42 +0000
@@ -21,12 +21,12 @@
  #include "plugin.h"
  // local
--#include "qdeclarativeinputdeviceinfo_p.h"
++#include "qdeclarativeinputdevicemodel_p.h"
  void InputInfoPlugin::registerTypes(const char *uri)
+ {
      int major = 0;
      int minor = 1;
--    qmlRegisterType<QDeclarativeInputDeviceInfo>(uri, major, minor, "InputDeviceInfo");
++    qmlRegisterType<QDeclarativeInputDeviceModel>(uri, major, minor, "InputDeviceModel");
      qmlRegisterType<QInputDevice>(uri, major, minor, "InputInfo");
+ }
 === removed file 'plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo.cpp'
 --- plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo.cpp	2015-08-19 13:56:21 +0000
 +++ plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo.cpp	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
--/****************************************************************************
--**
--** 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, &QInputDeviceInfo::ready, this, &QDeclarativeInputDeviceInfo::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;
--}
 === removed file 'plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo_p.h'
 --- plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo_p.h	2015-05-05 11:19:15 +0000
 +++ plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo_p.h	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
--/****************************************************************************
--**
--** 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;
--
--Q_SIGNALS:
--    void newDevice(const QString &devicePath);
--    void deviceRemoved(const QString &devicePath);
--
--public Q_SLOTS:
--    void updateDeviceList();
--private:
--    QInputDeviceInfo *deviceInfo;
--    QVector<QInputDevice *> inputDevices;
--private Q_SLOTS:
--    void addedDevice(const QString &);
--    void removedDevice(const QString &path);
--
--};
--
--#endif // QDECLARATIVEINPUTDEVICEINFO_H
 === added file 'plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cpp'
 --- plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cpp	2015-11-09 09:23:42 +0000
@@ -0,0 +1,196 @@
++/****************************************************************************
++**
++** 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 "qdeclarativeinputdevicemodel_p.h"
++#include "qinputinfo.h"
++
++QDeclarativeInputDeviceModel::QDeclarativeInputDeviceModel(QObject *parent) :
++    QAbstractListModel(parent),
++    deviceInfo(new QInputDeviceManager),
++    currentFilter(QInputDevice::Unknown)
++{
++    connect(deviceInfo,SIGNAL(ready()),this,SLOT(updateDeviceList()));
++    connect(deviceInfo, &QInputDeviceManager::deviceAdded,this,&QDeclarativeInputDeviceModel::addedDevice);
++    connect(deviceInfo, &QInputDeviceManager::deviceRemoved,this,&QDeclarativeInputDeviceModel::removedDevice);
++}
++
++QDeclarativeInputDeviceModel::~QDeclarativeInputDeviceModel()
++{
++    delete deviceInfo;
++}
++
++QVariant QDeclarativeInputDeviceModel::data(const QModelIndex &index, int role) const
++{
++    switch (role) {
++    case ServiceRole:
++        return QVariant::fromValue(static_cast<QObject *>(inputDevices.value(index.row())));
++        break;
++    case NameRole:
++        return QVariant::fromValue(static_cast<QString>(inputDevices.value(index.row())->name()));
++        break;
++    case DevicePathRole:
++        return QVariant::fromValue(static_cast<QString>(inputDevices.value(index.row())->devicePath()));
++        break;
++    case ButtonsRole:
++        return QVariant::fromValue(static_cast<QList <int> >(inputDevices.value(index.row())->buttons()));
++        break;
++    case SwitchesRole:
++        return QVariant::fromValue(static_cast<QList <int> >(inputDevices.value(index.row())->switches()));
++        break;
++    case RelativeAxisRole:
++        return QVariant::fromValue(static_cast<QList <int> >(inputDevices.value(index.row())->relativeAxis()));
++        break;
++    case AbsoluteAxisRole:
++        return QVariant::fromValue(static_cast<QList <int> >(inputDevices.value(index.row())->absoluteAxis()));
++        break;
++    case TypesRole:
++        return QVariant::fromValue(static_cast<int>(inputDevices.value(index.row())->type()));
++        break;
++    };
++
++    return QVariant();
++}
++
++int QDeclarativeInputDeviceModel::rowCount(const QModelIndex &parent) const
++{
++    Q_UNUSED(parent);
++
++    return inputDevices.count();
++}
++
++int QDeclarativeInputDeviceModel::indexOf(const QString &devicePath) const
++{
++    int idx(-1);
++    Q_FOREACH (QInputDevice *device, inputDevices) {
++        idx++;
++        if (device->devicePath() == devicePath) return idx;
++    }
++
++    return -1;
++}
++
++QInputDevice *QDeclarativeInputDeviceModel::get(int index) const
++{
++    if (index < 0 || index > inputDevices.count())
++        return 0;
++    return inputDevices.value(index);
++}
++
++void QDeclarativeInputDeviceModel::updateDeviceList()
++{
++    QVector <QInputDevice *> newDevices = deviceInfo->deviceListOfType(currentFilter);
++
++    int numNew = newDevices.count();
++
++    for (int i = 0; i < numNew; i++) {
++        int j = inputDevices.indexOf(newDevices.value(i));
++
++        if (j == -1) {
++            beginInsertRows(QModelIndex(), i, i);
++            inputDevices.insert(i, newDevices.value(i));
++            endInsertRows();
++            Q_EMIT countChanged();
++        } 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();
++            Q_EMIT countChanged();
++        } //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();
++        Q_EMIT countChanged();
++    }
++}
++
++void QDeclarativeInputDeviceModel::addedDevice(const QString &devicePath)
++{
++    updateDeviceList();
++    Q_EMIT deviceAdded(devicePath);
++}
++
++void QDeclarativeInputDeviceModel::removedDevice(const QString &devicePath)
++{
++    updateDeviceList();
++    Q_EMIT deviceRemoved(devicePath);
++}
++
++QHash<int,QByteArray> QDeclarativeInputDeviceModel::roleNames() const
++{
++    QHash<int, QByteArray> roles;
++    roles[NameRole] = "name";
++    roles[DevicePathRole] = "devicePath";
++    roles[ButtonsRole] = "buttons";
++    roles[SwitchesRole] = "switches";
++    roles[RelativeAxisRole] = "rAxis";
++    roles[AbsoluteAxisRole] = "aAxis";
++    roles[TypesRole] = "types";
++    return roles;
++}
++
++/*
++ * Returns the currently set device filter.
++ * */
++QInputDevice::InputType QDeclarativeInputDeviceModel::deviceFilter()
++{
++    return currentFilter;
++}
++
++/*
++ * Sets the current  input device filter to filter.
++ * */
++void QDeclarativeInputDeviceModel::setDeviceFilter(QInputDevice::InputType filter)
++{
++    if (filter != currentFilter) {
++        deviceInfo->setDeviceFilter(filter);
++        currentFilter = filter;
++        updateDeviceList();
++        Q_EMIT deviceFilterChanged(filter);
++    }
++}
 === added file 'plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h'
 --- plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h	1970-01-01 00:00:00 +0000
 +++ plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h	2015-11-09 09:23:42 +0000
@@ -0,0 +1,102 @@
++/****************************************************************************
++**
++** 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 QDECLARATIVEINPUTDEVICEMODEL_H
++#define QDECLARATIVEINPUTDEVICEMODEL_H
++
++#include <QObject>
++#include <QAbstractListModel>
++#include "qinputinfo.h"
++
++class QDeclarativeInputDeviceModel : public QAbstractListModel
++{
++    Q_OBJECT
++    Q_DISABLE_COPY(QDeclarativeInputDeviceModel)
++    Q_PROPERTY(QInputDevice::InputType deviceFilter READ deviceFilter WRITE setDeviceFilter NOTIFY deviceFilterChanged)
++
++    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
++
++public:
++    enum ItemRoles {
++        ServiceRole = Qt::UserRole + 1,
++        NameRole,
++        DevicePathRole,
++        ButtonsRole,
++        SwitchesRole,
++        RelativeAxisRole,
++        AbsoluteAxisRole,
++        TypesRole
++    };
++
++    explicit QDeclarativeInputDeviceModel(QObject *parent = 0);
++    virtual ~QDeclarativeInputDeviceModel();
++
++    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
++    int rowCount(const QModelIndex &parent = QModelIndex()) const;
++
++    void setDeviceFilter(QInputDevice::InputType filter);
++    QInputDevice::InputType deviceFilter();
++
++    Q_INVOKABLE int indexOf(const QString &devicePath) const;
++
++    Q_INVOKABLE QInputDevice *get(int index) const;
++    QHash<int, QByteArray> roleNames() const;
++
++Q_SIGNALS:
++    void deviceAdded(const QString &devicePath);
++    void deviceRemoved(const QString &devicePath);
++    void deviceFilterChanged(const QInputDevice::InputType filter);
++    void countChanged();
++
++public Q_SLOTS:
++    void updateDeviceList();
++private:
++    QInputDeviceManager *deviceInfo;
++    QVector<QInputDevice *> inputDevices;
++    QInputDevice::InputType currentFilter;
++
++private Q_SLOTS:
++    void addedDevice(const QString &);
++    void removedDevice(const QString &path);
++
++};
++
++#endif // QDECLARATIVEINPUTDEVICEMODEL_H
 === modified file 'plugins/Unity/InputInfo/qinputinfo.cpp'
 --- plugins/Unity/InputInfo/qinputinfo.cpp	2015-08-19 13:56:21 +0000
 +++ plugins/Unity/InputInfo/qinputinfo.cpp	2015-11-09 09:23:42 +0000
@@ -41,16 +41,25 @@
  #include "qinputinfo.h"
--#if defined(Q_OS_LINUX)
++#if defined(UNITY_MOCKS)
++#include "qinputdeviceinfo_mock_p.h"
++#elif defined(Q_OS_LINUX)
  #include "linux/qinputdeviceinfo_linux_p.h"
  #endif
++Q_GLOBAL_STATIC(QInputDeviceManagerPrivate, inputDeviceManagerPrivate)
++
  QT_BEGIN_NAMESPACE
++QInputDeviceManagerPrivate * QInputDeviceManagerPrivate::instance()
++{
++    QInputDeviceManagerPrivate *priv = inputDeviceManagerPrivate();
++    return priv;
++}
  QInputDevicePrivate::QInputDevicePrivate(QObject *parent) :
      QObject(parent),
--    types(QInputDeviceInfo::Unknown)
++    type(QInputDevice::Unknown)
+ {
+ }
@@ -60,100 +69,202 @@
+ {
+ }
++/*
++ * Returns the name of this input device.
++ */
  QString QInputDevice::name() const
+ {
      return d_ptr->name;
+ }
++/*
++ * Sets the name of this input device to \b name.
++ */
  void QInputDevice::setName(const QString &name)
+ {
      d_ptr->name = name;
+ }
++/*
++ * Returns the device path of this device.
++ */
  QString QInputDevice::devicePath() const
+ {
      return d_ptr->devicePath;
+ }
++/*
++ * Sets the device ppath of this device to /b path.
++ */
  void QInputDevice::setDevicePath(const QString &path)
+ {
      d_ptr->devicePath = path;
+ }
++/*
++ * Returns the number of buttons this device has.
++ */
  QList <int> QInputDevice::buttons() const
+ {
      return d_ptr->buttons;
+ }
++/*
++ * Adds a button
++ */
  void QInputDevice::addButton(int buttonCode)
+ {
      d_ptr->buttons.append(buttonCode);
+ }
++/*
++ * Returns the number of switch of this device.
++ */
  QList <int> QInputDevice::switches() const
+ {
      return d_ptr->switches;
+ }
++/*
++ * Adds a switch
++ */
  void QInputDevice::addSwitch(int switchCode)
+ {
      d_ptr->switches.append(switchCode);
+ }
++/*
++ * Returns a list of the relative axis of this device
++ */
  QList <int> QInputDevice::relativeAxis() const
+ {
      return d_ptr->relativeAxis;
+ }
++/*
++ */
  void QInputDevice::addRelativeAxis(int axisCode)
+ {
      d_ptr->relativeAxis.append(axisCode);
+ }
++/*
++ * Returns a list of the absolute axis of this device
++ */
  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) :
++/*
++ * Returns a QInputDevice::InputTypeFlags of all the types of types.
++ */
++QInputDevice::InputTypeFlags QInputDevice::type() const
++{
++    return d_ptr->type;
++}
++
++/*
++ */
++void QInputDevice::setType(QInputDevice::InputTypeFlags type) //? setTypes?
++{
++    d_ptr->type = type;
++}
++
++QInputDeviceManager::QInputDeviceManager(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, &QInputDeviceInfoPrivate::ready, this, &QInputDeviceInfo::ready);
--}
--
--QVector <QInputDevice *> QInputDeviceInfo::deviceList()
--{
--    return d_ptr->deviceList;
--}
--
--QMap <QString, QInputDevice *> QInputDeviceInfo::deviceMap()
++    d_ptr(inputDeviceManagerPrivate)
++{
++    connect(d_ptr, &QInputDeviceManagerPrivate::deviceAdded,this,&QInputDeviceManager::addedDevice);
++    connect(d_ptr, &QInputDeviceManagerPrivate::deviceRemoved,this,&QInputDeviceManager::deviceRemoved);
++
++    connect(d_ptr,SIGNAL(ready()),this,SIGNAL(ready()));
++}
++
++/*
++ * Returns a QMap of known input devices.
++ */
++QMap <QString, QInputDevice *> QInputDeviceManager::deviceMap()
+ {
      return d_ptr->deviceMap;
+ }
--void QInputDeviceInfo::addedDevice(const QString & devicePath)
++/*
++ */
++void QInputDeviceManager::addedDevice(const QString & devicePath)
+ {
      Q_EMIT deviceAdded(devicePath);
+ }
++/*
++ * Returns a QVector of InputDevices of type filter
++ * */
++QVector <QInputDevice *> QInputDeviceManager::deviceListOfType(QInputDevice::InputType filter)
++{
++    QVector <QInputDevice *> dList;
++    QMapIterator<QString, QInputDevice *> i(d_ptr->deviceMap);
++    while (i.hasNext()) {
++        i.next();
++        if (i.value()->type().testFlag(filter) || filter == QInputDevice::Unknown) {
++            dList.append(i.value());
++        }
++    }
++    return dList;
++}
++
++/*
++ * Returns the number of input devices with the currently set QInputDevice::InputType filter.
++ * If no device filter has been set, returns number of all available input devices.
++ * If filter has not been set, returns all available input devices
++ */
++int QInputDeviceManager::deviceCount() const
++{
++    return deviceCount(static_cast< QInputDevice::InputType >(d_ptr->currentFilter));
++}
++
++/*
++ * Returns the number of input devices of the type filter.
++ */
++int QInputDeviceManager::deviceCount(const QInputDevice::InputType filter) const
++{
++    int dList = 0;
++    QMapIterator<QString, QInputDevice *> i(d_ptr->deviceMap);
++    while (i.hasNext()) {
++        i.next();
++//        qDebug() << i.value()->name() << i.value()->devicePath();
++//        qDebug() << i.value()->type() << i.value()->type().testFlag(filter);
++
++        if (i.value()->type().testFlag(filter)) {
++            dList++;
++        }
++    }
++    return dList;
++}
++
++/*
++ * Returns the currently set device filter.
++ * */
++QInputDevice::InputType QInputDeviceManager::deviceFilter()
++{
++    return d_ptr->currentFilter;
++}
++
++/*
++ * Sets the current  input device filter to filter.
++ * */
++void QInputDeviceManager::setDeviceFilter(QInputDevice::InputType filter)
++{
++    if (filter !=  d_ptr->currentFilter) {
++     d_ptr->currentFilter = filter;
++     Q_EMIT deviceFilterChanged(filter);
++    }
++}
++
  QT_END_NAMESPACE
 === modified file 'plugins/Unity/InputInfo/qinputinfo.h'
 --- plugins/Unity/InputInfo/qinputinfo.h	2015-05-05 11:19:15 +0000
 +++ plugins/Unity/InputInfo/qinputinfo.h	2015-11-09 09:23:42 +0000
@@ -48,15 +48,19 @@
  #include <QSocketNotifier>
  #include <QDebug>
--class QInputDeviceInfoPrivate;
++class QInputDeviceManagerPrivate;
  class QInputDevicePrivate;
  class QInputDevice;
--class QInputDeviceInfoPrivate;
--class QInputDeviceInfo : public QObject
++class QInputDeviceManager;
++
++class QInputDevice : public QObject
+ {
      Q_OBJECT
--    Q_PROPERTY(int deviceCount READ deviceCount)
++    Q_ENUMS(InputType)
++    Q_FLAGS(InputType InputTypeFlags)
++    friend class QInputDeviceManagerPrivate;
++
  public:
      enum InputType {
@@ -69,67 +73,19 @@
          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(); }
--Q_SIGNALS:
--
--    void deviceAdded(const QString & devicePath);
--    void deviceRemoved(const QString & devicePath);
--
--    void ready();
--
--public Q_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 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:
++    Q_DECLARE_FLAGS(InputTypeFlags, InputType)
++
      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;
++    QInputDevice::InputTypeFlags type() const;
--    QInputDeviceInfo::InputTypes types();
--Q_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 &);
@@ -137,7 +93,51 @@
      void addSwitch(int);
      void addRelativeAxis(int);
      void addAbsoluteAxis(int);
--    void setTypes(QInputDeviceInfo::InputTypes);
++    void setType(QInputDevice::InputTypeFlags flags);
++
++};
++
++Q_DECLARE_METATYPE(QInputDevice::InputType)
++Q_DECLARE_METATYPE(QInputDevice::InputTypeFlags)
++
++class QInputDeviceManagerPrivate;
++
++class QInputDeviceManager : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(int deviceCount READ deviceCount NOTIFY deviceCountChanged)
++    Q_PROPERTY(QInputDevice::InputType deviceFilter READ deviceFilter WRITE setDeviceFilter NOTIFY deviceFilterChanged)
++public:
++
++    explicit QInputDeviceManager(QObject *parent = 0);
++
++    int deviceCount() const;
++    int deviceCount(const QInputDevice::InputType filter) const;
++
++    void setDeviceFilter(QInputDevice::InputType filter);
++    QInputDevice::InputType deviceFilter();
++
++    QMap <QString, QInputDevice *> deviceMap();
++    Q_INVOKABLE QVector <QInputDevice *> deviceListOfType(QInputDevice::InputType filter);
++
++Q_SIGNALS:
++
++    void deviceAdded(const QString & devicePath);
++    void deviceRemoved(const QString & devicePath);
++
++    void ready();
++    void deviceCountChanged(int count);
++    void deviceFilterChanged(const QInputDevice::InputType filter);
++
++public Q_SLOTS:
++    void addedDevice(const QString & devicePath);
++
++private:
++    Q_DISABLE_COPY(QInputDeviceManager)
++#if !defined(QT_SIMULATOR)
++    QInputDeviceManagerPrivate *const d_ptr;
++    Q_DECLARE_PRIVATE(QInputDeviceManager)
++#endif
  };
  #endif // QINPUTINFO_H
 === removed directory 'qml/Components/UnityInputInfo'
 === removed file 'qml/Components/UnityInputInfo/UnityInputInfo.qml'
 --- qml/Components/UnityInputInfo/UnityInputInfo.qml	2015-08-13 09:08:15 +0000
 +++ qml/Components/UnityInputInfo/UnityInputInfo.qml	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
--/*
-- * Copyright 2015 Canonical Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--pragma Singleton
--
--import QtQuick 2.4
--import Unity.InputInfo 0.1
--// Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471
--import Ubuntu.Components 1.3
--
--Item {
--    id: root
--    readonly property alias mice: priv.miceCount
--    readonly property alias keyboards: priv.keyboardCount
--
--    property alias inputInfo: inputInfo
--
--    QtObject {
--        id: priv
--
--        property var mice: []
--        property var keyboards: []
--
--        property int miceCount: 0
--        property int keyboardCount: 0
--
--        function addMouse(devicePath) {
--            mice.push(devicePath);
--            miceCount++;
--        }
--
--        function addKeyboard(devicePath) {
--            keyboards.push(devicePath);
--            keyboardCount++;
--        }
--
--        function removeDevice(devicePath) {
--            for (var i = 0; i < priv.mice.length; i++) {
--                if (priv.mice[i] == devicePath) {
--                    priv.mice.splice(i, 1);
--                    priv.miceCount--;
--                }
--            }
--            for (var i = 0; i < priv.keyboards.length; i++) {
--                if (priv.keyboards[i] == devicePath) {
--                    priv.keyboards.splice(i, 1);
--                    priv.keyboardCount--;
--                }
--            }
--        }
--    }
--
--    InputDeviceInfo {
--        id: inputInfo
--        objectName: "inputDeviceInfo"
--
--        onNewDevice: {
--            var device = inputInfo.get(inputInfo.indexOf(devicePath));
--            if (device === null) {
--                return;
--            }
--
--            var hasMouse = (device.types & InputInfo.Mouse) == InputInfo.Mouse
--            var hasTouchpad = (device.types & InputInfo.TouchPad) == InputInfo.TouchPad
--            var hasKeyboard = (device.types & InputInfo.Keyboard) == InputInfo.Keyboard
--
--            if (hasMouse || hasTouchpad) {
--                priv.addMouse(devicePath);
--            } else if (hasKeyboard) {
--                // Only accepting keyboards that do not claim to be a mouse too
--                // This will be a bit buggy for real hybrid devices, but doesn't
--                // fall for Microsoft mice that claim to be Keyboards too.
--                priv.addKeyboard(devicePath)
--            }
--        }
--        onDeviceRemoved: {
--            priv.removeDevice(devicePath)
--        }
--    }
--}
 === removed file 'qml/Components/UnityInputInfo/qmldir'
 --- qml/Components/UnityInputInfo/qmldir	2015-06-23 16:36:51 +0000
 +++ qml/Components/UnityInputInfo/qmldir	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
--singleton UnityInputInfo 1.0 UnityInputInfo.qml
 === modified file 'qml/OrientedShell.qml'
 --- qml/OrientedShell.qml	2015-11-04 14:57:45 +0000
 +++ qml/OrientedShell.qml	2015-11-09 09:23:42 +0000
@@ -16,13 +16,12 @@
  import QtQuick 2.4
  import QtQuick.Window 2.2
++import Unity.InputInfo 0.1
  import Unity.Session 0.1
  import GSettings 1.0
  import "Components"
--import "Components/UnityInputInfo"
  import "Rotation"
--// Backup Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471
--// in case we remove the UnityInputInfo import
++// Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471
  import Ubuntu.Components 1.3
  Rectangle {
@@ -64,6 +63,16 @@
      property bool orientationLocked: OrientationLock.enabled
      property var orientationLock: OrientationLock
++    InputDeviceModel {
++        id: miceModel
++        deviceFilter: InputInfo.Mouse
++    }
++
++    InputDeviceModel {
++        id: keyboardsModel
++        deviceFilter: InputInfo.Keyboard
++    }
++
      property int orientation
      onPhysicalOrientationChanged: {
          if (!orientationLocked) {
@@ -83,7 +92,7 @@
+         }
          // We need to manually update this on startup as the binding
          // below doesn't seem to have any effect at that stage
--        oskSettings.stayHidden = UnityInputInfo.keyboards > 0
++        oskSettings.stayHidden = keyboardsModel.count > 0
          oskSettings.disableHeight = shell.usageScenario == "desktop"
+     }
@@ -96,7 +105,7 @@
      Binding {
          target: oskSettings
          property: "stayHidden"
--        value: UnityInputInfo.keyboards > 0
++        value: keyboardsModel.count > 0
+     }
      Binding {
@@ -174,7 +183,7 @@
          nativeWidth: root.width
          nativeHeight: root.height
          mode: applicationArguments.mode
--        hasMouse: UnityInputInfo.mice > deviceConfiguration.ignoredMice
++        hasMouse: miceModel.count > deviceConfiguration.ignoredMice
          // TODO: Factor in the connected input devices (eg: physical keyboard, mouse, touchscreen),
          //       what's the output device (eg: big TV, desktop monitor, phone display), etc.
@@ -188,7 +197,7 @@
                      return "tablet";
+                 }
              } else { // automatic
--                if (UnityInputInfo.mice > deviceConfiguration.ignoredMice) {
++                if (miceModel.count > deviceConfiguration.ignoredMice) {
                      return "desktop";
                  } else {
                      return deviceConfiguration.category;
 === modified file 'tests/mocks/Unity/InputInfo/CMakeLists.txt'
 --- tests/mocks/Unity/InputInfo/CMakeLists.txt	2015-06-30 11:51:25 +0000
 +++ tests/mocks/Unity/InputInfo/CMakeLists.txt	2015-11-09 09:23:42 +0000
@@ -9,12 +9,17 @@
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_BINARY_DIR}
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/InputInfo/
+ )
++add_definitions(-DUNITY_MOCKS)
++
  set(MockInputInfo_SOURCES
      plugin.cpp
--    mockqinputinfo.cpp
--    mockqdeclarativeinputdeviceinfo.cpp
++    qinputdeviceinfo_mock.cpp
++    mockcontroller.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/InputInfo/qinputinfo.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cpp
+ )
  add_library(MockInputInfo SHARED
 === added file 'tests/mocks/Unity/InputInfo/mockcontroller.cpp'
 --- tests/mocks/Unity/InputInfo/mockcontroller.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/InputInfo/mockcontroller.cpp	2015-11-09 09:23:42 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "mockcontroller.h"
++
++#include "qinputdeviceinfo_mock_p.h"
++
++MockController::MockController(QObject *parent):
++    QObject(parent)
++{
++
++}
++
++QInputDevice *MockController::addMockDevice(const QString &devicePath, QInputDevice::InputType type)
++{
++    return QInputDeviceManagerPrivate::instance()->addMockDevice(devicePath, type);
++}
++
++void MockController::removeDevice(const QString &devicePath)
++{
++    QInputDeviceManagerPrivate::instance()->removeDevice(devicePath);
++}
 === added file 'tests/mocks/Unity/InputInfo/mockcontroller.h'
 --- tests/mocks/Unity/InputInfo/mockcontroller.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/InputInfo/mockcontroller.h	2015-11-09 09:23:42 +0000
@@ -0,0 +1,34 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef MOCKCONTROLLER_H
++#define MOCKCONTROLLER_H
++
++#include <QObject>
++#include "qinputinfo.h"
++
++class MockController: public QObject
++{
++    Q_OBJECT
++public:
++    MockController(QObject *parent = 0);
++    ~MockController() = default;
++
++    Q_INVOKABLE QInputDevice* addMockDevice(const QString &devicePath, QInputDevice::InputType type);
++    Q_INVOKABLE void removeDevice(const QString &devicePath);
++};
++
++#endif
 === removed file 'tests/mocks/Unity/InputInfo/mockqdeclarativeinputdeviceinfo.cpp'
 --- tests/mocks/Unity/InputInfo/mockqdeclarativeinputdeviceinfo.cpp	2015-06-23 17:40:03 +0000
 +++ tests/mocks/Unity/InputInfo/mockqdeclarativeinputdeviceinfo.cpp	1970-01-01 00:00:00 +0000
@@ -1,173 +0,0 @@
--/****************************************************************************
--**
--** Copyright (C) 2015 Jolla.
--** Copyright (C) 2015 Canonical Ltd.
--** 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 "mockqdeclarativeinputdeviceinfo_p.h"
--
--QDeclarativeInputDeviceInfo::QDeclarativeInputDeviceInfo(QObject *parent) :
--    QAbstractListModel(parent),
--    deviceInfo(new QInputDeviceInfo)
--{
--    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::addMockMouse()
--{
--    deviceInfo->addMockDevice(QInputDeviceInfo::Mouse);
--}
--
--void QDeclarativeInputDeviceInfo::addMockKeyboard()
--{
--    deviceInfo->addMockDevice(QInputDeviceInfo::Keyboard);
--}
--
--void QDeclarativeInputDeviceInfo::removeMockMouse()
--{
--    for (int i = 0; i < inputDevices.count(); i++) {
--        if (inputDevices.at(i)->types().testFlag(QInputDeviceInfo::Mouse)) {
--            deviceInfo->removeMockDevice(i);
--            return;
--        }
--    }
--}
--
--void QDeclarativeInputDeviceInfo::removeMockKeyboard()
--{
--    for (int i = 0; i < inputDevices.count(); i++) {
--        if (inputDevices.at(i)->types().testFlag(QInputDeviceInfo::Keyboard)) {
--            deviceInfo->removeMockDevice(i);
--            return;
--        }
--    }
--}
--
--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;
--}
 === removed file 'tests/mocks/Unity/InputInfo/mockqdeclarativeinputdeviceinfo_p.h'
 --- tests/mocks/Unity/InputInfo/mockqdeclarativeinputdeviceinfo_p.h	2015-06-23 17:40:03 +0000
 +++ tests/mocks/Unity/InputInfo/mockqdeclarativeinputdeviceinfo_p.h	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
--/****************************************************************************
--**
--** Copyright (C) 2015 Jolla.
--** Copyright (C) 2015 Canoncal Ltd.
--** 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 "mockqinputinfo.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;
--
--    // For testing
--    Q_INVOKABLE void addMockMouse();
--    Q_INVOKABLE void addMockKeyboard();
--    Q_INVOKABLE void removeMockMouse();
--    Q_INVOKABLE void removeMockKeyboard();
--
--Q_SIGNALS:
--    void newDevice(const QString &devicePath);
--    void deviceRemoved(const QString &devicePath);
--
--public Q_SLOTS:
--    void updateDeviceList();
--
--private:
--    QInputDeviceInfo *deviceInfo;
--    QVector<QInputDevice *> inputDevices;
--private Q_SLOTS:
--    void addedDevice(const QString &);
--    void removedDevice(const QString &path);
--
--};
--
--#endif // QDECLARATIVEINPUTDEVICEINFO_H
 === removed file 'tests/mocks/Unity/InputInfo/mockqinputinfo.cpp'
 --- tests/mocks/Unity/InputInfo/mockqinputinfo.cpp	2015-06-23 17:40:03 +0000
 +++ tests/mocks/Unity/InputInfo/mockqinputinfo.cpp	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
--/****************************************************************************
--**
--** Copyright (C) 2015 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 "mockqinputinfo.h"
--
--
--QInputDevice::QInputDevice(QObject *parent) :
--    QObject(parent)
--{
--}
--
--QString QInputDevice::name() const
--{
--    return m_name;
--}
--
--void QInputDevice::setName(const QString &name)
--{
--    m_name = name;
--}
--
--QString QInputDevice::devicePath() const
--{
--    return m_devicePath;
--}
--
--void QInputDevice::setDevicePath(const QString &path)
--{
--    m_devicePath = path;
--}
--
--QList <int> QInputDevice::buttons() const
--{
--    return {1, 2 ,3};
--}
--
--QList <int> QInputDevice::switches() const
--{
--    return {};
--}
--
--QList <int> QInputDevice::relativeAxis() const
--{
--    return {};
--}
--
--QList <int> QInputDevice::absoluteAxis() const
--{
--    return {};
--}
--
--QInputDeviceInfo::InputTypes QInputDevice::types()
--{
--    return m_types;
--}
--
--void QInputDevice::setTypes(QInputDeviceInfo::InputTypes types)
--{
--    m_types = types;
--}
--
--QInputDeviceInfo::QInputDeviceInfo(QObject *parent) :
--    QObject(parent)
--{
--}
--
--QVector <QInputDevice *> QInputDeviceInfo::deviceList()
--{
--    return m_list;
--}
--
--void QInputDeviceInfo::removeMockDevice(int index)
--{
--    QInputDevice *device = m_list.takeAt(index);
--    Q_EMIT deviceRemoved(device->devicePath());
--    device->deleteLater();
--}
--
--void QInputDeviceInfo::addMockDevice(QInputDeviceInfo::InputType inputType)
--{
--    QInputDevice *device = new QInputDevice(this);
--    device->setDevicePath("/mock/device/" + QString::number(m_counter++));
--    device->setTypes({inputType});
--    m_list.append(device);
--    Q_EMIT deviceAdded(device->devicePath());
--}
 === removed file 'tests/mocks/Unity/InputInfo/mockqinputinfo.h'
 --- tests/mocks/Unity/InputInfo/mockqinputinfo.h	2015-06-23 17:40:03 +0000
 +++ tests/mocks/Unity/InputInfo/mockqinputinfo.h	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
--/****************************************************************************
--**
--** Copyright (C) 2015 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 MOCKQINPUTINFO_H
--#define MOCKQINPUTINFO_H
--
--#include <QObject>
--#include <QVector>
--#include <QMap>
--#include <QSocketNotifier>
--#include <QDebug>
--
--class QInputDevicePrivate;
--class QInputDevice;
--
--class QInputDeviceInfoPrivate;
--class 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();
--
--    int deviceCount() { return deviceList().count(); }
--
--    Q_INVOKABLE void addMockDevice(InputType inputType);
--    Q_INVOKABLE void removeMockDevice(int index);
--
--Q_SIGNALS:
--
--    void deviceAdded(const QString & devicePath);
--    void deviceRemoved(const QString & devicePath);
--
--private:
--    QVector<QInputDevice*> m_list;
--
--    int m_counter = 0;
--};
--
--class 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();
--Q_SIGNALS:
--    void nameChanged();
--    void devicePathChanged();
--    void buttonsChanged();
--    void switchesChanged();
--    void relativeAxisChanged();
--    void absoluteAxisChanged();
--    void typesChanged();
--private:
--    void setName(const QString &name);
--    void setTypes(QInputDeviceInfo::InputTypes types);
--    void setDevicePath(const QString &path);
--
--    QString m_name;
--    QInputDeviceInfo::InputTypes m_types;
--    QString m_devicePath;
--
--    friend class QInputDeviceInfo;
--};
--
--#endif // MOCKQINPUTINFO_H
 === modified file 'tests/mocks/Unity/InputInfo/plugin.cpp'
 --- tests/mocks/Unity/InputInfo/plugin.cpp	2015-06-23 17:40:03 +0000
 +++ tests/mocks/Unity/InputInfo/plugin.cpp	2015-11-09 09:23:42 +0000
@@ -15,18 +15,32 @@
   */
  // Qt
--#include <QtQml/qqml.h>
++#include <QtQml>
  // self
  #include "plugin.h"
  // local
--#include "mockqdeclarativeinputdeviceinfo_p.h"
++#include "qdeclarativeinputdevicemodel_p.h"
++#include "mockcontroller.h"
++
++static QObject *backendProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
++{
++    Q_UNUSED(engine)
++    Q_UNUSED(scriptEngine)
++    return new MockController(engine);
++}
  void InputInfoPlugin::registerTypes(const char *uri)
+ {
      int major = 0;
      int minor = 1;
--    qmlRegisterType<QDeclarativeInputDeviceInfo>(uri, major, minor, "InputDeviceInfo");
++    qmlRegisterType<QDeclarativeInputDeviceModel>(uri, major, minor, "InputDeviceModel");
      qmlRegisterType<QInputDevice>(uri, major, minor, "InputInfo");
++
++    // We can't register the MockInputDeviceBackend directly because QML wants to delete singletons on its own
++    // Given that MockInputDeviceBackend is a Q_GLOBAL_STATIC it will also be cleaned up by other Qt internals
++    // This leads to a double-free on shutdown. So let's add a proxy to control the MockBackend through QML:
++    // MockController
++    qmlRegisterSingletonType<MockController>(uri, major, minor, "MockInputDeviceBackend", backendProvider);
+ }
 === added file 'tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp'
 --- tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp	2015-11-09 09:23:42 +0000
@@ -0,0 +1,52 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "qinputdeviceinfo_mock_p.h"
++
++#include <QTimer>
++#include <QDebug>
++
++QInputDeviceManagerPrivate::QInputDeviceManagerPrivate(QObject *parent) :
++    QObject(parent),
++    currentFilter(QInputDevice::Unknown)
++{
++    QTimer::singleShot(1, SIGNAL(ready()));
++}
++
++QInputDeviceManagerPrivate::~QInputDeviceManagerPrivate()
++{
++}
++
++QInputDevice *QInputDeviceManagerPrivate::addMockDevice(const QString &devicePath, QInputDevice::InputType type)
++{
++    QInputDevice *inputDevice = new QInputDevice(this);
++    inputDevice->setDevicePath(devicePath);
++    inputDevice->setName("Mock Device " + devicePath);
++    inputDevice->setType(type);
++    deviceMap.insert(devicePath, inputDevice);
++    Q_EMIT deviceAdded(devicePath);
++    return inputDevice;
++}
++
++void QInputDeviceManagerPrivate::removeDevice(const QString &path)
++{
++    Q_FOREACH (const QString devicePath, deviceMap.keys()) {
++        if (devicePath.contains(path)) {
++            deviceMap.remove(devicePath);
++            Q_EMIT deviceRemoved(devicePath);
++        }
++    }
++}
 === added file 'tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock_p.h'
 --- tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock_p.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock_p.h	2015-11-09 09:23:42 +0000
@@ -0,0 +1,58 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef QINPUTDEVICEINFO_MOCK_H
++#define QINPUTDEVICEINFO_MOCK_H
++
++#include <QObject>
++#include "qinputinfo.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;
++    QInputDevice::InputTypeFlags type;
++};
++
++class QInputDeviceManagerPrivate : public QObject
++{
++    Q_OBJECT
++public:
++    explicit QInputDeviceManagerPrivate(QObject *parent = 0);
++    ~QInputDeviceManagerPrivate();
++    QVector <QInputDevice *> deviceList;
++    QMap <QString, QInputDevice *> deviceMap;
++    static QInputDeviceManagerPrivate * instance();
++    QInputDevice::InputType currentFilter;
++
++    Q_INVOKABLE QInputDevice* addMockDevice(const QString &devicePath, QInputDevice::InputType type);
++    Q_INVOKABLE void removeDevice(const QString &devicePath);
++
++Q_SIGNALS:
++    void deviceAdded(const QString &);
++    void deviceRemoved(const QString &);
++    void ready();
++};
++
++#endif // QINPUTDEVICEINFO_MOCK_H
 === modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
 --- tests/qmltests/Notifications/tst_Notifications.qml	2015-09-29 12:28:10 +0000
 +++ tests/qmltests/Notifications/tst_Notifications.qml	2015-11-09 09:23:42 +0000
@@ -19,7 +19,6 @@
  import QtTest 1.0
  import ".."
  import "../../../qml/Notifications"
--import "../../../qml/Components/UnityInputInfo"
  import Ubuntu.Components 1.3
  import Unity.Test 0.1
  import Unity.Notifications 1.0
@@ -188,7 +187,7 @@
                  anchors.fill: parent
                  model: mockModel
--                hasMouse: UnityInputInfo.mice > 0 // for testing, we add/remove only a mock mouse
++                hasMouse: false
+             }
+         }
@@ -264,9 +263,9 @@
                          id: fakeMouseCB
                          onClicked: {
                              if (checked) {
--                                UnityInputInfo.inputInfo.addMockMouse();
++                                notifications.hasMouse = true;
                              } else {
--                                UnityInputInfo.inputInfo.removeMockMouse();
++                                notifications.hasMouse = false;
+                             }
+                         }
+                     }
@@ -695,7 +694,7 @@
+             }
              function test_clickToClose_data() { // reuse the data
--                UnityInputInfo.inputInfo.addMockMouse();
++                notifications.hasMouse = true;
                  return test_NotificationRenderer_data();
+             }
@@ -726,7 +725,7 @@
+             }
              function cleanupTestCase() {
--                UnityInputInfo.inputInfo.removeMockMouse();
++                notifications.hasMouse = false;
+             }
+         }
+     }
 === modified file 'tests/qmltests/Notifications/tst_SwipeToAct.qml'
 --- tests/qmltests/Notifications/tst_SwipeToAct.qml	2015-09-29 12:28:10 +0000
 +++ tests/qmltests/Notifications/tst_SwipeToAct.qml	2015-11-09 09:23:42 +0000
@@ -19,7 +19,6 @@
  import QtTest 1.0
  import ".."
  import "../../../qml/Notifications"
--import "../../../qml/Components/UnityInputInfo"
  import Ubuntu.Components 1.3
  import Unity.Test 0.1
  import Unity.Notifications 1.0
@@ -112,7 +111,7 @@
                  anchors.fill: parent
                  model: mockModel
--                hasMouse: UnityInputInfo.mice > 0 // for testing, we add/remove only a mock mouse
++                hasMouse: false
+             }
+         }
@@ -152,9 +151,9 @@
                          id: fakeMouseCB
                          onClicked: {
                              if (checked) {
--                                UnityInputInfo.inputInfo.addMockMouse();
++                                notifications.hasMouse = true;
                              } else {
--                                UnityInputInfo.inputInfo.removeMockMouse();
++                                notifications.hasMouse = false;
+                             }
+                         }
+                     }
@@ -301,7 +300,7 @@
+                     }
                      // add a mock mouse, test clicking the left/right buttons
--                    UnityInputInfo.inputInfo.addMockMouse();
++                    notifications.hasMouse = true;
                      var leftButton = findChild(swipeButton, "leftButton");
                      var rightButton = findChild(swipeButton, "rightButton");
@@ -316,7 +315,7 @@
                          compare(actionSpy.signalArguments[0][0], data.actions.data(1, ActionModel.RoleActionId), "got wrong id for negative action");
                          actionSpy.clear();
+                     }
--                    UnityInputInfo.inputInfo.removeMockMouse();
++                    notifications.hasMouse = false;
+                 }
+             }
+         }
 === modified file 'tests/qmltests/tst_OrientedShell.qml'
 --- tests/qmltests/tst_OrientedShell.qml	2015-11-04 14:57:45 +0000
 +++ tests/qmltests/tst_OrientedShell.qml	2015-11-09 09:23:42 +0000
@@ -26,7 +26,6 @@
  import Unity.InputInfo 0.1
  import "../../qml"
--import "../../qml/Components/UnityInputInfo"
  Rectangle {
      id: root
@@ -55,6 +54,15 @@
          property bool stayHidden: false;
+     }
++    InputDeviceModel {
++        id: miceModel
++        deviceFilter: InputInfo.Mouse
++    }
++    InputDeviceModel {
++        id: keyboardsModel
++        deviceFilter: InputInfo.Keyboard
++    }
++
      property int physicalOrientation0
      property int physicalOrientation90
      property int physicalOrientation180
@@ -328,14 +336,14 @@
                      text: "Add mouse"
                      activeFocusOnPress: false
                      onClicked: {
--                        UnityInputInfo.inputInfo.addMockMouse()
++                        MockInputDeviceBackend.addMockDevice("/mouse" + miceModel.count, InputInfo.Mouse)
+                     }
+                 }
                  Button {
                      text: "Remove mouse"
                      activeFocusOnPress: false
                      onClicked: {
--                        UnityInputInfo.inputInfo.removeMockMouse()
++                        MockInputDeviceBackend.removeDevice("/mouse" + (miceModel.count - 1))
+                     }
+                 }
+             }
@@ -344,14 +352,14 @@
                      text: "Add kbd"
                      activeFocusOnPress: false
                      onClicked: {
--                        UnityInputInfo.inputInfo.addMockKeyboard()
++                        MockInputDeviceBackend.addMockDevice("/kbd" + keyboardsModel.count, InputInfo.Keyboard)
+                     }
+                 }
                  Button {
                      activeFocusOnPress: false
                      text: "Remove kbd"
                      onClicked: {
--                        UnityInputInfo.inputInfo.removeMockKeyboard()
++                        MockInputDeviceBackend.removeDevice("/kbd" + (keyboardsModel.count - 1))
+                     }
+                 }
+             }
@@ -976,19 +984,19 @@
              tryCompare(shell, "usageScenario", "phone");
              tryCompare(mockOskSettings, "stayHidden", false);
--            UnityInputInfo.inputInfo.addMockKeyboard();
++            MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);
              tryCompare(shell, "usageScenario", "phone");
              tryCompare(mockOskSettings, "stayHidden", true);
--            UnityInputInfo.inputInfo.addMockMouse();
++            MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);
              tryCompare(shell, "usageScenario", "desktop");
              tryCompare(mockOskSettings, "stayHidden", true);
--            UnityInputInfo.inputInfo.removeMockKeyboard();
++            MockInputDeviceBackend.removeDevice("/kbd0");
              tryCompare(shell, "usageScenario", "desktop");
              tryCompare(mockOskSettings, "stayHidden", false);
--            UnityInputInfo.inputInfo.removeMockMouse();
++            MockInputDeviceBackend.removeDevice("/mouse0");
              tryCompare(shell, "usageScenario", "phone");
              tryCompare(mockOskSettings, "stayHidden", false);
+         }