Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support2 into lp:ubuntu-docviewer-app

[Stefano Verzegnassi]

Better desktop/pocket-desktop support, by detecting the number of mice and touchpads connected to the device. This uses QInputInfo, available in the Qt snapshots - imported version from unity 8 trunk (rev.2080).

WORKAROUND: This makes new BottomEdge component fully working on desktop

Better desktop/pocket-desktop support, by detecting the number of mice and touchpads connected to the device. This uses QInputInfo, available in the Qt snapshots - imported version from unity 8 trunk (rev.2080).

WORKAROUND: This makes new BottomEdge component fully working on desktop

[Stefano Verzegnassi (verzegnassi-stefano)]

Moved the MP to a new branch

review: Abstain

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:289
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/212/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/543/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/212/rebuild

review: Needs Fixing (continuous-integration)

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support2]

290. By Stefano Verzegnassi on 2016-02-03

Forgot to 'bzr add' new files

291. By Stefano Verzegnassi on 2016-02-03

...and again

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:291
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/214/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/544/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/214/rebuild

review: Needs Fixing (continuous-integration)

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support2]

292. By Stefano Verzegnassi on 2016-02-03

* Updated README
* Use 'unconfined' template. Apparently there's no other way to get this working...

[Stefano Verzegnassi (verzegnassi-stefano)]

Ok, this requires an unconfined AppArmor template.

No urge to add the missing packages to Jenkins, nor to merge this branch. I hope the bottom edge will be fixed upstream, because it's not currently usable with a mouse (unless we decide to run unconfined)

review: Needs Fixing

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:292
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/215/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/546/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/215/rebuild

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I'm concerned about the unconfined nature of this. Normally for some core apps where there's no other way, I'd probably be okay with this. However, as we're now carrying all of LibreOffice, I'm concerned that we're opening ourselves up by having an unconfined copy of LibreOffice potentially able to be exploited by a dodgy document. That's quite a significantly sized attack surface. Especially when we don't generally roll out new builds of the docviewer with security updated LibreOffice builds very regularly.

What do you think? Should we push this feature back until we have a non-unconfined solution?

Should we bring this up with platform team to find some other way to do this?

review: Needs Fixing

[Stefano Verzegnassi (verzegnassi-stefano)]

I think so too.
To be fair, we shouldn't have exceptions for accessing to the user's folders too, because of this.

Ideally the platform should provide some service that creates a database with a list of documents, and docviewer should be authorized to access only that database, by default.
When the application asks to access to a specific file, content-hub should mediate the request and ensure that only the single file (or a copy of that file) is accessible.

Anyway, I created this branch a month ago because I thought we were able to release a new version in the store earlier. Also, it wasn't meant to require an unconfined template, but then I discovered that it was broken on the UT platform.

So we can reject this merge proposal.
Let's wait for a fix in the ubuntu-sdk project, it should come soon I guess...

https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/device_detection/+merge/284282

P.S. If you can ask to the platform team when they expect to release the fix, that would be great. Anyway, all the SDK apps (except addressbook-app) are in the same situation, so I'm not that much worried.

Unmerged revisions

292. By Stefano Verzegnassi on 2016-02-03

* Updated README
* Use 'unconfined' template. Apparently there's no other way to get this working...

291. By Stefano Verzegnassi on 2016-02-03

...and again

290. By Stefano Verzegnassi on 2016-02-03

Forgot to 'bzr add' new files

289. By Stefano Verzegnassi on 2016-02-03

Added ConvergenceUtils singleton. Improved desktop/pocket desktop support.

=== modified file 'README-Developers.md'
--- README-Developers.md	2015-12-21 13:06:52 +0000
+++ README-Developers.md	2016-02-03 14:19:17 +0000
@@ -19,11 +19,14 @@
 * Install Qt5 private development files:
     sudo apt install qtdeclarative5-private-dev qtbase5-private-dev
 
+* Install development files for convergence support:
+    sudo apt install libudev-dev libevdev-dev
+
 * If you want to compile an arm click package, you need to install that package
   to the arm compilation environment. For example when using QtCreator for
   Ubuntu Touch, open Options -> Ubuntu -> Maintain, and then enter:
 
-    apt install libpoppler-qt5-dev:armhf qtdeclarative5-private-dev:armhf qtbase5-private-dev:armhf
+    apt install libpoppler-qt5-dev:armhf qtdeclarative5-private-dev:armhf qtbase5-private-dev:armhf libudev-dev:armhf libevdev-dev:armhf
 
 LibreOffice viewer support
 ==========================

=== modified file 'click/docviewer.apparmor'
--- click/docviewer.apparmor	2016-01-29 12:23:24 +0000
+++ click/docviewer.apparmor	2016-02-03 14:19:17 +0000
@@ -13,5 +13,6 @@
         "@{HOME}/Documents/",
         "/media/*/*/[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt][Ss]/"
     ],
-    "policy_version": 1.3
-}
\ No newline at end of file
+    "policy_version": 1.3,
+    "template": "unconfined"
+}

=== modified file 'debian/control'
--- debian/control	2016-01-14 21:33:47 +0000
+++ debian/control	2016-02-03 14:19:17 +0000
@@ -17,7 +17,9 @@
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-private-dev,
                qtbase5-private-dev,
-               qtdeclarative5-test-plugin
+               qtdeclarative5-test-plugin,
+               libudev-dev,
+               libevdev-dev,
 Standards-Version: 3.9.6
 Section: misc
 Homepage: https://launchpad.net/ubuntu-docviewer-app

=== modified file 'src/app/qml/common/ContentHubProxy.qml'
--- src/app/qml/common/ContentHubProxy.qml	2015-10-10 12:03:30 +0000
+++ src/app/qml/common/ContentHubProxy.qml	2016-02-03 14:19:17 +0000
@@ -53,11 +53,11 @@
                 for (var i=0; i<activeTransfer.items.length; i++) {
                     var sourcePath = internal.getPathFromUrl(activeTransfer.items[i].url)
 
-                    if (DocumentViewer.isFileSupported(sourcePath)) {
-                        var documentsLocation = DocumentViewer.getXdgDocumentsLocation()
+                    if (FileUtils.isFileSupported(sourcePath)) {
+                        var documentsLocation = FileUtils.getXdgDocumentsLocation()
 
                         // Check if we have already imported the same document in the past.
-                        var earlierImportedFile = DocumentViewer.checkIfFileAlreadyImported(sourcePath, [documentsLocation])
+                        var earlierImportedFile = FileUtils.checkIfFileAlreadyImported(sourcePath, [documentsLocation])
                         if (earlierImportedFile.length > 0) {
                             // Document has been already imported in the past.
                             // Append the path of the earlier copy of the
@@ -65,7 +65,7 @@
                             importedDocsModel.append({ path: earlierImportedFile })
                         } else {
                             // No document has been found, so we can safely copy it.
-                            var destPath = DocumentViewer.buildDestinationPath(documentsLocation, sourcePath);
+                            var destPath = FileUtils.buildDestinationPath(documentsLocation, sourcePath);
 
                             internal.importDocument(sourcePath, destPath)
                         }
@@ -120,7 +120,7 @@
         }
 
         function importDocument(sourcePath, destPath) {
-            DocumentViewer.copy(sourcePath, destPath)
+            FileUtils.copy(sourcePath, destPath)
             importedDocsModel.append({ path: destPath })
         }
 

=== modified file 'src/app/qml/common/DetailsPage.qml'
--- src/app/qml/common/DetailsPage.qml	2015-12-27 12:10:06 +0000
+++ src/app/qml/common/DetailsPage.qml	2016-02-03 14:19:17 +0000
@@ -40,12 +40,12 @@
 
             SubtitledListItem {
                 text: i18n.tr("File")
-                subText: DocumentViewer.getFileNameFromPath(file.path)
+                subText: FileUtils.getFileNameFromPath(file.path)
             }
 
             SubtitledListItem {
                 text: i18n.tr("Location")
-                subText: DocumentViewer.getCanonicalPath(file.path)
+                subText: FileUtils.getCanonicalPath(file.path)
             }
 
             SubtitledListItem {

=== modified file 'src/app/qml/common/PickImportedDialog.qml'
--- src/app/qml/common/PickImportedDialog.qml	2015-12-26 18:27:13 +0000
+++ src/app/qml/common/PickImportedDialog.qml	2016-02-03 14:19:17 +0000
@@ -40,7 +40,7 @@
             }
 
             Label {
-                text: DocumentViewer.getFileBaseNameFromPath(model.path)
+                text: FileUtils.getFileBaseNameFromPath(model.path)
                 anchors {
                     left: parent.left; right: parent.right
                     margins: units.gu(2)

=== modified file 'src/app/qml/loView/LOViewDefaultHeader.qml'
--- src/app/qml/loView/LOViewDefaultHeader.qml	2015-11-30 12:12:10 +0000
+++ src/app/qml/loView/LOViewDefaultHeader.qml	2016-02-03 14:19:17 +0000
@@ -73,7 +73,7 @@
             Layout.preferredHeight: units.gu(4)
 
             view: targetPage.contentItem.loView
-            visible: targetPage.contentItem && (DocumentViewer.desktopMode || mainView.wideWindow)
+            visible: targetPage.contentItem && (ConvergenceUtils.desktopMode || mainView.wideWindow)
         }
     }
 

=== modified file 'src/app/qml/loView/LOViewPage.qml'
--- src/app/qml/loView/LOViewPage.qml	2016-01-29 12:12:54 +0000
+++ src/app/qml/loView/LOViewPage.qml	2016-02-03 14:19:17 +0000
@@ -32,7 +32,7 @@
     property bool isTextDocument: loPage.contentItem && (loPage.contentItem.loDocument.documentType === LibreOffice.Document.TextDocument)
     property bool isSpreadsheet: loPage.contentItem && (loPage.contentItem.loDocument.documentType === LibreOffice.Document.SpreadsheetDocument)
 
-    title: DocumentViewer.getFileBaseNameFromPath(file.path);
+    title: FileUtils.getFileBaseNameFromPath(file.path);
     flickable: isTextDocument ? loPage.contentItem.loView : null
 
     splashScreen: Splashscreen { }

=== modified file 'src/app/qml/pdfView/PdfPresentation.qml'
--- src/app/qml/pdfView/PdfPresentation.qml	2016-01-23 12:34:25 +0000
+++ src/app/qml/pdfView/PdfPresentation.qml	2016-02-03 14:19:17 +0000
@@ -24,7 +24,7 @@
     property var poppler
     property bool isPresentation: true
     anchors.fill: parent
-    title: DocumentViewer.getFileBaseNameFromPath(poppler.path)
+    title: FileUtils.getFileBaseNameFromPath(poppler.path)
     focus: true
 
     header: PageHeader {

=== modified file 'src/app/qml/pdfView/PdfView.qml'
--- src/app/qml/pdfView/PdfView.qml	2016-01-29 12:23:24 +0000
+++ src/app/qml/pdfView/PdfView.qml	2016-02-03 14:19:17 +0000
@@ -26,7 +26,7 @@
 
 Page {
     id: pdfPage
-    title: DocumentViewer.getFileBaseNameFromPath(file.path)
+    title: FileUtils.getFileBaseNameFromPath(file.path)
 
     header: PageHeader {
         flickable: pdfView

=== modified file 'src/app/qml/textView/TextView.qml'
--- src/app/qml/textView/TextView.qml	2015-12-26 18:27:13 +0000
+++ src/app/qml/textView/TextView.qml	2016-02-03 14:19:17 +0000
@@ -23,7 +23,7 @@
 
 Page {
     id: textPage
-    title: DocumentViewer.getFileBaseNameFromPath(file.path)
+    title: FileUtils.getFileBaseNameFromPath(file.path)
 
     // Reset night mode shader settings when closing the page
     // Component.onDestruction: mainView.nightModeEnabled = false

=== modified file 'src/app/qml/ubuntu-docviewer-app.qml'
--- src/app/qml/ubuntu-docviewer-app.qml	2016-01-14 13:07:09 +0000
+++ src/app/qml/ubuntu-docviewer-app.qml	2016-02-03 14:19:17 +0000
@@ -80,7 +80,7 @@
     onIsLandscapeChanged: {
         // If device orientation is landscape and screen width is limited,
         // force hiding Unity 8 indicators panel.
-        if (!DocumentViewer.desktopMode && mainView.isLandscape &&
+        if (!ConvergenceUtils.desktopMode && mainView.isLandscape &&
                 mainView.width < units.gu(51)) {
             mainView.fullscreen = true
             return;
@@ -202,6 +202,13 @@
         }
     }
 
+    // WORKAROUND: Not yet implemented in the SDK
+    Binding {
+        target: QuickUtils
+        property: "mouseAttached"
+        value: ConvergenceUtils.mouseAttached
+    }
+
     property bool nightModeEnabled: false
     layer.effect: NightModeShader {}
     layer.enabled: nightModeEnabled && (pageStack.depth > 1) && !pageStack.currentPage.isPresentation

=== modified file 'src/plugin/file-qml-plugin/CMakeLists.txt'
--- src/plugin/file-qml-plugin/CMakeLists.txt	2015-10-21 13:16:12 +0000
+++ src/plugin/file-qml-plugin/CMakeLists.txt	2016-02-03 14:19:17 +0000
@@ -1,23 +1,48 @@
+# This includes a temporary snapshot of the WIP QInputInfo API as we
+# require this in docviewer now but upstream isn't finished yet.
+# Eventually this should be dropped in favor of the upstream
+# QInputInfo API.
+
 set(PLUGIN_DIR DocumentViewer)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 find_package(Qt5Core)
 find_package(Qt5Qml)
 find_package(Qt5Quick)
 
+pkg_check_modules(LIBUDEV REQUIRED libudev)
+pkg_check_modules(LIBEVDEV REQUIRED libevdev)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${LIBUDEV_INCLUDE_DIRS}
+    ${LIBEVDEV_INCLUDE_DIRS}
+    InputInfo/
+)
+
+# QInputInfo sources
+set(inputinfo_SRCS
+    InputInfo/qinputinfo.cpp
+    InputInfo/qinputinfo.h
+    InputInfo/linux/qinputdeviceinfo_linux.cpp
+    InputInfo/linux/qinputdeviceinfo_linux_p.h
+)
+
 #add the sources to compile
 set(fileqmlplugin_SRCS
     backend.cpp
     documentmodel.cpp
     fswatcher.cpp
     docviewerfile.cpp
-    docviewerutils.cpp
+    fileutils.cpp
+    ubuntuconvergenceutils.cpp
 )
 
 add_library(fileqmlplugin MODULE
+    ${inputinfo_SRCS}
     ${fileqmlplugin_SRCS}
 )
 
+target_link_libraries(fileqmlplugin ${LIBUDEV_LDFLAGS} ${LIBEVDEV_LDFLAGS} )
 qt5_use_modules(fileqmlplugin Qml Quick)
 
 # Copy the plugin, the qmldir file and other assets to the build dir for running in QtCreator

=== added directory 'src/plugin/file-qml-plugin/InputInfo'
=== added file 'src/plugin/file-qml-plugin/InputInfo/CMakeLists.txt'
--- src/plugin/file-qml-plugin/InputInfo/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/CMakeLists.txt	2016-02-03 14:19:17 +0000
@@ -0,0 +1,39 @@
+# This is a temporary snapshot of the WIP QInputInfo API as we
+# require this in unity now but upstream isn't finished yet.
+# Eventually this should be dropped in favor of the upstream
+# QInputInfo API.
+
+project(InputInfo)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Quick REQUIRED)
+
+pkg_check_modules(LIBUDEV REQUIRED libudev)
+pkg_check_modules(LIBEVDEV REQUIRED libevdev)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${LIBUDEV_INCLUDE_DIRS}
+    ${LIBEVDEV_INCLUDE_DIRS}
+)
+
+set(InputInfo_SOURCES
+    plugin.cpp
+    qinputinfo.cpp
+    qdeclarativeinputdevicemodel.cpp
+    linux/qinputdeviceinfo_linux.cpp
+)
+
+add_library(InputInfo SHARED
+    ${InputInfo_SOURCES}
+)
+
+target_link_libraries(InputInfo
+    ${LIBUDEV_LDFLAGS}
+    ${LIBEVDEV_LDFLAGS}
+)
+
+qt5_use_modules(InputInfo Core Qml Quick)
+
+add_unity8_plugin(Unity.InputInfo 0.1 Unity/InputInfo TARGETS InputInfo)

=== added directory 'src/plugin/file-qml-plugin/InputInfo/linux'
=== added file 'src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux.cpp'
--- src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux.cpp	2016-02-03 14:19:17 +0000
@@ -0,0 +1,288 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSystems module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qinputdeviceinfo_linux_p.h"
+
+#include <libudev.h>
+#include <libevdev/libevdev.h>
+#include <fcntl.h>
+#include <QDebug>
+#include <QSocketNotifier>
+#include <QTimer>
+#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 (udevice) {
+
+        udevMonitor = udev_monitor_new_from_netlink(udevice, "udev");
+        udev_monitor_filter_add_match_subsystem_devtype(udevMonitor, subsystem.toLatin1(), NULL);
+        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, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));
+
+        udev_enumerate_scan_devices(enumerate);
+        devices = udev_enumerate_get_list_entry(enumerate);
+
+        udev_list_entry_foreach(dev_list_entry, devices) {
+            const char *path;
+            path = udev_list_entry_get_name(dev_list_entry);
+
+            dev = udev_device_new_from_syspath(udevice, path);
+            if (qstrcmp(udev_device_get_subsystem(dev), "input") == 0 ) {
+                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();
+}
+
+QInputDevice::InputTypeFlags QInputDeviceManagerPrivate::getInputTypeFlags(struct udev_device *dev)
+{
+    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) {
+        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 flags;
+}
+
+QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)
+{
+    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;
+    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 Q_NULLPTR;
+    }
+
+    for (int i = 0; i < EV_MAX; i++) {
+        if (i == EV_KEY || i == EV_SW || i == EV_REL
+                || i == EV_REL || i == EV_ABS) {
+            for (int j = 0; j <  libevdev_event_type_get_max(i); j++) {
+                if (libevdev_has_event_code(dev, i, j)) {
+                    switch (i) {
+                    case EV_KEY:
+                        inputDevice->addButton(j);
+                        break;
+                    case EV_SW:
+                        inputDevice->addSwitch(j);
+                        break;
+                    case EV_REL:
+                        inputDevice->addRelativeAxis(j);
+                        break;
+                    case EV_ABS:
+                        inputDevice->addAbsoluteAxis(j);
+                        break;
+                    };
+                }
+            }
+        }
+    }
+
+    return inputDevice;
+}
+
+void 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));
+
+            QString action = QString::fromStdString(udev_device_get_action(dev));
+
+            if (!eventPath.contains(QStringLiteral("/dev/input/")))
+                eventPath.prepend(QStringLiteral("/dev/input/"));
+
+            if (action == QStringLiteral("add")) {
+                if (deviceMap.contains(eventPath)){
+                    udev_device_unref(dev);
+                    return;
+                }
+
+                QInputDevice *iDevice = addDevice(dev);
+                if (!iDevice) {
+                    delete iDevice;
+                    return;
+                }
+                iDevice->setType(getInputTypeFlags(dev));
+                udev_device_unref(dev);
+
+                deviceMap.insert(eventPath,iDevice);
+
+                Q_EMIT deviceAdded(eventPath);
+
+            } else if (action == QStringLiteral("remove")) {
+                removeDevice(eventPath);
+            }
+        }
+    }
+}

=== added file 'src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux_p.h'
--- src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux_p.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux_p.h	2016-02-03 14:19:17 +0000
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSystems module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QINPUTDEVICEINFO_LINUX_P_H
+#define QINPUTDEVICEINFO_LINUX_P_H
+
+#include <QObject>
+#include "qinputinfo.h"
+#include <libudev.h>
+
+class QInputDevicePrivate : public QObject
+{
+    Q_OBJECT
+public:
+    explicit QInputDevicePrivate(QObject *parent = 0);
+
+    QString name;
+    QString devicePath;
+    QList <int> buttons; //keys
+    QList <int> switches;
+    QList <int> relativeAxis;
+    QList <int> absoluteAxis;
+    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_SIGNALS:
+    void deviceAdded(const QString &);
+    void deviceRemoved(const QString &);
+    void ready();
+
+private:
+    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;
+    QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);
+    struct udev *udevice;
+    void addDetails(struct udev_device *);
+
+private Q_SLOTS:
+    void onUDevChanges();
+    void init();
+};
+
+#endif // QINPUTDEVICEINFO_LINUX_P_H

=== added file 'src/plugin/file-qml-plugin/InputInfo/plugin.cpp'
--- src/plugin/file-qml-plugin/InputInfo/plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/plugin.cpp	2016-02-03 14:19:17 +0000
@@ -0,0 +1,32 @@
+/*
+ * 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/>.
+ */
+
+// Qt
+#include <QtQml/qqml.h>
+
+// self
+#include "plugin.h"
+
+// local
+#include "qdeclarativeinputdevicemodel_p.h"
+
+void InputInfoPlugin::registerTypes(const char *uri)
+{
+    int major = 0;
+    int minor = 1;
+    qmlRegisterType<QDeclarativeInputDeviceModel>(uri, major, minor, "InputDeviceModel");
+    qmlRegisterType<QInputDevice>(uri, major, minor, "InputInfo");
+}

=== added file 'src/plugin/file-qml-plugin/InputInfo/plugin.h'
--- src/plugin/file-qml-plugin/InputInfo/plugin.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/plugin.h	2016-02-03 14:19:17 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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 INPUTINFO_PLUGIN_H
+#define INPUTINFO_PLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class InputInfoPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // INPUTINFO_PLUGIN_H

=== added file 'src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel.cpp'
--- src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel.cpp	2016-02-03 14:19:17 +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 'src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel_p.h'
--- src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel_p.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel_p.h	2016-02-03 14:19:17 +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

=== added file 'src/plugin/file-qml-plugin/InputInfo/qinputinfo.cpp'
--- src/plugin/file-qml-plugin/InputInfo/qinputinfo.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/qinputinfo.cpp	2016-02-03 14:19:17 +0000
@@ -0,0 +1,270 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSystems module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qinputinfo.h"
+
+#if defined(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),
+    type(QInputDevice::Unknown)
+{
+}
+
+QInputDevice::QInputDevice(QObject *parent) :
+    QObject(parent),
+    d_ptr(new QInputDevicePrivate(this))
+{
+}
+
+/*
+ * 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);
+}
+
+/*
+ * 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(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 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

=== added file 'src/plugin/file-qml-plugin/InputInfo/qinputinfo.h'
--- src/plugin/file-qml-plugin/InputInfo/qinputinfo.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/qinputinfo.h	2016-02-03 14:19:17 +0000
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSystems module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QINPUTINFO_H
+#define QINPUTINFO_H
+
+#include <QObject>
+#include <QVector>
+#include <QMap>
+#include <QSocketNotifier>
+#include <QDebug>
+
+class QInputDeviceManagerPrivate;
+class QInputDevicePrivate;
+class QInputDevice;
+
+class QInputDeviceManager;
+
+class QInputDevice : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(InputType)
+    Q_FLAGS(InputType InputTypeFlags)
+    friend class QInputDeviceManagerPrivate;
+
+public:
+
+    enum InputType {
+        Unknown = 0,
+        Button = 1,
+        Mouse = 2,
+        TouchPad = 4,
+        TouchScreen = 8,
+        Keyboard = 16,
+        Switch = 32
+    };
+    Q_ENUMS(InputType)
+    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;
+
+private:
+
+    QInputDevicePrivate *d_ptr;
+    void setName(const QString &);
+    void setDevicePath(const QString &);
+    void addButton(int);
+    void addSwitch(int);
+    void addRelativeAxis(int);
+    void addAbsoluteAxis(int);
+    void 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

=== added file 'src/plugin/file-qml-plugin/InputInfo/qmldir'
--- src/plugin/file-qml-plugin/InputInfo/qmldir	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/qmldir	2016-02-03 14:19:17 +0000
@@ -0,0 +1,3 @@
+module Unity.InputInfo
+plugin InputInfo
+typeinfo InputInfo.qmltypes

=== modified file 'src/plugin/file-qml-plugin/backend.cpp'
--- src/plugin/file-qml-plugin/backend.cpp	2015-09-19 15:40:22 +0000
+++ src/plugin/file-qml-plugin/backend.cpp	2016-02-03 14:19:17 +0000
@@ -21,27 +21,38 @@
 #include "backend.h"
 #include "documentmodel.h"
 #include "docviewerfile.h"
-#include "docviewerutils.h"
-
-static QObject *registerDocviewerUtils (QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-
-    DocviewerUtils *ch = new DocviewerUtils();
-    return ch;
+#include "fileutils.h"
+#include "ubuntuconvergenceutils.h"
+
+static QObject *registerFileUtils (QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    DocviewerFileUtils *f = new DocviewerFileUtils();
+    return f;
+}
+
+static QObject *registerConvergenceUtils (QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    UbuntuConvergenceUtils *c = new UbuntuConvergenceUtils();
+    return c;
 }
 
 void BackendPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("DocumentViewer"));
-    
+
     //@uri DocumentViewer
 
     qmlRegisterType<DocumentModel>(uri, 1, 0, "DocumentsModel");
     qmlRegisterType<DocviewerFile>(uri, 1, 0, "File");
 
-    qmlRegisterSingletonType<DocviewerUtils>(uri, 1, 0, "DocumentViewer", registerDocviewerUtils);
+    qmlRegisterSingletonType<DocviewerFileUtils>(uri, 1, 0, "FileUtils", registerFileUtils);
+    qmlRegisterSingletonType<UbuntuConvergenceUtils>(uri, 1, 0, "ConvergenceUtils", registerConvergenceUtils);
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'src/plugin/file-qml-plugin/documentmodel.cpp'
--- src/plugin/file-qml-plugin/documentmodel.cpp	2015-09-19 15:40:22 +0000
+++ src/plugin/file-qml-plugin/documentmodel.cpp	2016-02-03 14:19:17 +0000
@@ -17,7 +17,7 @@
 
 #include "documentmodel.h"
 #include "fswatcher.h"
-#include "docviewerutils.h"
+#include "fileutils.h"
 
 #include <QStandardPaths>
 #include <QDir>
@@ -115,7 +115,7 @@
 
 bool DocumentModel::isFileSupported(const QString &path)
 {
-    return DocviewerUtils::isFileSupported(path);
+    return DocviewerFileUtils::isFileSupported(path);
 }
 
 QHash<int, QByteArray> DocumentModel::roleNames() const

=== removed file 'src/plugin/file-qml-plugin/docviewerutils.cpp'
--- src/plugin/file-qml-plugin/docviewerutils.cpp	2015-12-27 12:10:06 +0000
+++ src/plugin/file-qml-plugin/docviewerutils.cpp	1970-01-01 00:00:00 +0000
@@ -1,184 +0,0 @@
-/*
-  Copyright (C) 2015 Canonical, Ltd.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-  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 General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see http://www.gnu.org/licenses/.
-*/
-
-#include "docviewerutils.h"
-
-#include <QFileInfo>
-#include <QDir>
-#include <QMimeDatabase>
-#include <QStandardPaths>
-#include <QDirIterator>
-#include <QDateTime>
-#include <QtGui/QGuiApplication>
-
-bool DocviewerUtils::desktopMode() const
-{
-    // Assume that platformName (QtUbuntu) with ubuntu
-    // in name means it's running on device
-    // TODO: replace this check with SDK call for formfactor
-    QString platform = QGuiApplication::platformName();
-    return !((platform == "ubuntu") || (platform == "ubuntumirclient"));
-}
-
-bool DocviewerUtils::exists(const QString &path)
-{
-    QFileInfo fi(path);
-
-    if (fi.isFile())
-        return fi.exists();
-
-    // else
-    return QDir(path).exists();
-}
-
-bool DocviewerUtils::copy(const QString &source, const QString &destination)
-{
-    return QFile::copy(source, destination);
-}
-
-bool DocviewerUtils::isFileSupported(const QString &path)
-{
-    QMimeDatabase mdb;
-    const QString mimetype = mdb.mimeTypeForFile(path).name();
-
-    return mimetype.startsWith("text/")
-            || mimetype == "application/pdf"
-            || mimetype.startsWith("application/vnd.oasis.opendocument")
-            || mimetype == "application/msword"
-            || mimetype == "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
-            || mimetype == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-            || mimetype == "application/vnd.openxmlformats-officedocument.presentationml.presentation"
-            || mimetype == "application/vnd.ms-excel"
-            || mimetype == "application/vnd.ms-powerpoint";
-}
-
-QString DocviewerUtils::getXdgDocumentsLocation()
-{
-    return QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
-}
-
-QString DocviewerUtils::buildDestinationPath(const QString &destinationDir, const QString &sourcePath)
-{
-    QFileInfo fi(sourcePath);
-
-    /*
-      We don't support formats that use a double extension
-      (e.g. tar.gz), so we can safely use completeBaseName() and
-      suffix() functions, in order to properly detect the name of
-      the document even when there's a dot in the middle of the name.
-    */
-    QString suffix = fi.suffix();
-    QString filenameWithoutSuffix = fi.completeBaseName();
-
-    QMimeDatabase mdb;
-    QMimeType mt = mdb.mimeTypeForFile(sourcePath);
-
-    // If the filename doesn't have an extension add one from the
-    // detected mimetype
-    if (suffix.isEmpty())
-        suffix = mt.preferredSuffix();
-
-    QString dir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + QDir::separator();
-    QString destination = QString("%1.%2").arg(dir + filenameWithoutSuffix, suffix);
-
-    // If there's already a file of this name, reformat it to
-    // "filename (copy x).png" where x is a number, incremented until we find an
-    // available filename.
-    if (QFile::exists(destination)) {
-        /*
-         TRANSLATORS: This string is used for renaming a copied file,
-         when a file with the same name already exists in user's
-         Documents folder.
-
-         e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-              "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-
-              where "2" is given by the argument "%1"
-        */
-        QString reformattedSuffix = QString(tr("copy %1"));
-
-        // Check if the file has already a "copy" suffix
-        // If so, remove it since we will update it later.
-        QRegExp rx(" \\(" + reformattedSuffix.arg(QString("\\d+")) + "\\)");
-        int reformattedSuffixPos = filenameWithoutSuffix.lastIndexOf(rx);
-
-        if (reformattedSuffixPos != -1)
-            filenameWithoutSuffix.truncate(reformattedSuffixPos);
-
-        // Add the right "copy" suffix.
-        int append = 1;
-        while (QFile::exists(destination)) {
-            destination = QString("%1 (%2).%3").arg(
-                        dir + filenameWithoutSuffix,
-                        reformattedSuffix.arg(QString::number(append)),
-                        suffix);
-            append++;
-        }
-    }
-
-    return destination;
-}
-
-// Return the path of the file, if found in the storageLocation paths,
-// otherwise return an empty string.
-// Used for prevent importing of a second copy of a file through ContentHub.
-QString DocviewerUtils::checkIfFileAlreadyImported(const QString &filePath, const QStringList &storageLocationList)
-{
-    QFileInfo fi(filePath);
-    QStringList files;
-
-    // Get the list of all the files in the watched folders
-    Q_FOREACH(const QString &storageLocation, storageLocationList) {
-        QDirIterator dir(storageLocation, QDir::Files | QDir::NoDotAndDotDot | QDir::Readable,
-                         QDirIterator::Subdirectories);
-
-        while (dir.hasNext())
-        {
-            dir.next();
-            files.append(dir.filePath());
-        }
-    }
-
-    // Check if there's a file with the same name in the list
-    Q_FOREACH(const QString &file, files) {
-        if (file.endsWith(fi.fileName())) {
-            // Seems there could be already the same file in the watched
-            // folders. Check also size and lastModified date.
-            QFileInfo fileToCheck(file);
-
-            if (fi.size() == fileToCheck.size() &&
-                    fi.lastModified() == fileToCheck.lastModified())
-                return file;
-        }
-    }
-
-    return QString();
-}
-
-QString DocviewerUtils::getFileBaseNameFromPath(const QString &filePath)
-{
-    return QFileInfo(filePath).completeBaseName();
-}
-
-QString DocviewerUtils::getFileNameFromPath(const QString &filePath)
-{
-    return QFileInfo(filePath).fileName();
-}
-
-QString DocviewerUtils::getCanonicalPath(const QString &filePath)
-{
-    return QFileInfo(filePath).canonicalPath();
-}

=== removed file 'src/plugin/file-qml-plugin/docviewerutils.h'
--- src/plugin/file-qml-plugin/docviewerutils.h	2015-12-27 12:10:06 +0000
+++ src/plugin/file-qml-plugin/docviewerutils.h	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/*
-  Copyright (C) 2015 Canonical, Ltd.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-  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 General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see http://www.gnu.org/licenses/.
-*/
-
-#ifndef DOCVIEWERUTILS_H
-#define DOCVIEWERUTILS_H
-
-#include <QObject>
-
-class DocviewerUtils : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(bool desktopMode READ desktopMode CONSTANT)
-
-public:
-    bool desktopMode() const;
-
-    Q_INVOKABLE static bool exists(const QString &path);
-    Q_INVOKABLE static bool copy(const QString &source, const QString &destination);
-
-    Q_INVOKABLE static bool isFileSupported(const QString &path);
-    Q_INVOKABLE static QString getXdgDocumentsLocation();
-
-    Q_INVOKABLE static QString buildDestinationPath(const QString &destinationDir, const QString &sourcePath);
-
-    Q_INVOKABLE static QString checkIfFileAlreadyImported(const QString &filePath, const QStringList &storageLocationList);
-
-    Q_INVOKABLE static QString getFileBaseNameFromPath(const QString &filePath);
-    Q_INVOKABLE static QString getFileNameFromPath(const QString &filePath);
-    Q_INVOKABLE static QString getCanonicalPath(const QString &filePath);
-};
-
-#endif // DOCVIEWERUTILS_H

=== added file 'src/plugin/file-qml-plugin/fileutils.cpp'
--- src/plugin/file-qml-plugin/fileutils.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/fileutils.cpp	2016-02-03 14:19:17 +0000
@@ -0,0 +1,174 @@
+/*
+  Copyright (C) 2015 Canonical, Ltd.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+  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 General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include "fileutils.h"
+
+#include <QFileInfo>
+#include <QDir>
+#include <QMimeDatabase>
+#include <QStandardPaths>
+#include <QDirIterator>
+#include <QDateTime>
+
+bool DocviewerFileUtils::exists(const QString &path)
+{
+    QFileInfo fi(path);
+
+    if (fi.isFile())
+        return fi.exists();
+
+    // else
+    return QDir(path).exists();
+}
+
+bool DocviewerFileUtils::copy(const QString &source, const QString &destination)
+{
+    return QFile::copy(source, destination);
+}
+
+bool DocviewerFileUtils::isFileSupported(const QString &path)
+{
+    QMimeDatabase mdb;
+    const QString mimetype = mdb.mimeTypeForFile(path).name();
+
+    return mimetype.startsWith("text/")
+            || mimetype == "application/pdf"
+            || mimetype.startsWith("application/vnd.oasis.opendocument")
+            || mimetype == "application/msword"
+            || mimetype == "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+            || mimetype == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+            || mimetype == "application/vnd.openxmlformats-officedocument.presentationml.presentation"
+            || mimetype == "application/vnd.ms-excel"
+            || mimetype == "application/vnd.ms-powerpoint";
+}
+
+QString DocviewerFileUtils::getXdgDocumentsLocation()
+{
+    return QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+}
+
+QString DocviewerFileUtils::buildDestinationPath(const QString &destinationDir, const QString &sourcePath)
+{
+    QFileInfo fi(sourcePath);
+
+    /*
+      We don't support formats that use a double extension
+      (e.g. tar.gz), so we can safely use completeBaseName() and
+      suffix() functions, in order to properly detect the name of
+      the document even when there's a dot in the middle of the name.
+    */
+    QString suffix = fi.suffix();
+    QString filenameWithoutSuffix = fi.completeBaseName();
+
+    QMimeDatabase mdb;
+    QMimeType mt = mdb.mimeTypeForFile(sourcePath);
+
+    // If the filename doesn't have an extension add one from the
+    // detected mimetype
+    if (suffix.isEmpty())
+        suffix = mt.preferredSuffix();
+
+    QString dir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + QDir::separator();
+    QString destination = QString("%1.%2").arg(dir + filenameWithoutSuffix, suffix);
+
+    // If there's already a file of this name, reformat it to
+    // "filename (copy x).png" where x is a number, incremented until we find an
+    // available filename.
+    if (QFile::exists(destination)) {
+        /*
+         TRANSLATORS: This string is used for renaming a copied file,
+         when a file with the same name already exists in user's
+         Documents folder.
+
+         e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
+              "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
+
+              where "2" is given by the argument "%1"
+        */
+        QString reformattedSuffix = QString(tr("copy %1"));
+
+        // Check if the file has already a "copy" suffix
+        // If so, remove it since we will update it later.
+        QRegExp rx(" \\(" + reformattedSuffix.arg(QString("\\d+")) + "\\)");
+        int reformattedSuffixPos = filenameWithoutSuffix.lastIndexOf(rx);
+
+        if (reformattedSuffixPos != -1)
+            filenameWithoutSuffix.truncate(reformattedSuffixPos);
+
+        // Add the right "copy" suffix.
+        int append = 1;
+        while (QFile::exists(destination)) {
+            destination = QString("%1 (%2).%3").arg(
+                        dir + filenameWithoutSuffix,
+                        reformattedSuffix.arg(QString::number(append)),
+                        suffix);
+            append++;
+        }
+    }
+
+    return destination;
+}
+
+// Return the path of the file, if found in the storageLocation paths,
+// otherwise return an empty string.
+// Used for prevent importing of a second copy of a file through ContentHub.
+QString DocviewerFileUtils::checkIfFileAlreadyImported(const QString &filePath, const QStringList &storageLocationList)
+{
+    QFileInfo fi(filePath);
+    QStringList files;
+
+    // Get the list of all the files in the watched folders
+    Q_FOREACH(const QString &storageLocation, storageLocationList) {
+        QDirIterator dir(storageLocation, QDir::Files | QDir::NoDotAndDotDot | QDir::Readable,
+                         QDirIterator::Subdirectories);
+
+        while (dir.hasNext())
+        {
+            dir.next();
+            files.append(dir.filePath());
+        }
+    }
+
+    // Check if there's a file with the same name in the list
+    Q_FOREACH(const QString &file, files) {
+        if (file.endsWith(fi.fileName())) {
+            // Seems there could be already the same file in the watched
+            // folders. Check also size and lastModified date.
+            QFileInfo fileToCheck(file);
+
+            if (fi.size() == fileToCheck.size() &&
+                    fi.lastModified() == fileToCheck.lastModified())
+                return file;
+        }
+    }
+
+    return QString();
+}
+
+QString DocviewerFileUtils::getFileBaseNameFromPath(const QString &filePath)
+{
+    return QFileInfo(filePath).completeBaseName();
+}
+
+QString DocviewerFileUtils::getFileNameFromPath(const QString &filePath)
+{
+    return QFileInfo(filePath).fileName();
+}
+
+QString DocviewerFileUtils::getCanonicalPath(const QString &filePath)
+{
+    return QFileInfo(filePath).canonicalPath();
+}

=== added file 'src/plugin/file-qml-plugin/fileutils.h'
--- src/plugin/file-qml-plugin/fileutils.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/fileutils.h	2016-02-03 14:19:17 +0000
@@ -0,0 +1,42 @@
+/*
+  Copyright (C) 2015 Canonical, Ltd.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+  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 General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef DOCVIEWER_FILEUTILS_H
+#define DOCVIEWER_FILEUTILS_H
+
+#include <QObject>
+
+class DocviewerFileUtils : public QObject
+{
+    Q_OBJECT
+
+public:
+    Q_INVOKABLE static bool exists(const QString &path);
+    Q_INVOKABLE static bool copy(const QString &source, const QString &destination);
+
+    Q_INVOKABLE static bool isFileSupported(const QString &path);
+    Q_INVOKABLE static QString getXdgDocumentsLocation();
+
+    Q_INVOKABLE static QString buildDestinationPath(const QString &destinationDir, const QString &sourcePath);
+
+    Q_INVOKABLE static QString checkIfFileAlreadyImported(const QString &filePath, const QStringList &storageLocationList);
+
+    Q_INVOKABLE static QString getFileBaseNameFromPath(const QString &filePath);
+    Q_INVOKABLE static QString getFileNameFromPath(const QString &filePath);
+    Q_INVOKABLE static QString getCanonicalPath(const QString &filePath);
+};
+
+#endif // DOCVIEWER_FILEUTILS_H

=== added file 'src/plugin/file-qml-plugin/ubuntuconvergenceutils.cpp'
--- src/plugin/file-qml-plugin/ubuntuconvergenceutils.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/ubuntuconvergenceutils.cpp	2016-02-03 14:19:17 +0000
@@ -0,0 +1,82 @@
+/*
+  Copyright (C) 2015 Stefano Verzegnassi
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+  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 General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include "ubuntuconvergenceutils.h"
+#include "InputInfo/qinputinfo.h"
+
+#include <QtGui/QGuiApplication>
+
+bool isUnity8Env()
+{
+    // Assume that platformName (QtUbuntu) with ubuntu
+    // in name means it's running on device
+    QString platform = QGuiApplication::platformName();
+    return (platform == "ubuntu") || (platform == "ubuntumirclient");
+}
+
+UbuntuConvergenceUtils::UbuntuConvergenceUtils(QObject *parent) :
+    QObject(parent),
+    m_desktopMode(false),
+    m_mouseAttached(false),
+    m_inputDevicesWatcher(new QInputDeviceManager())
+{
+    // Initialize signals when the watcher is ready.
+    // QInputDeviceManager() emits deviceAdded() signal multiple times during its
+    // initializations.
+    connect(m_inputDevicesWatcher, &QInputDeviceManager::ready,
+            this, &UbuntuConvergenceUtils::init);
+}
+
+void UbuntuConvergenceUtils::init()
+{
+    // Connect signals
+    connect(m_inputDevicesWatcher, SIGNAL(deviceAdded(QString)), this, SLOT(checkPointersCount()));
+    connect(m_inputDevicesWatcher, SIGNAL(deviceRemoved(QString)), this, SLOT(checkPointersCount()));
+
+    checkPointersCount();
+}
+
+void UbuntuConvergenceUtils::checkPointersCount()
+{
+    int mouseCount = m_inputDevicesWatcher->deviceCount(QInputDevice::Mouse);
+    int touchPadCount = m_inputDevicesWatcher->deviceCount(QInputDevice::TouchPad);
+
+    setMouseAttached(mouseCount || touchPadCount);
+    setDesktopMode(isUnity8Env() || m_mouseAttached);
+}
+
+void UbuntuConvergenceUtils::setDesktopMode(bool desktopMode)
+{
+    if (m_desktopMode == desktopMode)
+        return;
+
+    m_desktopMode = desktopMode;
+    Q_EMIT desktopModeChanged();
+}
+
+void UbuntuConvergenceUtils::setMouseAttached(bool mouseAttached)
+{
+    if (m_mouseAttached == mouseAttached)
+        return;
+
+    m_mouseAttached = mouseAttached;
+    Q_EMIT mouseAttachedChanged();
+}
+
+UbuntuConvergenceUtils::~UbuntuConvergenceUtils()
+{
+    delete m_inputDevicesWatcher;
+}

=== added file 'src/plugin/file-qml-plugin/ubuntuconvergenceutils.h'
--- src/plugin/file-qml-plugin/ubuntuconvergenceutils.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/ubuntuconvergenceutils.h	2016-02-03 14:19:17 +0000
@@ -0,0 +1,56 @@
+/*
+  Copyright (C) 2015 Stefano Verzegnassi
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+  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 General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef DOCVIEWER_CONVERGENCEUTILS_H
+#define DOCVIEWER_CONVERGENCEUTILS_H
+
+#include <QObject>
+
+class QInputDeviceManager;
+
+class UbuntuConvergenceUtils : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool desktopMode READ desktopMode NOTIFY desktopModeChanged)
+    Q_PROPERTY(bool mouseAttached READ mouseAttached NOTIFY mouseAttachedChanged)
+
+public:
+    UbuntuConvergenceUtils(QObject *parent = 0);
+    ~UbuntuConvergenceUtils();
+
+    bool desktopMode() const { return m_desktopMode; }
+    bool mouseAttached() const { return m_mouseAttached; }
+
+Q_SIGNALS:
+    void desktopModeChanged();
+    void mouseAttachedChanged();
+
+private slots:
+    void checkPointersCount();
+    void init();
+
+private:
+    bool m_desktopMode;
+    bool m_mouseAttached;
+
+private:
+    QInputDeviceManager* m_inputDevicesWatcher;
+
+    void setDesktopMode(bool desktopMode);
+    void setMouseAttached(bool mouseAttached);
+};
+
+#endif // DOCVIEWER_CONVERGENCEUTILS_H