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

[kevin gunn]

Qt input info for mouse & keyboard detection

Qt input info for mouse & keyboard detection

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

10. By Timo Jyrinki on 2015-02-13

[ Timo Jyrinki ]
* Rebuild against Qt 5.4.0

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

11. By Michael Zanetti on 2015-02-17

applyinputinfo patch

12. By Michael Zanetti on 2015-02-17

fix pkgconfig

13. By Michael Zanetti on 2015-02-17

fix PKGCONFIG

14. By Michael Zanetti on 2015-02-17

next try

15. By Michael Zanetti on 2015-02-17

add pkg-config to deps

16. By Michael Zanetti on 2015-02-17

disable tests

17. By Michael Zanetti on 2015-02-17

add installs

18. By Michael Zanetti on 2015-02-18

make type a flag

Unmerged revisions

18. By Michael Zanetti on 2015-02-18

make type a flag

17. By Michael Zanetti on 2015-02-17

add installs

16. By Michael Zanetti on 2015-02-17

disable tests

15. By Michael Zanetti on 2015-02-17

add pkg-config to deps

14. By Michael Zanetti on 2015-02-17

next try

13. By Michael Zanetti on 2015-02-17

fix PKGCONFIG

12. By Michael Zanetti on 2015-02-17

fix pkgconfig

11. By Michael Zanetti on 2015-02-17

applyinputinfo patch

=== modified file 'debian/control'
--- debian/control	2014-10-28 07:06:50 +0000
+++ debian/control	2015-02-03 15:58:39 +0000
@@ -3,7 +3,10 @@
 Priority: optional
 Maintainer: Timo Jyrinki <[e-mail]>
 Build-Depends: debhelper (>= 9),
+               libevdev-dev,
                libqt5sql5-sqlite (>= 5.3.2~),
+               libudev-dev,
+               pkg-config,
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.3.2~),
                qtdeclarative5-private-dev (>= 5.3.2~),

=== added file 'debian/patches/inputinfo.patch'
--- debian/patches/inputinfo.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/inputinfo.patch	2015-02-03 15:58:39 +0000
@@ -0,0 +1,1699 @@
+=== added directory 'examples/systeminfo/inputinfo'
+=== added file 'examples/systeminfo/inputinfo/inputinfo.pro'
+--- old/examples/systeminfo/inputinfo/inputinfo.pro	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/inputinfo/inputinfo.pro	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,22 @@
++#-------------------------------------------------
++#
++# Project created by QtCreator 2014-11-28T12:25:04
++#
++#-------------------------------------------------
++
++QT       += core systeminfo
++
++QT       -= gui
++
++TARGET = inputinfo
++CONFIG   += console
++CONFIG   -= app_bundle
++
++TEMPLATE = app
++
++
++SOURCES += main.cpp \
++    inputtest.cpp
++
++HEADERS += \
++    inputtest.h
+
+=== added file 'examples/systeminfo/inputinfo/inputtest.cpp'
+--- old/examples/systeminfo/inputinfo/inputtest.cpp	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/inputinfo/inputtest.cpp	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,83 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "inputtest.h"
++#include <qinputinfo.h>
++#include <QDebug>
++
++Inputtest::Inputtest(QObject *parent) :
++    QObject(parent)
++{
++    inputDeviceInfo = new QInputDeviceInfo(this);
++    connect(inputDeviceInfo, &QInputDeviceInfo::deviceAdded,this,&Inputtest::deviceAdded);
++    connect(inputDeviceInfo, &QInputDeviceInfo::deviceRemoved,this,&Inputtest::deviceRemoved);
++
++}
++
++void Inputtest::deviceAdded(const QString &devicePath)
++{
++    QInputDevice *device = inputDeviceInfo->deviceMap().value(devicePath);
++
++    qDebug() <<  inputDeviceInfo->deviceMap().count();
++    qDebug() << device->name() << device->devicePath();
++    qDebug() << "buttons count"<< device->buttons().count();
++    qDebug() << "switch count"<< device->switches().count();
++    qDebug() << "relativeAxis count"<< device->relativeAxis().count();
++    qDebug() << "absoluteAxis count"<< device->absoluteAxis().count();
++    qDebug() << "type" << device->type();
++    qDebug();
++
++    QMapIterator<QString, QInputDevice*> i(inputDeviceInfo->deviceMap());
++    while (i.hasNext()) {
++        i.next();
++       qDebug() << i.value()->name();
++    }
++}
++
++void Inputtest::deviceRemoved(const QString &path)
++{
++    qDebug() << Q_FUNC_INFO << path;
++    QMapIterator<QString, QInputDevice*> i(inputDeviceInfo->deviceMap());
++    while (i.hasNext()) {
++        i.next();
++       qDebug() << i.value()->name();
++    }
++}
+
+=== added file 'examples/systeminfo/inputinfo/inputtest.h'
+--- old/examples/systeminfo/inputinfo/inputtest.h	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/inputinfo/inputtest.h	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,63 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef INPUTTEST_H
++#define INPUTTEST_H
++
++#include <QObject>
++#include <qinputinfo.h>
++
++class Inputtest : public QObject
++{
++    Q_OBJECT
++public:
++    explicit Inputtest(QObject *parent = 0);
++
++    QInputDeviceInfo *inputDeviceInfo;
++signals:
++
++public slots:
++
++ void deviceAdded(const QString &);
++ void deviceRemoved(const QString &path);
++};
++
++#endif // INPUTTEST_H
+
+=== added file 'examples/systeminfo/inputinfo/main.cpp'
+--- old/examples/systeminfo/inputinfo/main.cpp	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/inputinfo/main.cpp	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,50 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++#include <QCoreApplication>
++#include "inputtest.h"
++
++int main(int argc, char *argv[])
++{
++    QCoreApplication a(argc, argv);
++
++    Inputtest inputest(&a);
++    return a.exec();
++}
+
+=== added directory 'examples/systeminfo/qml-inputinfo'
+=== added file 'examples/systeminfo/qml-inputinfo/main.cpp'
+--- old/examples/systeminfo/qml-inputinfo/main.cpp	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/qml-inputinfo/main.cpp	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,43 @@
++/****************************************************************************
++**
++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include"../stub.h"
++SYSINFO_EXAMPLE_MAIN(qml-inputinfo)
+
+=== added file 'examples/systeminfo/qml-inputinfo/qml-inputinfo.pro'
+--- old/examples/systeminfo/qml-inputinfo/qml-inputinfo.pro	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/qml-inputinfo/qml-inputinfo.pro	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,14 @@
++TEMPLATE = app
++TARGET = qml-inputinfo
++QT += quick
++SOURCES = main.cpp
++
++app.files = \
++    $$files(*.qml) \
++
++target.path = $$[QT_INSTALL_EXAMPLES]/sysinfo/qml-inputinfo
++app.path = $$[QT_INSTALL_EXAMPLES]/sysinfo/qml-inputinfo
++INSTALLS += target app
++
++RESOURCES += \
++    qml-inputinfo.qrc
+
+=== added file 'examples/systeminfo/qml-inputinfo/qml-inputinfo.qml'
+--- old/examples/systeminfo/qml-inputinfo/qml-inputinfo.qml	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/qml-inputinfo/qml-inputinfo.qml	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,97 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++import QtQuick 2.0
++import QtSystemInfo 5.0
++
++Rectangle {
++    width: 640
++    height: 480
++
++    ListView {
++        anchors.fill: parent
++     id: inputModel
++     model: systemInputs
++     delegate: deviceDelegate
++    }
++
++    Component {
++        id: deviceDelegate
++        Row {
++            spacing: 10
++            Text { text: systemInputs.get(index).name}
++            Text { text: typeToString(systemInputs.get(index).type)}
++        }
++    }
++
++    InputDeviceInfo {
++        id: systemInputs
++    }
++
++    function typeToString(deviceType) {
++        console.log(deviceType +" "+systemInputs.Keyboard)
++
++        switch (deviceType) {
++        case 0:
++            return "Unknown"
++            break;
++        case 1:
++            return "Button"
++            break;
++        case 2:
++            return "Mouse"
++            break;
++        case 3:
++            return "TouchPad"
++            break;
++        case 4:
++            return "TouchScreen"
++            break;
++        case 5:
++            return "Keyboard"
++            break;
++        case 6:
++            return "Switch"
++            break;
++        }
++        return ""
++    }
++
++}
+
+=== added file 'examples/systeminfo/qml-inputinfo/qml-inputinfo.qrc'
+--- old/examples/systeminfo/qml-inputinfo/qml-inputinfo.qrc	1970-01-01 00:00:00 +0000
++++ new/examples/systeminfo/qml-inputinfo/qml-inputinfo.qrc	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,5 @@
++<RCC>
++    <qresource prefix="/">
++        <file>qml-inputinfo.qml</file>
++    </qresource>
++</RCC>
+
+=== modified file 'examples/systeminfo/systeminfo.pro'
+--- old/examples/systeminfo/systeminfo.pro	2015-02-03 15:48:03 +0000
++++ new/examples/systeminfo/systeminfo.pro	2015-02-03 15:48:27 +0000
+@@ -2,7 +2,9 @@
+ 
+ SUBDIRS += \
+     qml-deviceinfo \
+-    qml-battery
++    qml-battery \
++    qml-inputinfo \
++    inputinfo
+ 
+ #qtHaveModule(widgets): SUBDIRS += \
+ 
+
+=== modified file 'src/imports/systeminfo/plugins.qmltypes'
+--- old/src/imports/systeminfo/plugins.qmltypes	2015-02-03 15:48:03 +0000
++++ new/src/imports/systeminfo/plugins.qmltypes	2015-02-03 15:48:27 +0000
+@@ -3,137 +3,11 @@
+ // This file describes the plugin-supplied types contained in the library.
+ // It is used for QML tooling purposes only.
+ //
+-// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtSystemInfo 5.0'.
++// This file was auto-generated by:
++// 'qmlplugindump -notrelocatable QtSystemInfo 5.0'
+ 
+ Module {
+     Component {
+-        name: "QDeclarativeBatteryInfo"
+-        prototype: "QObject"
+-        exports: ["QtSystemInfo/BatteryInfo 5.0"]
+-        exportMetaObjectRevisions: [0]
+-        Enum {
+-            name: "ChargerType"
+-            values: {
+-                "UnknownCharger": 0,
+-                "WallCharger": 1,
+-                "USBCharger": 2,
+-                "VariableCurrentCharger": 3
+-            }
+-        }
+-        Enum {
+-            name: "ChargingState"
+-            values: {
+-                "UnknownChargingState": 0,
+-                "NotCharging": 1,
+-                "Charging": 2,
+-                "Discharging": 3,
+-                "Full": 4
+-            }
+-        }
+-        Enum {
+-            name: "EnergyUnit"
+-            values: {
+-                "UnitUnknown": 0,
+-                "UnitmAh": 1,
+-                "UnitmWh": 2
+-            }
+-        }
+-        Enum {
+-            name: "BatteryStatus"
+-            values: {
+-                "BatteryStatusUnknown": 0,
+-                "BatteryEmpty": 1,
+-                "BatteryLow": 2,
+-                "BatteryOk": 3,
+-                "BatteryFull": 4
+-            }
+-        }
+-        Property { name: "monitorBatteryCount"; type: "bool" }
+-        Property { name: "monitorChargerType"; type: "bool" }
+-        Property { name: "monitorCurrentFlow"; type: "bool" }
+-        Property { name: "monitorRemainingCapacity"; type: "bool" }
+-        Property { name: "monitorRemainingChargingTime"; type: "bool" }
+-        Property { name: "monitorVoltage"; type: "bool" }
+-        Property { name: "monitorChargingState"; type: "bool" }
+-        Property { name: "monitorBatteryStatus"; type: "bool" }
+-        Property { name: "batteryCount"; type: "int"; isReadonly: true }
+-        Property { name: "chargerType"; type: "ChargerType"; isReadonly: true }
+-        Property { name: "energyUnit"; type: "EnergyUnit"; isReadonly: true }
+-        Signal {
+-            name: "batteryCountChanged"
+-            Parameter { name: "count"; type: "int" }
+-        }
+-        Signal {
+-            name: "chargerTypeChanged"
+-            Parameter { name: "type"; type: "int" }
+-        }
+-        Signal {
+-            name: "chargingStateChanged"
+-            Parameter { name: "battery"; type: "int" }
+-            Parameter { name: "state"; type: "int" }
+-        }
+-        Signal {
+-            name: "currentFlowChanged"
+-            Parameter { name: "battery"; type: "int" }
+-            Parameter { name: "flow"; type: "int" }
+-        }
+-        Signal {
+-            name: "remainingCapacityChanged"
+-            Parameter { name: "battery"; type: "int" }
+-            Parameter { name: "capacity"; type: "int" }
+-        }
+-        Signal {
+-            name: "remainingChargingTimeChanged"
+-            Parameter { name: "battery"; type: "int" }
+-            Parameter { name: "seconds"; type: "int" }
+-        }
+-        Signal {
+-            name: "voltageChanged"
+-            Parameter { name: "battery"; type: "int" }
+-            Parameter { name: "voltage"; type: "int" }
+-        }
+-        Signal {
+-            name: "batteryStatusChanged"
+-            Parameter { name: "battery"; type: "int" }
+-            Parameter { name: "status"; type: "int" }
+-        }
+-        Method {
+-            name: "currentFlow"
+-            type: "int"
+-            Parameter { name: "battery"; type: "int" }
+-        }
+-        Method {
+-            name: "remainingCapacity"
+-            type: "int"
+-            Parameter { name: "battery"; type: "int" }
+-        }
+-        Method {
+-            name: "remainingChargingTime"
+-            type: "int"
+-            Parameter { name: "battery"; type: "int" }
+-        }
+-        Method {
+-            name: "voltage"
+-            type: "int"
+-            Parameter { name: "battery"; type: "int" }
+-        }
+-        Method {
+-            name: "chargingState"
+-            type: "int"
+-            Parameter { name: "battery"; type: "int" }
+-        }
+-        Method {
+-            name: "maximumCapacity"
+-            type: "int"
+-            Parameter { name: "battery"; type: "int" }
+-        }
+-        Method {
+-            name: "batteryStatus"
+-            type: "int"
+-            Parameter { name: "battery"; type: "int" }
+-        }
+-    }
+-    Component {
+         name: "QDeclarativeDeviceInfo"
+         prototype: "QObject"
+         exports: ["QtSystemInfo/DeviceInfo 5.0"]
+@@ -219,87 +93,6 @@
+         }
+     }
+     Component {
+-        name: "QDeclarativeDeviceProfile"
+-        prototype: "QObject"
+-        exports: ["QtSystemInfo/DeviceProfile 5.0"]
+-        exportMetaObjectRevisions: [0]
+-        Enum {
+-            name: "ProfileType"
+-            values: {
+-                "UnknownProfile": 0,
+-                "SilentProfile": 1,
+-                "NormalProfile": 2,
+-                "VibrationProfile": 3,
+-                "BeepProfile": 4
+-            }
+-        }
+-        Property { name: "isVibrationActivated"; type: "bool"; isReadonly: true }
+-        Property { name: "messageRingtoneVolume"; type: "int"; isReadonly: true }
+-        Property { name: "voiceRingtoneVolume"; type: "int"; isReadonly: true }
+-        Property { name: "currentProfileType"; type: "ProfileType"; isReadonly: true }
+-        Signal { name: "vibrationActivatedChanged" }
+-    }
+-    Component {
+-        name: "QDeclarativeDisplayInfo"
+-        prototype: "QObject"
+-        exports: ["QtSystemInfo/DisplayInfo 5.0"]
+-        exportMetaObjectRevisions: [0]
+-        Enum {
+-            name: "BacklightState"
+-            values: {
+-                "BacklightUnknown": 0,
+-                "BacklightOff": 1,
+-                "BacklightDimmed": 2,
+-                "BacklightOn": 3
+-            }
+-        }
+-        Signal {
+-            name: "backlightStateChanged"
+-            Parameter { name: "screen"; type: "int" }
+-            Parameter { name: "state"; type: "int" }
+-        }
+-        Method {
+-            name: "brightness"
+-            type: "int"
+-            Parameter { name: "screen"; type: "int" }
+-        }
+-        Method {
+-            name: "contrast"
+-            type: "int"
+-            Parameter { name: "screen"; type: "int" }
+-        }
+-        Method {
+-            name: "backlightState"
+-            type: "int"
+-            Parameter { name: "screen"; type: "int" }
+-        }
+-        Method {
+-            name: "colorDepth"
+-            type: "int"
+-            Parameter { name: "screen"; type: "int" }
+-        }
+-        Method {
+-            name: "dpiX"
+-            type: "int"
+-            Parameter { name: "screen"; type: "int" }
+-        }
+-        Method {
+-            name: "dpiY"
+-            type: "int"
+-            Parameter { name: "screen"; type: "int" }
+-        }
+-        Method {
+-            name: "physicalHeight"
+-            type: "int"
+-            Parameter { name: "screen"; type: "int" }
+-        }
+-        Method {
+-            name: "physicalWidth"
+-            type: "int"
+-            Parameter { name: "screen"; type: "int" }
+-        }
+-    }
+-    Component {
+         name: "QDeclarativeNetworkInfo"
+         prototype: "QObject"
+         exports: ["QtSystemInfo/NetworkInfo 5.0"]
+@@ -472,6 +265,43 @@
+         }
+     }
+     Component {
++        name: "QInputDevice"
++        prototype: "QObject"
++        exports: ["QtSystemInfo/InputInfo 5.0"]
++        exportMetaObjectRevisions: [0]
++        Enum {
++            name: "InputType"
++            values: {
++                "Unknown": 0,
++                "Button": 1,
++                "Mouse": 2,
++                "TouchPad": 3,
++                "TouchScreen": 4,
++                "Keyboard": 5,
++                "Switch": 6
++            }
++        }
++        Property { name: "name"; type: "string"; isReadonly: true }
++        Property { name: "devicePath"; type: "string"; isReadonly: true }
++        Property { name: "buttons"; type: "QList<int>"; isReadonly: true }
++        Property { name: "switches"; type: "QList<int>"; isReadonly: true }
++        Property { name: "relativeAxis"; type: "QList<int>"; isReadonly: true }
++        Property { name: "absoluteAxis"; type: "QList<int>"; isReadonly: true }
++        Property { name: "type"; type: "QInputDevice::InputType"; isReadonly: true }
++    }
++    Component {
++        name: "QInputDeviceInfo"
++        prototype: "QObject"
++        exports: ["QtSystemInfo/InputDeviceInfo 5.0"]
++        exportMetaObjectRevisions: [0]
++        Property { name: "deviceCount"; type: "int"; isReadonly: true }
++        Signal { name: "deviceAdded" }
++        Signal { name: "deviceRemoved" }
++        Signal { name: "ready" }
++        Method { name: "addedDevice" }
++        Method { name: "deviceList"; type: "QList<QInputDevice*>" }
++    }
++    Component {
+         name: "QScreenSaver"
+         prototype: "QObject"
+         exports: ["QtSystemInfo/ScreenSaver 5.0"]
+
+=== added file 'src/imports/systeminfo/qdeclarativeinputdeviceinfo.cpp'
+--- old/src/imports/systeminfo/qdeclarativeinputdeviceinfo.cpp	1970-01-01 00:00:00 +0000
++++ new/src/imports/systeminfo/qdeclarativeinputdeviceinfo.cpp	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,143 @@
++/****************************************************************************
++**
++** Copyright (C) 2015 Jolla.
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++#include "qdeclarativeinputdeviceinfo_p.h"
++
++QDeclarativeInputDeviceInfo::QDeclarativeInputDeviceInfo(QObject *parent) :
++    QAbstractListModel(parent),
++    deviceInfo(new QInputDeviceInfo)
++{
++    connect(deviceInfo,SIGNAL(ready()),this,SLOT(updateDeviceList()));
++    connect(deviceInfo, &QInputDeviceInfo::deviceAdded,this,&QDeclarativeInputDeviceInfo::addedDevice);
++    connect(deviceInfo, &QInputDeviceInfo::deviceRemoved,this,&QDeclarativeInputDeviceInfo::removedDevice);
++}
++
++QDeclarativeInputDeviceInfo::~QDeclarativeInputDeviceInfo()
++{
++    delete deviceInfo;
++}
++
++QVariant QDeclarativeInputDeviceInfo::data(const QModelIndex &index, int role) const
++{
++    switch (role) {
++    case ServiceRole:
++        return QVariant::fromValue(static_cast<QObject *>(inputDevices.value(index.row())));
++    }
++
++    return QVariant();
++}
++
++int QDeclarativeInputDeviceInfo::rowCount(const QModelIndex &parent) const
++{
++    Q_UNUSED(parent);
++
++    return inputDevices.count();
++}
++
++int QDeclarativeInputDeviceInfo::indexOf(const QString &devicePath) const
++{
++    int idx(-1);
++    Q_FOREACH (QInputDevice *device, inputDevices) {
++        idx++;
++        if (device->devicePath() == devicePath) return idx;
++    }
++
++    return -1;
++}
++
++QInputDevice *QDeclarativeInputDeviceInfo::get(int index) const
++{
++    if (index < 0 || index > inputDevices.count())
++        return 0;
++    return inputDevices.value(index);
++}
++
++void QDeclarativeInputDeviceInfo::updateDeviceList()
++{
++   QVector <QInputDevice *> newDevices = deviceInfo->deviceList();
++
++    int numNew = newDevices.count();
++
++    for (int i = 0; i < numNew; i++) {
++        int j = inputDevices.indexOf(newDevices.value(i));
++        if (j == -1) {
++            // not found -> remove from list
++            beginInsertRows(QModelIndex(), i, i);
++            inputDevices.insert(i, newDevices.value(i));
++            endInsertRows();
++        } else if (i != j) {
++            // changed its position -> move it
++            QInputDevice* device = inputDevices.value(j);
++            beginMoveRows(QModelIndex(), j, j, QModelIndex(), i);
++            inputDevices.remove(j);
++            inputDevices.insert(i, device);
++            endMoveRows();
++        } else {
++            QModelIndex changedIndex(this->index(j, 0, QModelIndex()));
++            Q_EMIT dataChanged(changedIndex, changedIndex);
++        }
++    }
++
++    int numOld = inputDevices.count();
++    if (numOld > numNew) {
++        beginRemoveRows(QModelIndex(), numNew, numOld - 1);
++        inputDevices.remove(numNew, numOld - numNew);
++        endRemoveRows();
++    }
++}
++
++void QDeclarativeInputDeviceInfo::addedDevice(const QString &devicePath)
++{
++    updateDeviceList();
++    Q_EMIT newDevice(devicePath);
++}
++
++void QDeclarativeInputDeviceInfo::removedDevice(const QString &devicePath)
++{
++    updateDeviceList();
++    Q_EMIT deviceRemoved(devicePath);
++}
++
++QHash<int, QByteArray> QDeclarativeInputDeviceInfo::roleNames() const
++{
++    QHash<int, QByteArray> roles;
++    roles.insert(ServiceRole, "service");
++    return roles;
++}
+
+=== added file 'src/imports/systeminfo/qdeclarativeinputdeviceinfo_p.h'
+--- old/src/imports/systeminfo/qdeclarativeinputdeviceinfo_p.h	1970-01-01 00:00:00 +0000
++++ new/src/imports/systeminfo/qdeclarativeinputdeviceinfo_p.h	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,86 @@
++/****************************************************************************
++**
++** Copyright (C) 2015 Jolla.
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef QDECLARATIVEINPUTDEVICEINFO_H
++#define QDECLARATIVEINPUTDEVICEINFO_H
++
++#include <QObject>
++#include <QAbstractListModel>
++#include "qinputinfo.h"
++
++class QDeclarativeInputDeviceInfo : public QAbstractListModel
++{
++    Q_OBJECT
++    Q_DISABLE_COPY(QDeclarativeInputDeviceInfo)
++
++public:
++    enum ItemRoles {
++        ServiceRole = Qt::UserRole + 1
++    };
++
++    explicit QDeclarativeInputDeviceInfo(QObject *parent = 0);
++    virtual ~QDeclarativeInputDeviceInfo();
++
++    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
++    int rowCount(const QModelIndex &parent = QModelIndex()) const;
++
++    QHash<int, QByteArray> roleNames() const;
++
++    Q_INVOKABLE int indexOf(const QString &devicePath) const;
++
++    Q_INVOKABLE QInputDevice *get(int index) const;
++
++signals:
++    void newDevice(const QString &devicePath);
++    void deviceRemoved(const QString &devicePath);
++
++public slots:
++    void updateDeviceList();
++private:
++    QInputDeviceInfo *deviceInfo;
++    QVector<QInputDevice *> inputDevices;
++private slots:
++    void addedDevice(const QString &);
++    void removedDevice(const QString &path);
++
++};
++
++#endif // QDECLARATIVEINPUTDEVICEINFO_H
+
+=== modified file 'src/imports/systeminfo/qsysteminfo.cpp'
+--- old/src/imports/systeminfo/qsysteminfo.cpp	2015-02-03 15:48:03 +0000
++++ new/src/imports/systeminfo/qsysteminfo.cpp	2015-02-03 15:48:27 +0000
+@@ -45,7 +45,10 @@
+ #include "qdeclarativebatteryinfo_p.h"
+ #include "qdeclarativedeviceinfo_p.h"
+ #include "qdeclarativenetworkinfo_p.h"
++#include "qdeclarativeinputdeviceinfo_p.h"
++
+ #include <qscreensaver.h>
++#include "qinputinfo.h"
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -65,6 +68,8 @@
+         qmlRegisterType<QDeclarativeDeviceInfo>(uri, major, minor, "DeviceInfo");
+         qmlRegisterType<QDeclarativeNetworkInfo>(uri, major, minor, "NetworkInfo");
+         qmlRegisterType<QScreenSaver>(uri, major, minor, "ScreenSaver");
++        qmlRegisterType<QDeclarativeInputDeviceInfo>(uri, major, minor, "InputDeviceInfo");
++        qmlRegisterType<QInputDevice>(uri, major, minor, "InputInfo");
+     }
+ };
+ 
+
+=== modified file 'src/imports/systeminfo/systeminfo.pro'
+--- old/src/imports/systeminfo/systeminfo.pro	2015-02-03 15:48:03 +0000
++++ new/src/imports/systeminfo/systeminfo.pro	2015-02-03 15:49:21 +0000
+@@ -4,12 +4,14 @@
+ HEADERS += \
+     qdeclarativebatteryinfo_p.h \
+     qdeclarativedeviceinfo_p.h \
+-    qdeclarativenetworkinfo_p.h
++    qdeclarativenetworkinfo_p.h \
++    qdeclarativeinputdeviceinfo_p.h
+ 
+ SOURCES += \
+     qdeclarativebatteryinfo.cpp \
+     qdeclarativedeviceinfo.cpp \
+     qdeclarativenetworkinfo.cpp \
+-    qsysteminfo.cpp
++    qsysteminfo.cpp \
++    qdeclarativeinputdeviceinfo.cpp
+ 
+ load(qml_plugin)
+
+=== added file 'src/systeminfo/linux/qinputdeviceinfo_linux.cpp'
+--- old/src/systeminfo/linux/qinputdeviceinfo_linux.cpp	1970-01-01 00:00:00 +0000
++++ new/src/systeminfo/linux/qinputdeviceinfo_linux.cpp	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,239 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "qinputdeviceinfo_linux_p.h"
++
++#include <libudev.h>
++#include <libevdev/libevdev.h>
++#include <fcntl.h>
++#include <QDebug>
++#include <QSocketNotifier>
++#include <QTimer>
++
++QInputDeviceInfoPrivate::QInputDeviceInfoPrivate(QObject *parent) :
++    QObject(parent)
++  , udev(0)
++{
++    QTimer::singleShot(250,this,SLOT(init()));
++}
++
++void QInputDeviceInfoPrivate::init()
++{
++    if (!udev)
++        udev = udev_new();
++
++    struct udev_list_entry *devices, *dev_list_entry;
++    struct udev_device *dev;
++
++    QString subsystem = QStringLiteral("input");
++    struct udev_enumerate *enumerate = 0;
++
++    if (udev) {
++
++        udevMonitor = udev_monitor_new_from_netlink(udev, "udev");
++        udev_monitor_filter_add_match_subsystem_devtype(udevMonitor, subsystem.toLatin1(), NULL);
++        enumerate = udev_enumerate_new(udev);
++        udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());
++
++
++        udev_monitor_enable_receiving(udevMonitor);
++        notifierFd = udev_monitor_get_fd(udevMonitor);
++
++        notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);
++        connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));
++
++
++        udev_enumerate_scan_devices(enumerate);
++        devices = udev_enumerate_get_list_entry(enumerate);
++
++        udev_list_entry_foreach(dev_list_entry, devices) {
++            const char *path;
++            path = udev_list_entry_get_name(dev_list_entry);
++
++            dev = udev_device_new_from_syspath(udev, path);
++
++            QString eventPath = QString::fromLatin1(udev_device_get_sysname(dev));
++
++            if (qstrcmp(udev_device_get_subsystem(dev), "input") == 0 ) {
++
++                if (eventPath.contains(QStringLiteral("event"))) {
++                    eventPath.prepend(QStringLiteral("/dev/input/"));
++
++                    QInputDevice *iDevice = addDevice(eventPath);
++                    if (!iDevice)
++                        continue;
++                    iDevice->setType(getInputType(dev));
++
++                if (iDevice->switches().count() > 0 && iDevice->buttons().count() == 0)
++                    iDevice->setType(QInputDeviceInfo::Switch);
++
++                if (iDevice->buttons().count() > 0 && iDevice->type() == QInputDeviceInfo::Unknown)
++                    iDevice->setType(QInputDeviceInfo::Button);
++
++                deviceList.append(iDevice);
++                deviceMap.insert(eventPath,iDevice);
++                Q_EMIT newDevice(eventPath);
++
++                }
++            }
++        }
++        udev_enumerate_unref(enumerate);
++    }
++    Q_EMIT ready();
++}
++
++QInputDeviceInfo::InputType QInputDeviceInfoPrivate::getInputType( struct udev_device *dev)
++{
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD"), "1") == 0 )
++       return QInputDeviceInfo::Keyboard;
++
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_MOUSE"), "1") == 0)
++        return QInputDeviceInfo::Mouse;
++
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TOUCHPAD"), "1") == 0)
++       return QInputDeviceInfo::TouchPad;
++
++    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TOUCHSCREEN"), "1") == 0
++            || qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TABLET"), "1") == 0)
++      return QInputDeviceInfo::TouchScreen;
++
++return  QInputDeviceInfo::Unknown;
++}
++
++QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)
++{
++    QInputDevice *inputDevice = new QInputDevice(this);
++
++    struct libevdev *dev = NULL;
++    int fd;
++    int rc = 1;
++    fd = open(path.toLatin1(), O_RDONLY|O_NONBLOCK);
++
++    if (fd == -1) {
++        qDebug() << "Failed to open";
++        return inputDevice;
++    }
++    rc = libevdev_new_from_fd(fd, &dev);
++    if (rc < 0) {
++        qDebug() << "Failed to init libevdev ("<< strerror(-rc) << ")";
++        return inputDevice;
++    }
++
++    inputDevice->setName(QString::fromLatin1(libevdev_get_name(dev)));
++    inputDevice->setDevicePath(path);
++    for (int i = 0; i < EV_MAX; i++) {
++        if (i == EV_KEY || i == EV_SW || i == EV_REL
++                || i == EV_REL || i == EV_ABS) {
++            for (int j = 0; j <  libevdev_event_type_get_max(i); j++) {
++                if (libevdev_has_event_code(dev, i, j)) {
++                    switch (i) {
++                    case EV_KEY:
++                        inputDevice->addButton(j);
++                        break;
++                    case EV_SW:
++                        inputDevice->addSwitch(j);
++                        break;
++                    case EV_REL:
++                        inputDevice->addRelativeAxis(j);
++                        break;
++                    case EV_ABS:
++                        inputDevice->addAbsoluteAxis(j);
++                        break;
++                    };
++                }
++            }
++        }
++    }
++    return inputDevice;
++}
++
++void QInputDeviceInfoPrivate::removeDevice(const QString &path)
++{
++    for (int i = 0; i < deviceList.size(); ++i) {
++        if (deviceList.at(i)->devicePath() == path) {
++            delete deviceList.takeAt(i);
++            deviceMap.remove(path);
++            Q_EMIT deviceRemoved(path);
++        }
++    }
++}
++
++void QInputDeviceInfoPrivate::onUDevChanges()
++{
++    struct udev_device *dev = udev_monitor_receive_device(udevMonitor);
++    if (dev) {
++        if (qstrcmp(udev_device_get_subsystem(dev), "input") == 0 ) {
++            QString eventPath = QString::fromLatin1(udev_device_get_sysname(dev));
++
++            if (eventPath.contains(QStringLiteral("input")))
++                return;
++
++            QString action = QString::fromStdString(udev_device_get_action(dev));
++
++            if (!eventPath.contains(QStringLiteral("/dev/input/")))
++                eventPath.prepend(QStringLiteral("/dev/input/"));
++
++            if (action == QStringLiteral("add")) {
++
++                QInputDevice *iDevice = addDevice(eventPath);
++                if (!iDevice)
++                    return;
++
++                    iDevice->setType(getInputType(dev));
++                    udev_device_unref(dev);
++
++                if (iDevice->switches().count() > 0 && iDevice->buttons().count() == 0)
++                    iDevice->setType(QInputDeviceInfo::Switch);
++
++                if (iDevice->buttons().count() > 0 && iDevice->type() == QInputDeviceInfo::Unknown)
++                    iDevice->setType(QInputDeviceInfo::Button);
++
++                deviceList.append(iDevice);
++                deviceMap.insert(eventPath,iDevice);
++
++                Q_EMIT newDevice(eventPath);
++
++            } else if (action == QStringLiteral("remove")) {
++                removeDevice(eventPath);
++            }
++        }
++    }
++}
+
+=== added file 'src/systeminfo/linux/qinputdeviceinfo_linux_p.h'
+--- old/src/systeminfo/linux/qinputdeviceinfo_linux_p.h	1970-01-01 00:00:00 +0000
++++ new/src/systeminfo/linux/qinputdeviceinfo_linux_p.h	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,91 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef QINPUTDEVICEINFO_LINUX_P_H
++#define QINPUTDEVICEINFO_LINUX_P_H
++
++#include <QObject>
++#include "qinputinfo.h"
++#include <libudev.h>
++
++class QInputDevicePrivate : public QObject
++{
++    Q_OBJECT
++public:
++    explicit QInputDevicePrivate(QObject *parent = 0);
++
++    QString name;
++    QString devicePath;
++    QList <int> buttons; //keys
++    QList <int> switches;
++    QList <int> relativeAxis;
++    QList <int> absoluteAxis;
++    QInputDeviceInfo::InputType type;
++};
++
++class QInputDeviceInfoPrivate : public QObject
++{
++    Q_OBJECT
++public:
++    explicit QInputDeviceInfoPrivate(QObject *parent = 0);
++    QVector <QInputDevice *> deviceList;
++    QMap <QString, QInputDevice *> deviceMap;
++
++signals:
++    void newDevice(const QString &);
++    void deviceRemoved(const QString &);
++    void ready();
++
++private:
++    struct udev *udev;
++    QInputDevice *addDevice(const QString &path);
++    void removeDevice(const QString &path);
++    QSocketNotifier *notifier;
++    int notifierFd;
++    struct udev_monitor *udevMonitor;
++    QInputDeviceInfo::InputType getInputType( struct udev_device *);
++
++private Q_SLOTS:
++    void onUDevChanges();
++    void init();
++};
++
++#endif // QINPUTDEVICEINFO_LINUX_P_H
+
+=== added file 'src/systeminfo/qinputinfo.cpp'
+--- old/src/systeminfo/qinputinfo.cpp	1970-01-01 00:00:00 +0000
++++ new/src/systeminfo/qinputinfo.cpp	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,159 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "qinputinfo.h"
++
++#if defined(Q_OS_LINUX)
++#include "linux/qinputdeviceinfo_linux_p.h"
++#endif
++
++QT_BEGIN_NAMESPACE
++
++
++QInputDevicePrivate::QInputDevicePrivate(QObject *parent) :
++    QObject(parent),
++    type(QInputDeviceInfo::Unknown)
++{
++}
++
++QInputDevice::QInputDevice(QObject *parent) :
++    QObject(parent),
++    d_ptr(new QInputDevicePrivate(this))
++{
++}
++
++QString QInputDevice::name() const
++{
++    return d_ptr->name;
++}
++
++void QInputDevice::setName(const QString &name)
++{
++    d_ptr->name = name;
++}
++
++QString QInputDevice::devicePath() const
++{
++    return d_ptr->devicePath;
++}
++
++void QInputDevice::setDevicePath(const QString &path)
++{
++    d_ptr->devicePath = path;
++}
++
++QList <int> QInputDevice::buttons() const
++{
++    return d_ptr->buttons;
++}
++
++void QInputDevice::addButton(int buttonCode)
++{
++    d_ptr->buttons.append(buttonCode);
++}
++
++QList <int> QInputDevice::switches() const
++{
++    return d_ptr->switches;
++}
++
++void QInputDevice::addSwitch(int switchCode)
++{
++    d_ptr->switches.append(switchCode);
++}
++
++QList <int> QInputDevice::relativeAxis() const
++{
++    return d_ptr->relativeAxis;
++}
++
++void QInputDevice::addRelativeAxis(int axisCode)
++{
++    d_ptr->relativeAxis.append(axisCode);
++}
++
++QList <int> QInputDevice::absoluteAxis() const
++{
++    return d_ptr->absoluteAxis;
++}
++
++void QInputDevice::addAbsoluteAxis(int axisCode)
++{
++    d_ptr->absoluteAxis.append(axisCode);
++}
++
++QInputDeviceInfo::InputType QInputDevice::type()
++{
++    return d_ptr->type;
++}
++
++void QInputDevice::setType(QInputDeviceInfo::InputType type)
++{
++    d_ptr->type = type;
++}
++
++
++QInputDeviceInfo::QInputDeviceInfo(QObject *parent) :
++    QObject(parent),
++    d_ptr(new QInputDeviceInfoPrivate(this))
++{
++    connect(d_ptr, &QInputDeviceInfoPrivate::newDevice,this,&QInputDeviceInfo::addedDevice);
++    connect(d_ptr, &QInputDeviceInfoPrivate::deviceRemoved,this,&QInputDeviceInfo::deviceRemoved);
++
++    connect(d_ptr,SIGNAL(ready()),this,SIGNAL(ready()));
++}
++
++QVector <QInputDevice *> QInputDeviceInfo::deviceList()
++{
++    return d_ptr->deviceList;
++}
++
++QMap <QString, QInputDevice *> QInputDeviceInfo::deviceMap()
++{
++    return d_ptr->deviceMap;
++}
++
++void QInputDeviceInfo::addedDevice(const QString & devicePath)
++{
++    Q_EMIT deviceAdded(devicePath);
++}
++
++QT_END_NAMESPACE
+
+=== added file 'src/systeminfo/qinputinfo.h'
+--- old/src/systeminfo/qinputinfo.h	1970-01-01 00:00:00 +0000
++++ new/src/systeminfo/qinputinfo.h	2015-02-03 15:48:27 +0000
+@@ -0,0 +1,141 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtSystems module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef QINPUTINFO_H
++#define QINPUTINFO_H
++
++#include <QtSystemInfo/qsysteminfoglobal.h>
++#include <QObject>
++#include <QVector>
++#include <QMap>
++#include <QSocketNotifier>
++#include <QDebug>
++
++class QInputDeviceInfoPrivate;
++class QInputDevicePrivate;
++class QInputDevice;
++
++class QInputDeviceInfoPrivate;
++class Q_SYSTEMINFO_EXPORT QInputDeviceInfo : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(int deviceCount READ deviceCount)
++public:
++
++    enum InputType {
++        Unknown = 0,
++        Button,
++        Mouse,
++        TouchPad,
++        TouchScreen,
++        Keyboard,
++        Switch
++    };
++    Q_ENUMS(InputType)
++
++    explicit QInputDeviceInfo(QObject *parent = 0);
++
++    Q_INVOKABLE QVector <QInputDevice *> deviceList();
++
++    Q_INVOKABLE QMap <QString, QInputDevice *> deviceMap();
++    int deviceCount() { return deviceList().count(); }
++signals:
++
++    void deviceAdded(const QString & devicePath);
++    void deviceRemoved(const QString & devicePath);
++
++    void ready();
++
++public slots:
++    void addedDevice(const QString & devicePath);
++
++private:
++    Q_DISABLE_COPY(QInputDeviceInfo)
++#if !defined(QT_SIMULATOR)
++    QInputDeviceInfoPrivate *const d_ptr;
++    Q_DECLARE_PRIVATE(QInputDeviceInfo)
++#endif
++};
++
++class Q_SYSTEMINFO_EXPORT QInputDevice : public QObject
++{
++    friend class QInputDeviceInfoPrivate;
++    Q_OBJECT
++    Q_ENUMS(InputType)
++    Q_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::InputType type READ type NOTIFY typeChanged)
++
++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::InputType type();
++signals:
++    void nameChanged();
++    void devicePathChanged();
++    void buttonsChanged();
++    void switchesChanged();
++    void relativeAxisChanged();
++    void absoluteAxisChanged();
++    void typeChanged();
++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(QInputDeviceInfo::InputType);
++};
++
++#endif // QINPUTINFO_H
+
+=== modified file 'src/systeminfo/systeminfo.pro'
+--- old/src/systeminfo/systeminfo.pro	2015-02-03 15:48:03 +0000
++++ new/src/systeminfo/systeminfo.pro	2015-02-03 15:48:27 +0000
+@@ -11,7 +11,9 @@
+ SOURCES += qdeviceinfo.cpp \
+            qscreensaver.cpp \
+            qbatteryinfo.cpp \
+-           qnetworkinfo.cpp
++           qnetworkinfo.cpp \
++    qinputinfo.cpp \
++    linux/qinputdeviceinfo_linux.cpp
+ 
+ win32: !simulator: {
+     contains(CONFIG, release) {
+@@ -110,6 +112,10 @@
+         SOURCES += linux/qbatteryinfo_linux.cpp
+     }
+ 
++CONFIG += link_pkgconfig
++PKGCONFIG += libudev libevdev
++LIBS += -ludev -levdev
++
+     config_udev {
+         CONFIG += link_pkgconfig
+         PKGCONFIG += udev
+@@ -219,7 +225,9 @@
+ 
+ QMAKE_DOCS = $$PWD/../../doc/config/systeminfo/qtsysteminfo.qdocconf
+ 
+-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
++HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS \
++    qinputinfo.h \
++    linux/qinputdeviceinfo_linux_p.h
+ load(qt_module)
+ 
+ # This must be done after loading qt_module.prf
+@@ -236,3 +244,6 @@
+     }
+ }
+ 
++OTHER_FILES += \
++    notes.txt
++
+
+=== modified file 'tests/auto/systeminfo/systeminfo.pro'
+--- old/tests/auto/systeminfo/systeminfo.pro	2015-02-03 15:48:03 +0000
++++ new/tests/auto/systeminfo/systeminfo.pro	2015-02-03 15:48:27 +0000
+@@ -3,4 +3,5 @@
+ SUBDIRS = \
+     qdeviceinfo \
+     qscreensaver \
+-    qbatteryinfo
++    qbatteryinfo \
++#    qinputdeviceinfo
+

=== added file 'debian/patches/remove-storageinfo-examples.patch'
--- debian/patches/remove-storageinfo-examples.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/remove-storageinfo-examples.patch	2015-02-03 15:58:39 +0000
@@ -0,0 +1,342 @@
+=== removed directory 'examples/systeminfo/qml-storageinfo'
+=== removed directory 'examples/systeminfo/qml-storageinfo/content'
+=== removed file 'examples/systeminfo/qml-storageinfo/content/ProgressBar.qml'
+--- old/examples/systeminfo/qml-storageinfo/content/ProgressBar.qml	2013-06-14 10:32:13 +0000
++++ new/examples/systeminfo/qml-storageinfo/content/ProgressBar.qml	1970-01-01 00:00:00 +0000
+@@ -1,85 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the examples of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:BSD$
+-** You may use this file under the terms of the BSD license as follows:
+-**
+-** "Redistribution and use in source and binary forms, with or without
+-** modification, are permitted provided that the following conditions are
+-** met:
+-**   * Redistributions of source code must retain the above copyright
+-**     notice, this list of conditions and the following disclaimer.
+-**   * Redistributions in binary form must reproduce the above copyright
+-**     notice, this list of conditions and the following disclaimer in
+-**     the documentation and/or other materials provided with the
+-**     distribution.
+-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+-**     of its contributors may be used to endorse or promote products derived
+-**     from this software without specific prior written permission.
+-**
+-**
+-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-import QtQuick 2.0
+-
+-Item {
+-    id: progressbar
+-
+-    property int minimum: 0
+-    property int maximum: 100
+-    property int value: 0
+-    property int maxval: 0
+-    property alias color: gradient1.color
+-    property alias secondColor: gradient2.color
+-
+-    width: 30; height: 250
+-    clip: true
+-
+-    BorderImage {
+-        source: "background.png"
+-        width: parent.width; height: parent.height
+-        border { left: 4; top: 4; right: 4; bottom: 4 }
+-    }
+-
+-    Rectangle {
+-        id: highlight
+-
+-        property int widthDest: ((progressbar.height * (value - minimum)) / (maximum - minimum) )
+-
+-        height: highlight.widthDest
+-        Behavior on height { SmoothedAnimation { velocity: 1200 } }
+-
+-        anchors { left: parent.left; right: parent.right; bottom: parent.bottom; leftMargin: 2; rightMargin: 2; bottomMargin: 2 }
+-//        anchors { left: parent.left; top: parent.top; bottom: parent.bottom; leftMargin: 3; topMargin: 3; bottomMargin: 3 }
+-        radius: 1
+-        gradient: Gradient {
+-            GradientStop { id: gradient1; position: 0.0 }
+-            GradientStop { id: gradient2; position: 1.0 }
+-        }
+-
+-    }
+-    Text {
+-        anchors { /*right: highlight.right; rightMargin: 6; */horizontalCenter: parent.horizontalCenter }
+-        color: "black"
+-        font.bold: true
+-        text: maxval + '%'//Math.floor((value - minimum) / (maximum - minimum) * 100) + '%'
+-    }
+-}
+
+=== removed file 'examples/systeminfo/qml-storageinfo/content/background.png'
+Binary files old/examples/systeminfo/qml-storageinfo/content/background.png	2013-06-14 10:32:13 +0000 and new/examples/systeminfo/qml-storageinfo/content/background.png	1970-01-01 00:00:00 +0000 differ
+=== removed file 'examples/systeminfo/qml-storageinfo/main.cpp'
+--- old/examples/systeminfo/qml-storageinfo/main.cpp	2013-06-14 10:32:13 +0000
++++ new/examples/systeminfo/qml-storageinfo/main.cpp	1970-01-01 00:00:00 +0000
+@@ -1,43 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-#include"../stub.h"
+-SYSINFO_EXAMPLE_MAIN(qml-storage)
+
+=== removed file 'examples/systeminfo/qml-storageinfo/qml-storage.qml'
+--- old/examples/systeminfo/qml-storageinfo/qml-storage.qml	2013-06-14 10:32:13 +0000
++++ new/examples/systeminfo/qml-storageinfo/qml-storage.qml	1970-01-01 00:00:00 +0000
+@@ -1,111 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-import QtQuick 2.0
+-import QtSystemInfo 5.0
+-import "content"
+-
+-Rectangle {
+-    width: 480; height: 854
+-    color: "#343434"
+-
+-    StorageInfo {
+-        id: storageinfo
+-        onLogicalDriveChanged: updateList;
+-    }
+-
+-    function getTotalSizeText(name) {
+-        var totalSpace = storageinfo.totalDiskSpace(name);
+-        if (totalSpace / 1024 < 1024)
+-            return Math.round((totalSpace / 1024) * 100) / 100 + " kb avail.";
+-        else if (totalSpace/1024/1024 < 1024)
+-            return Math.round((totalSpace / 1024 / 1024) * 100) / 100 + " Mb avail.";
+-        else if (totalSpace/1024/1024/1024 < 1024)
+-            return Math.round((totalSpace / 1024 / 1024 / 1024) * 100) / 100 + " Gb avail.";
+-        return "";
+-    }
+-
+-    function getAvailableSizeText(name) {
+-        var dspace = storageinfo.availableDiskSpace(name);
+-        if (dspace /1024 < 1024)
+-            return Math.round((dspace / 1024) * 100) / 100 + " kb / ";
+-        else if (dspace/1024/1024 < 1024)
+-            return Math.round((dspace / 1024 / 1024) * 100) / 100 + " Mb / ";
+-        else if (dspace/1024/1024/1024 < 1024)
+-            return Math.round((dspace / 1024 / 1024 / 1024) * 100) / 100 + " Gb / ";
+-        return "";
+-    }
+-
+-    function getPercent(name) {
+-        return Math.round(100 - ((storageinfo.availableDiskSpace(name) / storageinfo.totalDiskSpace(name)) * 100))
+-    }
+-
+-    property alias storageList: storageinfo.allLogicalDrives;
+-
+-    function updateList() {
+-        driveList:storageList: storageinfo.allLogicalDrives;
+-    }
+-
+-    Component {
+-        id: listItem
+-
+-        Row {
+-            id:row
+-            spacing: 10
+-            ProgressBar {
+-                width: 120; height: 25
+-                maxval: getPercent(name.text)
+-                value: getPercent(name.text)
+-                NumberAnimation on value { duration: 1500; from: 0; to: getPercent(name.text); loops: 1 }
+-                ColorAnimation on color { duration: 1500; from: "lightsteelblue"; to: "thistle"; loops:1}
+-                ColorAnimation on secondColor { duration: 1500; from: "steelblue"; to: "#CD96CD"; loops: 1 }
+-            }
+-            Text { id: name; text: modelData; color: "white";}
+-            Text { text: getAvailableSizeText(name.text) + getTotalSizeText(name.text); color: "white";}
+-        }
+-    }
+-
+-    ListView {
+-        anchors.fill: parent
+-        model: storageList
+-        delegate: listItem
+-    }
+-}
+
+=== removed file 'examples/systeminfo/qml-storageinfo/qml-storageinfo.pro'
+--- old/examples/systeminfo/qml-storageinfo/qml-storageinfo.pro	2013-06-14 10:32:13 +0000
++++ new/examples/systeminfo/qml-storageinfo/qml-storageinfo.pro	1970-01-01 00:00:00 +0000
+@@ -1,12 +0,0 @@
+-TEMPLATE = app
+-TARGET = qml-storageinfo
+-QT += quick
+-SOURCES = main.cpp
+-
+-app.files = \
+-    $$files(*.qml) \
+-    content
+-
+-target.path = $$[QT_INSTALL_EXAMPLES]/sysinfo/qml-storageinfo
+-app.path = $$[QT_INSTALL_EXAMPLES]/sysinfo/qml-storageinfo
+-INSTALLS += target app
+
+=== modified file 'examples/systeminfo/systeminfo.pro'
+--- old/examples/systeminfo/systeminfo.pro	2013-06-14 10:32:13 +0000
++++ new/examples/systeminfo/systeminfo.pro	2015-02-03 09:54:15 +0000
+@@ -2,7 +2,6 @@
+ 
+ SUBDIRS += \
+     qml-deviceinfo \
+-    qml-storageinfo \
+     qml-battery
+ 
+ #qtHaveModule(widgets): SUBDIRS += \
+
+=== modified file 'src/imports/systeminfo/plugins.qmltypes'
+--- old/src/imports/systeminfo/plugins.qmltypes	2013-06-14 10:32:13 +0000
++++ new/src/imports/systeminfo/plugins.qmltypes	2015-02-03 09:54:15 +0000
+@@ -472,50 +472,6 @@
+         }
+     }
+     Component {
+-        name: "QDeclarativeStorageInfo"
+-        prototype: "QObject"
+-        exports: ["QtSystemInfo/StorageInfo 5.0"]
+-        exportMetaObjectRevisions: [0]
+-        Enum {
+-            name: "DriveType"
+-            values: {
+-                "UnknownDrive": 0,
+-                "InternalDrive": 1,
+-                "RemovableDrive": 2,
+-                "RemoteDrive": 3,
+-                "CdromDrive": 4,
+-                "RamDrive": 5
+-            }
+-        }
+-        Property { name: "allLogicalDrives"; type: "QStringList"; isReadonly: true }
+-        Property { name: "monitorAllLogicalDrives"; type: "bool" }
+-        Signal {
+-            name: "logicalDriveChanged"
+-            Parameter { name: "drive"; type: "string" }
+-            Parameter { name: "added"; type: "bool" }
+-        }
+-        Method {
+-            name: "availableDiskSpace"
+-            type: "qlonglong"
+-            Parameter { name: "drive"; type: "string" }
+-        }
+-        Method {
+-            name: "totalDiskSpace"
+-            type: "qlonglong"
+-            Parameter { name: "drive"; type: "string" }
+-        }
+-        Method {
+-            name: "uriForDrive"
+-            type: "string"
+-            Parameter { name: "drive"; type: "string" }
+-        }
+-        Method {
+-            name: "driveType"
+-            type: "int"
+-            Parameter { name: "drive"; type: "string" }
+-        }
+-    }
+-    Component {
+         name: "QScreenSaver"
+         prototype: "QObject"
+         exports: ["QtSystemInfo/ScreenSaver 5.0"]
+

=== added file 'debian/patches/remove-storageinfo.patch'
--- debian/patches/remove-storageinfo.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/remove-storageinfo.patch	2015-02-03 15:58:39 +0000
@@ -0,0 +1,2371 @@
+=== removed file 'src/imports/systeminfo/qdeclarativestorageinfo.cpp'
+--- old/src/imports/systeminfo/qdeclarativestorageinfo.cpp	2013-06-14 10:32:13 +0000
++++ new/src/imports/systeminfo/qdeclarativestorageinfo.cpp	1970-01-01 00:00:00 +0000
+@@ -1,157 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-#include "qdeclarativestorageinfo_p.h"
+-
+-QT_BEGIN_NAMESPACE
+-
+-/*!
+-    \qmltype StorageInfo
+-    \instantiates QDeclarativeStorageInfo
+-    \inqmlmodule QtSystemInfo
+-    \ingroup qml-systeminfo
+-    \brief The StorageInfo element provides various information about the storage system.
+-*/
+-
+-/*!
+-    \internal
+-*/
+-QDeclarativeStorageInfo::QDeclarativeStorageInfo(QObject *parent)
+-    : QObject(parent)
+-    , storageInfo(new QStorageInfo(this))
+-    , isMonitorAllLogicalDrives(false)
+-{
+-}
+-
+-/*!
+-    \internal
+- */
+-QDeclarativeStorageInfo::~QDeclarativeStorageInfo()
+-{
+-}
+-
+-/*!
+-    \qmlproperty bool StorageInfo::monitorAllLogicalDrives
+-
+-    This property triggers the active monitoring of all available logical drives.
+- */
+-bool QDeclarativeStorageInfo::monitorAllLogicalDrives() const
+-{
+-    return isMonitorAllLogicalDrives;
+-}
+-
+-void QDeclarativeStorageInfo::setMonitorAllLogicalDrives(bool monitor)
+-{
+-    if (monitor != isMonitorAllLogicalDrives) {
+-        isMonitorAllLogicalDrives = monitor;
+-        if (monitor) {
+-            connect(storageInfo, SIGNAL(logicalDriveChanged(QString,bool)),
+-                    this, SIGNAL(logicalDriveChanged(QString,bool)));
+-        } else {
+-            disconnect(storageInfo, SIGNAL(logicalDriveChanged(QString,bool)),
+-                       this, SIGNAL(logicalDriveChanged(QString,bool)));
+-        }
+-        emit monitorAllLogicalDrivesChanged();
+-    }
+-}
+-
+-/*!
+-    \qmlproperty stringlist StorageInfo::allLogicalDrives
+-
+-    This property holds a list of all the available logical drives.
+-*/
+-QStringList QDeclarativeStorageInfo::allLogicalDrives() const
+-{
+-    return storageInfo->allLogicalDrives();
+-}
+-
+-/*!
+-    \qmlmethod qlonglong StorageInfo::availableDiskSpace(string drive)
+-
+-    Returns the available free space on the \a drive, in bytes. -1 is returned if the drive doesn't
+-    exist, or the information is not available.
+-*/
+-qlonglong QDeclarativeStorageInfo::availableDiskSpace(const QString &drive) const
+-{
+-    return storageInfo->availableDiskSpace(drive);
+-}
+-
+-/*!
+-    \qmlmethod qlonglong StorageInfo::totalDiskSpace(string drive)
+-
+-    Returns the total space of the \a drive, in bytes. -1 is returned if the drive doesn't exist,
+-    or the information is not available.
+-*/
+-qlonglong QDeclarativeStorageInfo::totalDiskSpace(const QString &drive) const
+-{
+-    return storageInfo->totalDiskSpace(drive);
+-}
+-
+-/*!
+-    \qmlmethod qlonglong StorageInfo::uriForDrive(string drive)
+-
+-    Returns the URI, or unique identifier for the given \a drive. If the drive doesn't exist, or the
+-    information is not available, an empty string is returned.
+-*/
+-QString QDeclarativeStorageInfo::uriForDrive(const QString &drive) const
+-{
+-    return storageInfo->uriForDrive(drive);
+-}
+-
+-/*!
+-    \qmlmethod DriveType StorageInfo::driveType(string drive)
+-
+-    Returns the type of the given \a drive. Possible values are:
+-    \list
+-    \li StorageInfo.UnknownDrive    - Drive type unknown.
+-    \li StorageInfo.InternalDrive   - Internal mass storage drive, e.g. hard drive.
+-    \li StorageInfo.RemovableDrive  - Removable drive, e.g. memory card.
+-    \li StorageInfo.RemoteDrive     - Network drive.
+-    \li StorageInfo.CdromDrive      - CD-ROM.
+-    \li StorageInfo.RamDrive        - Virtual drive made in RAM memory.
+-    \endlist
+-*/
+-int QDeclarativeStorageInfo::driveType(const QString &drive) const
+-{
+-    return storageInfo->driveType(drive);
+-}
+-
+-QT_END_NAMESPACE
+
+=== removed file 'src/imports/systeminfo/qdeclarativestorageinfo_p.h'
+--- old/src/imports/systeminfo/qdeclarativestorageinfo_p.h	2013-06-14 10:32:13 +0000
++++ new/src/imports/systeminfo/qdeclarativestorageinfo_p.h	1970-01-01 00:00:00 +0000
+@@ -1,104 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-//
+-//  W A R N I N G
+-//  -------------
+-//
+-// This file is not part of the Qt API.  It exists purely as an
+-// implementation detail.  This header file may change from version to
+-// version without notice, or even be removed.
+-//
+-// We mean it.
+-//
+-
+-#ifndef QDECLARATIVESTORAGEINFO_P_H
+-#define QDECLARATIVESTORAGEINFO_P_H
+-
+-#include <qstorageinfo.h>
+-
+-QT_BEGIN_NAMESPACE
+-
+-class QDeclarativeStorageInfo : public QObject
+-{
+-    Q_OBJECT
+-
+-    Q_ENUMS(DriveType)
+-
+-    Q_PROPERTY(QStringList allLogicalDrives READ allLogicalDrives NOTIFY logicalDriveChanged)
+-    Q_PROPERTY(bool monitorAllLogicalDrives READ monitorAllLogicalDrives WRITE setMonitorAllLogicalDrives NOTIFY monitorAllLogicalDrivesChanged)
+-
+-public:
+-    enum DriveType {
+-        UnknownDrive = QStorageInfo::UnknownDrive,
+-        InternalDrive = QStorageInfo::InternalDrive,
+-        RemovableDrive = QStorageInfo::RemovableDrive,
+-        RemoteDrive = QStorageInfo::RemoteDrive,
+-        CdromDrive = QStorageInfo::CdromDrive,
+-        RamDrive = QStorageInfo::RamDrive
+-    };
+-
+-    QDeclarativeStorageInfo(QObject *parent = 0);
+-    virtual ~QDeclarativeStorageInfo();
+-
+-    bool monitorAllLogicalDrives() const;
+-    void setMonitorAllLogicalDrives(bool monitor);
+-    QStringList allLogicalDrives() const;
+-
+-    Q_INVOKABLE qlonglong availableDiskSpace(const QString &drive) const;
+-    Q_INVOKABLE qlonglong totalDiskSpace(const QString &drive) const;
+-    Q_INVOKABLE QString uriForDrive(const QString &drive) const;
+-    Q_INVOKABLE int driveType(const QString &drive) const;
+-
+-Q_SIGNALS:
+-    void monitorAllLogicalDrivesChanged();
+-
+-    void logicalDriveChanged(const QString &drive, bool added);
+-
+-private:
+-    QStorageInfo *storageInfo;
+-
+-    bool isMonitorAllLogicalDrives;
+-};
+-
+-QT_END_NAMESPACE
+-
+-#endif // QDECLARATIVESTORAGEINFO_P_H
+
+=== modified file 'src/imports/systeminfo/qsysteminfo.cpp'
+--- old/src/imports/systeminfo/qsysteminfo.cpp	2013-07-12 13:41:02 +0000
++++ new/src/imports/systeminfo/qsysteminfo.cpp	2015-02-03 15:08:08 +0000
+@@ -46,7 +46,6 @@
+ #include "qdeclarativedeviceinfo_p.h"
+ #include "qdeclarativenetworkinfo_p.h"
+ #include <qscreensaver.h>
+-#include "qdeclarativestorageinfo_p.h"
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -66,7 +65,6 @@
+         qmlRegisterType<QDeclarativeDeviceInfo>(uri, major, minor, "DeviceInfo");
+         qmlRegisterType<QDeclarativeNetworkInfo>(uri, major, minor, "NetworkInfo");
+         qmlRegisterType<QScreenSaver>(uri, major, minor, "ScreenSaver");
+-        qmlRegisterType<QDeclarativeStorageInfo>(uri, major, minor, "StorageInfo");
+     }
+ };
+ 
+
+=== modified file 'src/imports/systeminfo/systeminfo.pro'
+--- old/src/imports/systeminfo/systeminfo.pro	2013-07-12 13:41:02 +0000
++++ new/src/imports/systeminfo/systeminfo.pro	2015-02-03 15:08:59 +0000
+@@ -4,14 +4,12 @@
+ HEADERS += \
+     qdeclarativebatteryinfo_p.h \
+     qdeclarativedeviceinfo_p.h \
+-    qdeclarativenetworkinfo_p.h \
+-    qdeclarativestorageinfo_p.h
++    qdeclarativenetworkinfo_p.h
+ 
+ SOURCES += \
+     qdeclarativebatteryinfo.cpp \
+     qdeclarativedeviceinfo.cpp \
+     qdeclarativenetworkinfo.cpp \
+-    qdeclarativestorageinfo.cpp \
+     qsysteminfo.cpp
+ 
+ load(qml_plugin)
+
+=== removed file 'src/systeminfo/linux/qstorageinfo_linux.cpp'
+--- old/src/systeminfo/linux/qstorageinfo_linux.cpp	2013-06-14 10:32:13 +0000
++++ new/src/systeminfo/linux/qstorageinfo_linux.cpp	1970-01-01 00:00:00 +0000
+@@ -1,410 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-#include "qstorageinfo_linux_p.h"
+-
+-#include <QtCore/qfile.h>
+-#include <QtCore/qdir.h>
+-#include <QtCore/qmetaobject.h>
+-#include <QtCore/qsocketnotifier.h>
+-
+-#include <errno.h>
+-#include <mntent.h>
+-#include <fcntl.h>
+-#include <linux/fs.h>
+-#include <sys/inotify.h>
+-#include <sys/ioctl.h>
+-#include <sys/stat.h>
+-#include <sys/statfs.h>
+-#include <unistd.h>
+-
+-#if !defined(QT_NO_UDEV)
+-#include "qudevwrapper_p.h"
+-#endif // QT_NO_UDEV
+-
+-#if !defined(QT_NO_UDISKS)
+-#include <QtDBus/qdbusconnection.h>
+-#include <QtDBus/qdbusinterface.h>
+-#include <QtDBus/qdbusreply.h>
+-#endif // QT_NO_UDISKS
+-
+-QT_BEGIN_NAMESPACE
+-
+-QStorageInfoPrivate::QStorageInfoPrivate(QStorageInfo *parent)
+-    : QObject(parent)
+-    , q_ptr(parent)
+-    , inotifyWatcher(-1)
+-    , inotifyFileDescriptor(-1)
+-    , notifier(0)
+-#if !defined(QT_NO_UDEV)
+-    , udevWrapper(0)
+-    , needsUDevWatcher(-1)
+-#endif // QT_NO_UDEV
+-{
+-}
+-
+-QStorageInfoPrivate::~QStorageInfoPrivate()
+-{
+-    cleanupWatcher();
+-}
+-
+-qlonglong QStorageInfoPrivate::availableDiskSpace(const QString &drive)
+-{
+-    struct statfs statistics;
+-    if (statfs(drive.toLatin1(), &statistics) == 0) {
+-        qlonglong blockSize = statistics.f_bsize;
+-        qlonglong availBlocks = statistics.f_bavail;
+-        return availBlocks * blockSize;
+-    }
+-
+-    return -1;
+-}
+-
+-qlonglong QStorageInfoPrivate::totalDiskSpace(const QString &drive)
+-{
+-    struct statfs statistics;
+-    if (statfs(drive.toLatin1(), &statistics) == 0) {
+-        qlonglong blockSize = statistics.f_bsize;
+-        qlonglong totalBlocks = statistics.f_blocks;
+-        return totalBlocks * blockSize;
+-    }
+-
+-    return -1;
+-}
+-
+-QString QStorageInfoPrivate::uriForDrive(const QString &drive)
+-{
+-    QFileInfoList fileinfolist = QDir(QString(QStringLiteral("/dev/disk/by-uuid/"))).entryInfoList(QDir::AllEntries | QDir::NoDot | QDir::NoDotDot);
+-    if (!fileinfolist.isEmpty()) {
+-        FILE *fsDescription = setmntent(_PATH_MOUNTED, "r");
+-        struct mntent entry;
+-        char buffer[512];
+-        QString uri;
+-        while ((getmntent_r(fsDescription, &entry, buffer, sizeof(buffer))) != NULL) {
+-            if (drive != QString::fromLatin1(entry.mnt_dir))
+-                continue;
+-            int idx = fileinfolist.indexOf(QString::fromLatin1(entry.mnt_fsname));
+-            if (idx != -1)
+-                uri = fileinfolist[idx].fileName();
+-            break;
+-        }
+-        endmntent(fsDescription);
+-
+-        if (!uri.isEmpty())
+-            return uri;
+-    }
+-
+-#if !defined(QT_NO_UDISKS)
+-    QDBusReply<QList<QDBusObjectPath> > reply = QDBusConnection::systemBus().call(
+-                QDBusMessage::createMethodCall(QString(QStringLiteral("org.freedesktop.UDisks")),
+-                                               QString(QStringLiteral("/org/freedesktop/UDisks")),
+-                                               QString(QStringLiteral("org.freedesktop.UDisks")),
+-                                               QString(QStringLiteral("EnumerateDevices"))));
+-    if (reply.isValid()) {
+-        QList<QDBusObjectPath> paths = reply.value();
+-        foreach (const QDBusObjectPath &path, paths) {
+-            QDBusInterface interface(QString(QStringLiteral("org.freedesktop.UDisks")), path.path(),
+-                                     QString(QStringLiteral("org.freedesktop.DBus.Properties")),
+-                                     QDBusConnection::systemBus());
+-            if (!interface.isValid())
+-                continue;
+-            QDBusReply<QVariant> reply = interface.call(QString(QStringLiteral("Get")),
+-                                                        QString(QStringLiteral("org.freedesktop.UDisks.Device")),
+-                                                        QString(QStringLiteral("DeviceMountPaths")));
+-            if (reply.isValid() && reply.value().toString() == drive) {
+-                reply = interface.call(QString(QStringLiteral("Get")),
+-                                       QString(QStringLiteral("org.freedesktop.UDisks.Device")),
+-                                       QString(QStringLiteral("IdUuid")));
+-                if (reply.isValid())
+-                    return reply.value().toString();
+-            }
+-        }
+-    }
+-#endif // QT_NO_UDISKS
+-
+-    return QString::null;
+-}
+-
+-QStringList QStorageInfoPrivate::allLogicalDrives()
+-{
+-    // No need to update the list if someone is listening to the signal, as it will be updated in that case
+-#if !defined(QT_NO_UDEV)
+-    if (inotifyWatcher == -1 && needsUDevWatcher != 2)
+-#else
+-    if (inotifyWatcher == -1)
+-#endif // QT_NO_UDEV
+-        updateLogicalDrives();
+-
+-    return logicalDrives;
+-}
+-
+-QStorageInfo::DriveType QStorageInfoPrivate::driveType(const QString &drive)
+-{
+-    QStorageInfo::DriveType type = QStorageInfo::UnknownDrive;
+-    FILE *fsDescription = setmntent(_PATH_MOUNTED, "r");
+-    struct mntent entry;
+-    char buffer[512];
+-    while ((getmntent_r(fsDescription, &entry, buffer, sizeof(buffer))) != NULL) {
+-        if (drive != QString::fromLatin1(entry.mnt_dir))
+-            continue;
+-
+-        if (strcmp(entry.mnt_type, "binfmt_misc") == 0
+-            || strcmp(entry.mnt_type, "debugfs") == 0
+-            || strcmp(entry.mnt_type, "devpts") == 0
+-            || strcmp(entry.mnt_type, "devtmpfs") == 0
+-            || strcmp(entry.mnt_type, "fusectl") == 0
+-            || strcmp(entry.mnt_type, "none") == 0
+-            || strcmp(entry.mnt_type, "proc") == 0
+-            || strcmp(entry.mnt_type, "ramfs") == 0
+-            || strcmp(entry.mnt_type, "securityfs") == 0
+-            || strcmp(entry.mnt_type, "sysfs") == 0
+-            || strcmp(entry.mnt_type, "tmpfs") == 0) {
+-            type = QStorageInfo::RamDrive;
+-            break;
+-        }
+-
+-        if (strcmp(entry.mnt_type, "cifs") == 0
+-            || strcmp(entry.mnt_type, "ncpfs") == 0
+-            || strcmp(entry.mnt_type, "nfs") == 0
+-            || strcmp(entry.mnt_type, "nfs4") == 0
+-            || strcmp(entry.mnt_type, "smbfs") == 0) {
+-            type = QStorageInfo::RemoteDrive;
+-            break;
+-        }
+-
+-        if (strcmp(entry.mnt_type, "iso9660") == 0) {
+-            type = QStorageInfo::CdromDrive;
+-            break;
+-        }
+-
+-        if (strcmp(entry.mnt_type, "rootfs") == 0) {
+-            type = QStorageInfo::InternalDrive;
+-            break;
+-        }
+-
+-        // Now need to guess if it's InternalDrive or RemovableDrive
+-        QString fsName(QString::fromLatin1(entry.mnt_fsname));
+-        if (fsName.contains(QString(QStringLiteral("mapper")))) {
+-            struct stat status;
+-            stat(entry.mnt_fsname, &status);
+-            fsName = QString(QStringLiteral("/sys/block/dm-%1/removable")).arg(status.st_rdev & 0377);
+-        } else {
+- #if defined(QT_SIMULATOR)
+-            if (fsName.startsWith(QStringLiteral("/dev/loop")))
+-               return QStorageInfo::RemovableDrive;
+-#endif
+-            fsName = fsName.section(QString(QStringLiteral("/")), 2, 3);
+-            if (!fsName.isEmpty()) {
+-                if (fsName.length() > 3) {
+-                    // only take the parent of the device
+-                    if (fsName.at(fsName.size() -1).isDigit() && fsName.at(fsName.size() - 2) == QChar(QLatin1Char('p')))
+-                        fsName.chop(2);
+-                    if (fsName.startsWith(QString(QStringLiteral("mmc")))) {
+-                        // "removable" attribute is set only for removable media, and we may have internal mmc cards
+-                        fsName = QString(QStringLiteral("/sys/block/")) + fsName + QString(QStringLiteral("/device/uevent"));
+-                        QFile file(fsName);
+-                        if (file.open(QIODevice::ReadOnly)) {
+-                            QByteArray buf = file.readLine();
+-                            while (buf.size() > 0) {
+-                                if (qstrncmp(buf.constData(), "MMC_TYPE=", 9) == 0) {
+-                                    if (qstrncmp(buf.constData() + 9, "MMC", 3) == 0)
+-                                        type = QStorageInfo::InternalDrive;
+-                                    else if (qstrncmp(buf.constData() + 9, "SD", 2) == 0)
+-                                        type = QStorageInfo::RemovableDrive;
+-                                    if (type != QStorageInfo::UnknownDrive) {
+-                                        endmntent(fsDescription);
+-                                        return type;
+-                                    }
+-                                    break;  // fall back to check the "removable" attribute
+-                                }
+-                                buf = file.readLine();
+-                            }
+-                        }
+-                    }
+-                }
+-                fsName = QString(QStringLiteral("/sys/block/")) + fsName + QString(QStringLiteral("/removable"));
+-            }
+-        }
+-        QFile removable(fsName);
+-        char isRemovable;
+-        if (!removable.open(QIODevice::ReadOnly) || 1 != removable.read(&isRemovable, 1))
+-            break;
+-        if (isRemovable == '0')
+-            type = QStorageInfo::InternalDrive;
+-        else
+-            type = QStorageInfo::RemovableDrive;
+-        break;
+-    }
+-
+-    endmntent(fsDescription);
+-    return type;
+-}
+-
+-void QStorageInfoPrivate::connectNotify(const QMetaMethod &signal)
+-{
+-    static const QMetaMethod logicalDriveChangedSignal = QMetaMethod::fromSignal(&QStorageInfoPrivate::logicalDriveChanged);
+-    if (signal == logicalDriveChangedSignal)
+-        setupWatcher();
+-}
+-
+-void QStorageInfoPrivate::disconnectNotify(const QMetaMethod &signal)
+-{
+-    static const QMetaMethod logicalDriveChangedSignal = QMetaMethod::fromSignal(&QStorageInfoPrivate::logicalDriveChanged);
+-    if (signal == logicalDriveChangedSignal)
+-        cleanupWatcher();
+-}
+-
+-void QStorageInfoPrivate::cleanupWatcher()
+-{
+-#if !defined(QT_NO_UDEV)
+-    if (needsUDevWatcher == 2) {
+-        needsUDevWatcher = 1;
+-        if (udevWrapper)
+-            disconnect(udevWrapper, SIGNAL(driveChanged()), this, SLOT(onDriveChanged()));
+-        return;
+-    }
+-#endif // QT_NO_UDEV
+-
+-    if (notifier) {
+-        delete notifier;
+-        notifier = 0;
+-    }
+-
+-    if (inotifyWatcher != -1) {
+-        inotify_rm_watch(inotifyFileDescriptor, inotifyWatcher);
+-        inotifyWatcher = -1;
+-    }
+-
+-    if (inotifyFileDescriptor != -1) {
+-        close(inotifyFileDescriptor);
+-        inotifyFileDescriptor = -1;
+-    }
+-}
+-
+-void QStorageInfoPrivate::setupWatcher()
+-{
+-    updateLogicalDrives();
+-
+-#if !defined(QT_NO_UDEV)
+-    if (needsUDevWatcher == -1)
+-        needsUDevWatcher = QFileInfo(QStringLiteral("/etc/mtab")).isSymLink();
+-
+-    if (needsUDevWatcher == 1) {
+-        if (!udevWrapper)
+-            udevWrapper = new QUDevWrapper(this);
+-        connect(udevWrapper, SIGNAL(driveChanged()), this, SLOT(onDriveChanged()));
+-        needsUDevWatcher = 2;
+-        return;
+-    }
+-#endif // QT_NO_UDEV
+-
+-    if (inotifyFileDescriptor == -1
+-        && (inotifyFileDescriptor = inotify_init()) == -1) {
+-        return;
+-    }
+-
+-    if (inotifyWatcher == -1
+-        && (inotifyWatcher = inotify_add_watch(inotifyFileDescriptor, _PATH_MOUNTED, IN_MODIFY)) == -1) {
+-        close(inotifyFileDescriptor);
+-        return;
+-    }
+-
+-    if (notifier == 0) {
+-        notifier = new QSocketNotifier(inotifyFileDescriptor, QSocketNotifier::Read);
+-        connect(notifier, SIGNAL(activated(int)), this, SLOT(onInotifyActivated()));
+-    }
+-}
+-
+-void QStorageInfoPrivate::updateLogicalDrives()
+-{
+-    FILE *fsDescription = setmntent(_PATH_MOUNTED, "r");
+-    struct mntent entry;
+-    char buffer[512];
+-
+-    logicalDrives.clear();
+-    while (getmntent_r(fsDescription, &entry, buffer, sizeof(buffer)) != NULL)
+-        logicalDrives << QString::fromLatin1(entry.mnt_dir);
+-    endmntent(fsDescription);
+-}
+-
+-void QStorageInfoPrivate::onInotifyActivated()
+-{
+-    inotify_event event;
+-    if (read(inotifyFileDescriptor, (void *)&event, sizeof(event)) > 0
+-        && event.wd == inotifyWatcher) {
+-        // Have to do this, otherwise I can't get further notification
+-        inotify_rm_watch(inotifyFileDescriptor, inotifyWatcher);
+-        inotifyWatcher = inotify_add_watch(inotifyFileDescriptor, _PATH_MOUNTED, IN_MODIFY);
+-
+-        QStringList oldLogicalDrives = logicalDrives;
+-        updateLogicalDrives();
+-
+-        foreach (const QString &drive, oldLogicalDrives) {
+-            if (!logicalDrives.contains(drive))
+-                emit logicalDriveChanged(drive, false);
+-        }
+-
+-        foreach (const QString &drive, logicalDrives) {
+-            if (!oldLogicalDrives.contains(drive))
+-                emit logicalDriveChanged(drive, true);
+-        }
+-    }
+-}
+-
+-#if !defined(QT_NO_UDEV)
+-void QStorageInfoPrivate::onDriveChanged()
+-{
+-    QStringList oldLogicalDrives = logicalDrives;
+-    updateLogicalDrives();
+-
+-    foreach (const QString &drive, oldLogicalDrives) {
+-        if (!logicalDrives.contains(drive))
+-            emit logicalDriveChanged(drive, false);
+-    }
+-
+-    foreach (const QString &drive, logicalDrives) {
+-        if (!oldLogicalDrives.contains(drive))
+-            emit logicalDriveChanged(drive, true);
+-    }
+-}
+-#endif // QT_NO_UDEV
+-
+-QT_END_NAMESPACE
+
+=== removed file 'src/systeminfo/linux/qstorageinfo_linux_p.h'
+--- old/src/systeminfo/linux/qstorageinfo_linux_p.h	2013-06-14 10:32:13 +0000
++++ new/src/systeminfo/linux/qstorageinfo_linux_p.h	1970-01-01 00:00:00 +0000
+@@ -1,115 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-//
+-//  W A R N I N G
+-//  -------------
+-//
+-// This file is not part of the Qt API.  It exists purely as an
+-// implementation detail.  This header file may change from version to
+-// version without notice, or even be removed.
+-//
+-// We mean it.
+-//
+-
+-#ifndef QSTORAGEINFO_LINUX_P_H
+-#define QSTORAGEINFO_LINUX_P_H
+-
+-#include <qstorageinfo.h>
+-
+-QT_BEGIN_NAMESPACE
+-
+-#if !defined(QT_NO_UDEV)
+-class QUDevWrapper;
+-#endif // QT_NO_UDEV
+-
+-class QSocketNotifier;
+-
+-class QStorageInfoPrivate : public QObject
+-{
+-    Q_OBJECT
+-
+-public:
+-    QStorageInfoPrivate(QStorageInfo *parent);
+-    ~QStorageInfoPrivate();
+-
+-    qlonglong availableDiskSpace(const QString &drive);
+-    qlonglong totalDiskSpace(const QString &drive);
+-    QString uriForDrive(const QString &drive);
+-    QStringList allLogicalDrives();
+-    QStorageInfo::DriveType driveType(const QString &drive);
+-
+-Q_SIGNALS:
+-    void logicalDriveChanged(const QString &drive, bool added);
+-
+-protected:
+-    void connectNotify(const QMetaMethod &signal);
+-    void disconnectNotify(const QMetaMethod &signal);
+-
+-private:
+-    QStorageInfo * const q_ptr;
+-    Q_DECLARE_PUBLIC(QStorageInfo)
+-
+-    int inotifyWatcher;
+-    int inotifyFileDescriptor;
+-    QSocketNotifier *notifier;
+-    QStringList logicalDrives;
+-#if !defined(QT_NO_UDEV)
+-    QUDevWrapper *udevWrapper;
+-    int needsUDevWatcher;   // -1: unknown; 0: no need;
+-                            // 1: needed, but not currently watching;
+-                            // 2: needed and currently watching
+-#endif // QT_NO_UDEV
+-
+-    void cleanupWatcher();
+-    void setupWatcher();
+-    void updateLogicalDrives();
+-
+-private Q_SLOTS:
+-    void onInotifyActivated();
+-#if !defined(QT_NO_UDEV)
+-    void onDriveChanged();
+-#endif // QT_NO_UDEV
+-};
+-
+-QT_END_NAMESPACE
+-
+-#endif // QSTORAGEINFO_LINUX_P_H
+
+=== removed file 'src/systeminfo/mac/qstorageinfo_mac.mm'
+--- old/src/systeminfo/mac/qstorageinfo_mac.mm	2013-06-14 10:32:13 +0000
++++ new/src/systeminfo/mac/qstorageinfo_mac.mm	1970-01-01 00:00:00 +0000
+@@ -1,423 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-#include "qstorageinfo_mac_p.h"
+-
+-#include <QtCore/private/qcore_mac_p.h>
+-#include <QtCore/qmetaobject.h>
+-#include <QDebug>
+-
+-#include <CoreFoundation/CoreFoundation.h>
+-#include <DiskArbitration/DiskArbitration.h>
+-#include <ApplicationServices/ApplicationServices.h>
+-#include <DiskArbitration/DASession.h>
+-#include <IOKit/storage/IOMedia.h>
+-#include <IOKit/storage/IOCDMedia.h>
+-#include <IOKit/storage/IODVDMedia.h>
+-#include <IOKit/storage/IOBlockStorageDevice.h>
+-#include <Foundation/NSDictionary.h>
+-#include <CoreFoundation/CFUUID.h>
+-
+-#include <sys/mount.h>
+-
+-DAApprovalSessionRef session = NULL;
+-
+-void mountCallback(DADiskRef disk, CFArrayRef /*keys*/, void *context)
+-{
+-    NSDictionary *batDoctionary;
+-    batDoctionary = (NSDictionary *)DADiskCopyDescription(disk);
+-    NSURL *volumePath = [[batDoctionary objectForKey:(NSString *)kDADiskDescriptionVolumePathKey] copy];
+-
+-    QString name = QCFString::toQString([volumePath path]);
+-
+-    static_cast<QStorageInfoPrivate*>(context)->storageChanged(true, name);
+-}
+-
+-void mountCallback2(DADiskRef diskRef, void *context)
+-{
+-    DADiskRef wholeDisk;
+-    wholeDisk = DADiskCopyWholeDisk(diskRef);
+-// only deal with whole disks here.. i.e. cdroms
+-    if (wholeDisk) {
+-        io_service_t mediaService;
+-
+-        mediaService = DADiskCopyIOMedia(wholeDisk);
+-        if (mediaService) {
+-            if (IOObjectConformsTo(mediaService, kIOCDMediaClass) || IOObjectConformsTo(mediaService, kIODVDMediaClass)) {
+-
+-                NSDictionary *batDoctionary;
+-                batDoctionary = (NSDictionary *)DADiskCopyDescription(diskRef);
+-                NSURL *volumePath = [[batDoctionary objectForKey:(NSString *)kDADiskDescriptionVolumePathKey] copy];
+-
+-                QString name = QCFString::toQString([volumePath path]);
+-
+-                static_cast<QStorageInfoPrivate*>(context)->storageChanged(true, name);
+-                CFRelease(batDoctionary);
+-            }
+-        }
+-        IOObjectRelease(mediaService);
+-        CFRelease(wholeDisk);
+-    }
+-}
+-
+-void unmountCallback(DADiskRef disk, void *context)
+-{
+-    NSDictionary *batDoctionary;
+-    batDoctionary = (NSDictionary *)DADiskCopyDescription(disk);
+-    NSURL *volumePath = [[batDoctionary objectForKey:(NSString *)kDADiskDescriptionVolumePathKey] copy];
+-
+-    QString name = QCFString::toQString([volumePath path]);
+-
+-    static_cast<QStorageInfoPrivate*>(context)->storageChanged(false,name);
+-}
+-
+-
+-
+-QT_BEGIN_NAMESPACE
+-
+-QDASessionThread::QDASessionThread(QObject *parent)
+-    :QObject(parent), session(NULL)
+-{
+-    moveToThread(&t);
+-    t.start();
+-    if (session == NULL)
+-        session = DASessionCreate(kCFAllocatorDefault);
+-}
+-
+-QDASessionThread::~QDASessionThread()
+-{
+-}
+-
+-void QDASessionThread::stop()
+-{
+-    QMutexLocker locker(&mutex);
+-    CFRunLoopStop(CFRunLoopGetCurrent());
+-    keepRunning = false;
+-    t.quit();
+-    t.wait();
+-}
+-
+-void QDASessionThread::doWork()
+-{
+-#ifndef MAC_SDK_10_5
+-    if (QThread::currentThread() != &t) {
+-        QMetaObject::invokeMethod(this, "doWork",
+-                                  Qt::QueuedConnection);
+-    } else {
+-
+-        mutex.lock();
+-        keepRunning = true;
+-        mutex.unlock();
+-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+-
+-        DASessionScheduleWithRunLoop(session,CFRunLoopGetCurrent(),kCFRunLoopDefaultMode);
+-
+-        SInt32 result;
+-        while (keepRunning &&
+-               (result = CFRunLoopRunInMode(kCFRunLoopDefaultMode ,1, YES))) {
+-        }
+-
+-        DASessionUnscheduleFromRunLoop(session, CFRunLoopGetCurrent(),kCFRunLoopDefaultMode);
+-        [pool release];
+-    }
+-#endif
+-}
+-
+-QStorageInfoPrivate::QStorageInfoPrivate(QStorageInfo *parent)
+-    : QObject(parent)
+-    , q_ptr(parent), daSessionThread(0),sessionThreadStarted(0)
+-{
+-    updateVolumesMap();
+-}
+-
+-QStorageInfoPrivate::~QStorageInfoPrivate()
+-{
+-    if (sessionThreadStarted) {
+-        daSessionThread->stop();
+-        delete daSessionThread;
+-    }
+-}
+-
+-qlonglong QStorageInfoPrivate::availableDiskSpace(const QString &driveVolume)
+-{
+-    qint64 totalFreeBytes=0;
+-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+-    NSDictionary *attr = [ [NSFileManager defaultManager] attributesOfFileSystemForPath:QCFString::toNSString(driveVolume) error:nil];
+-    totalFreeBytes = [[attr objectForKey:NSFileSystemFreeSize] doubleValue];
+-    [pool release];
+-
+-    return  totalFreeBytes;
+-}
+-
+-qlonglong QStorageInfoPrivate::totalDiskSpace(const QString &driveVolume)
+-{
+-    qint64 totalBytes=0;
+-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+-    NSString *vol = QCFString::toNSString(driveVolume);
+-    NSDictionary *attr = [ [NSFileManager defaultManager] attributesOfFileSystemForPath:vol error:nil];
+-    totalBytes = [[attr objectForKey:NSFileSystemSize] doubleValue];
+-    [pool release];
+-
+-    return totalBytes;
+-}
+-QString QStorageInfoPrivate::uriForDrive(const QString &driveVolume)
+-{
+-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+-    DADiskRef diskRef;
+-    DASessionRef sessionRef;
+-    CFDictionaryRef descriptionDictionary;
+-
+-    sessionRef = DASessionCreate(NULL);
+-    if (sessionRef == NULL) {
+-        return QString();
+-    }
+-
+-    diskRef = DADiskCreateFromBSDName(NULL, sessionRef, mountEntriesMap.key(driveVolume).toLatin1());
+-    if (diskRef == NULL) {
+-        CFRelease(sessionRef);
+-        return QString();
+-    }
+-
+-    descriptionDictionary = DADiskCopyDescription(diskRef);
+-    if (descriptionDictionary == NULL) {
+-        CFRelease(diskRef);
+-        CFRelease(sessionRef);
+-        return QString();
+-    }
+-
+-    CFUUIDRef uuid;
+-    uuid = (const __CFUUID *)CFDictionaryGetValue(descriptionDictionary, kDADiskDescriptionVolumeUUIDKey);
+-
+-    CFRelease(diskRef);
+-    CFRelease(sessionRef);
+-    QString uri = QCFString::toQString(CFUUIDCreateString(kCFAllocatorDefault, uuid));
+-    [pool release];
+-
+-    return uri;
+-}
+-
+-QStringList QStorageInfoPrivate::allLogicalDrives()
+-{
+-    updateVolumesMap();
+-    QStringList drivesList;
+-    QMapIterator<QString, QString> it(mountEntriesMap);
+-     while (it.hasNext()) {
+-         it.next();
+-         drivesList << it.value();
+-     }
+-     drivesList.sort();
+-    return drivesList;
+-}
+-
+-QStorageInfo::DriveType QStorageInfoPrivate::driveType(const QString &driveVolume)
+-{
+-    QStorageInfo::DriveType drivetype =  QStorageInfo::UnknownDrive;
+-
+-    DADiskRef diskRef;
+-    DASessionRef sessionRef;
+-    CFBooleanRef boolRef;
+-    CFBooleanRef boolRef2;
+-    CFDictionaryRef descriptionDictionary;
+-
+-    sessionRef = DASessionCreate(NULL);
+-    if (sessionRef == NULL) {
+-        return QStorageInfo::UnknownDrive;
+-    }
+-
+-    diskRef = DADiskCreateFromBSDName(NULL, sessionRef, mountEntriesMap.key(driveVolume).toLatin1());
+-    if (diskRef == NULL) {
+-        CFRelease(sessionRef);
+-        return QStorageInfo::UnknownDrive;
+-    }
+-
+-    descriptionDictionary = DADiskCopyDescription(diskRef);
+-    if (descriptionDictionary == NULL) {
+-        CFRelease(diskRef);
+-        CFRelease(sessionRef);
+-        return QStorageInfo::RemoteDrive;
+-    }
+-
+-    boolRef = (CFBooleanRef)
+-              CFDictionaryGetValue(descriptionDictionary, kDADiskDescriptionMediaRemovableKey);
+-    if (boolRef) {
+-        if (CFBooleanGetValue(boolRef)) {
+-            drivetype = QStorageInfo::RemovableDrive;
+-        } else {
+-            drivetype = QStorageInfo::InternalDrive;
+-        }
+-    }
+-    boolRef2 = (CFBooleanRef)
+-              CFDictionaryGetValue(descriptionDictionary, kDADiskDescriptionVolumeNetworkKey);
+-    if (boolRef2) {
+-        if (CFBooleanGetValue(boolRef2)) {
+-            drivetype = QStorageInfo::RemoteDrive;
+-        }
+-    }
+-
+-    DADiskRef wholeDisk;
+-    wholeDisk = DADiskCopyWholeDisk(diskRef);
+-
+-    if (wholeDisk) {
+-        io_service_t mediaService;
+-
+-        mediaService = DADiskCopyIOMedia(wholeDisk);
+-        if (mediaService) {
+-            if (IOObjectConformsTo(mediaService, kIOCDMediaClass)) {
+-                drivetype = QStorageInfo::CdromDrive;
+-            }
+-            if (IOObjectConformsTo(mediaService, kIODVDMediaClass)) {
+-                drivetype = QStorageInfo::CdromDrive;
+-            }
+-            IOObjectRelease(mediaService);
+-        }
+-        CFRelease(wholeDisk);
+-    }
+-    CFRelease(diskRef);
+-    CFRelease(descriptionDictionary);
+-    CFRelease(boolRef);
+-    CFRelease(boolRef2);
+-    CFRelease(sessionRef);
+-
+-    return drivetype;
+-}
+-
+-void QStorageInfoPrivate::connectNotify(const QMetaMethod &signal)
+-{
+-    static const QMetaMethod logicalDriveChangedSignal = QMetaMethod::fromSignal(&QStorageInfoPrivate::logicalDriveChanged);
+-    if (signal == logicalDriveChangedSignal) {
+-        ///
+-        sessionThread();
+-
+-        DARegisterDiskDescriptionChangedCallback(daSessionThread->session,kDADiskDescriptionMatchVolumeMountable,
+-                                                 kDADiskDescriptionWatchVolumePath, mountCallback,this);
+-        DARegisterDiskAppearedCallback(daSessionThread->session,kDADiskDescriptionMatchVolumeMountable,mountCallback2,this);
+-        DARegisterDiskDisappearedCallback(daSessionThread->session,kDADiskDescriptionMatchVolumeMountable,unmountCallback,this);
+-        sessionThreadStarted = true;
+-    }
+-}
+-
+-void QStorageInfoPrivate::disconnectNotify(const QMetaMethod &signal)
+-{
+-    static const QMetaMethod logicalDriveChangedSignal = QMetaMethod::fromSignal(&QStorageInfoPrivate::logicalDriveChanged);
+-    if (signal == logicalDriveChangedSignal) {
+-    }
+-}
+-
+-
+-void QStorageInfoPrivate::storageChanged( bool added, const QString &vol)
+-{
+-    if (!vol.isEmpty()) {
+-        QMapIterator<QString, QString> it(mountEntriesMap);
+-        QString foundKey;
+-        bool seen = false;
+-        while (it.hasNext()) {
+-            it.next();
+-            if ( vol == it.value()) {
+-                seen = true;
+-                foundKey = it.key();
+-            }
+-        }
+-
+-        if (added && !seen) {
+-            Q_EMIT logicalDriveChanged(vol, added);
+-            updateVolumesMap();
+-        }
+-        if (!added && seen) {
+-            mountEntriesMap.remove(foundKey);
+-            Q_EMIT logicalDriveChanged(vol, added);
+-        }
+-
+-
+-    } else {
+-        if (added) {
+-
+-        } else { //removed
+-            // cdroms unmounting seem to not have a volume name with the notification here, so
+-            // we need to manually deal with it
+-            QMap <QString,QString> oldDrives = mountEntriesMap;
+-            updateVolumesMap();
+-            QStringList newDrives = mountEntriesMap.keys();
+-            QString foundDrive;
+-
+-            QMapIterator<QString, QString> it(oldDrives);
+-            while (it.hasNext()) {
+-                it.next();
+-                if (!newDrives.contains(it.key())) {
+-                    Q_EMIT logicalDriveChanged(it.value(), added);
+-                }
+-            }
+-        }
+-    }
+-}
+-
+-bool QStorageInfoPrivate::updateVolumesMap()
+-{
+-    struct statfs *buf = NULL;
+-    unsigned i, count = 0;
+-
+-    mountEntriesMap.clear();
+-
+-    count = getmntinfo(&buf, 0);
+-    for (i=0; i<count; i++) {
+-        char *volName = buf[i].f_mntonname;
+-
+-        if (buf[i].f_type != 19
+-           && buf[i].f_type != 20
+-           && !mountEntriesMap.contains(volName)) {
+-            mountEntriesMap.insert(buf[i].f_mntfromname,volName);
+-//            qDebug() << __FUNCTION__ << "insert" << buf[i].f_mntfromname<< volName;
+-        }
+-    }
+-    return true;
+-}
+-
+-bool QStorageInfoPrivate::sessionThread()
+-{
+-    if (!sessionThreadStarted) {
+-        daSessionThread = new QDASessionThread();
+-        sessionThreadStarted = true;
+-    }
+-    daSessionThread->doWork();
+-    return true;
+-}
+-
+-QT_END_NAMESPACE
+-
+
+=== removed file 'src/systeminfo/mac/qstorageinfo_mac_p.h'
+--- old/src/systeminfo/mac/qstorageinfo_mac_p.h	2013-06-14 10:32:13 +0000
++++ new/src/systeminfo/mac/qstorageinfo_mac_p.h	1970-01-01 00:00:00 +0000
+@@ -1,134 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-//
+-//  W A R N I N G
+-//  -------------
+-//
+-// This file is not part of the Qt API.  It exists purely as an
+-// implementation detail.  This header file may change from version to
+-// version without notice, or even be removed.
+-//
+-// We mean it.
+-//
+-
+-#ifndef QSTORAGEINFO_MAC_P_H
+-#define QSTORAGEINFO_MAC_P_H
+-
+-#include <qstorageinfo.h>
+-#include <QtCore/QTimer>
+-#include <QtCore/QMap>
+-#include <QtCore/QThread>
+-#include <QtCore/QMutex>
+-
+-#include <SystemConfiguration/SystemConfiguration.h>
+-#include <DiskArbitration/DiskArbitration.h>
+-
+-QT_BEGIN_NAMESPACE
+-
+-class QDASessionThread;
+-class QStorageInfoPrivate : public QObject
+-{
+-    Q_OBJECT
+-
+-public:
+-    QStorageInfoPrivate(QStorageInfo *parent);
+-    ~QStorageInfoPrivate();
+-
+-    qlonglong availableDiskSpace(const QString &drive);
+-    qlonglong totalDiskSpace(const QString &drive);
+-    QString uriForDrive(const QString &drive);
+-    QStringList allLogicalDrives();
+-    QStorageInfo::DriveType driveType(const QString &drive);
+-
+-public Q_SLOTS:
+-    void storageChanged( bool added,const QString &vol);
+-
+-Q_SIGNALS:
+-    void logicalDriveChanged(const QString &drive, bool added);
+-
+-protected:
+-    void connectNotify(const QMetaMethod &signal);
+-    void disconnectNotify(const QMetaMethod &signal);
+-
+-private:
+-    QStorageInfo * const q_ptr;
+-    Q_DECLARE_PUBLIC(QStorageInfo)
+-
+-    QMap<QString, QString> mountEntriesMap;
+-    bool updateVolumesMap();
+-    void mountEntries();
+-    bool sessionThread();
+-//    QMap<QString, QStorageInfo::StorageState> stateMap;
+-    QDASessionThread *daSessionThread;
+-    bool sessionThreadStarted;
+-
+-};
+-
+-
+-class QDASessionThread : public QObject
+-{
+-    Q_OBJECT
+-
+-public:
+-    QDASessionThread(QObject *parent = 0);
+-    ~QDASessionThread();
+-    bool keepRunning;
+-    void stop();
+-    DASessionRef session;
+-public Q_SLOTS:
+-    void doWork();
+-Q_SIGNALS:
+-    void logicalDrivesChanged(bool added,const QString & vol);
+-
+-protected:
+-    QThread t;
+-
+-private:
+-    QMutex mutex;
+-
+-};
+-
+-
+-
+-QT_END_NAMESPACE
+-
+-#endif // QSTORAGEINFO_MAC_P_H
+
+=== removed file 'src/systeminfo/qstorageinfo.cpp'
+--- old/src/systeminfo/qstorageinfo.cpp	2013-06-14 10:32:13 +0000
++++ new/src/systeminfo/qstorageinfo.cpp	1970-01-01 00:00:00 +0000
+@@ -1,192 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-#include "qstorageinfo.h"
+-
+-#include <QtCore/qstringlist.h>
+-
+-#if defined(Q_OS_LINUX)
+-#  include "linux/qstorageinfo_linux_p.h"
+-#elif defined(Q_OS_WIN)
+-#  include "windows/qstorageinfo_win_p.h"
+-#elif defined(Q_OS_MAC)
+-#  include "mac/qstorageinfo_mac_p.h"
+-#else
+-QT_BEGIN_NAMESPACE
+-class QStorageInfoPrivate
+-{
+-public:
+-    QStorageInfoPrivate(QStorageInfo *) {}
+-
+-    qlonglong availableDiskSpace(const QString &) { return -1; }
+-    qlonglong totalDiskSpace(const QString &) { return -1; }
+-    QString uriForDrive(const QString &) { return QString(); }
+-    QStringList allLogicalDrives() { return QStringList(); }
+-    QStorageInfo::DriveType driveType(const QString &) { return QStorageInfo::UnknownDrive; }
+-};
+-QT_END_NAMESPACE
+-#endif
+-
+-#include <QtCore/qmetaobject.h>
+-
+-QT_BEGIN_NAMESPACE
+-
+-/*!
+-    \class QStorageInfo
+-    \inmodule QtSystemInfo
+-    \ingroup systeminfo
+-    \brief The QStorageInfo class provides various disk storage information about the system.
+-*/
+-
+-/*!
+-    \enum QStorageInfo::DriveType
+-    This enum describes the type of drive or volume
+-
+-    \value UnknownDrive         Drive type unknown.
+-    \value InternalDrive        Internal mass storage drive, e.g. hard drive.
+-    \value RemovableDrive       Removable drive, e.g. memory card.
+-    \value RemoteDrive          Network drive.
+-    \value CdromDrive           CD-ROM.
+-    \value RamDrive             Virtual drive made in RAM memory.
+-*/
+-
+-/*!
+-    \fn void QStorageInfo::logicalDriveChanged(const QString &drive, bool added)
+-
+-    This signal gets emitted when a new \a drive storage has been \a added or removed.
+-*/
+-
+-/*!
+-    Constructs a QStorageInfo object with the given \a parent.
+-*/
+-QStorageInfo::QStorageInfo(QObject *parent)
+-    : QObject(parent)
+-    , d_ptr(new QStorageInfoPrivate(this))
+-{
+-}
+-
+-/*!
+-    Destroys the object
+-*/
+-QStorageInfo::~QStorageInfo()
+-{
+-}
+-
+-/*!
+-    \property QStorageInfo::allLogicalDrives
+-    \brief The  list of all drives.
+-
+-    Returns a list of all logical drives or volumes, or an empty list if no drives are found or
+-    on error.
+-*/
+-QStringList QStorageInfo::allLogicalDrives()
+-{
+-    return d_ptr->allLogicalDrives();
+-}
+-
+-/*!
+-    Returns the available free space on the \a drive, in bytes. -1 is returned if the drive doesn't
+-    exist, or the information is not available.
+-*/
+-qlonglong QStorageInfo::availableDiskSpace(const QString &drive) const
+-{
+-    return d_ptr->availableDiskSpace(drive);
+-}
+-
+-/*!
+-    Returns the total space of the \a drive, in bytes. -1 is returned if the drive doesn't exist,
+-    or the information is not available.
+-*/
+-qlonglong QStorageInfo::totalDiskSpace(const QString &drive) const
+-{
+-    return d_ptr->totalDiskSpace(drive);
+-}
+-
+-/*!
+-    Returns the URI, or unique identifier for the given \a drive. If the drive doesn't exist, or the
+-    information is not available, an empty string is returned.
+-*/
+-QString QStorageInfo::uriForDrive(const QString &drive) const
+-{
+-    return d_ptr->uriForDrive(drive);
+-}
+-
+-/*!
+-    Returns the type of the given \a drive.
+-*/
+-QStorageInfo::DriveType QStorageInfo::driveType(const QString &drive) const
+-{
+-    return d_ptr->driveType(drive);
+-}
+-
+-extern QMetaMethod proxyToSourceSignal(const QMetaMethod &, QObject *);
+-
+-/*!
+-    \internal
+-*/
+-void QStorageInfo::connectNotify(const QMetaMethod &signal)
+-{
+-#if defined(Q_OS_LINUX) || defined(Q_OS_WIN)
+-    QMetaMethod sourceSignal = proxyToSourceSignal(signal, d_ptr);
+-    connect(d_ptr, sourceSignal, this, signal, Qt::UniqueConnection);
+-#else
+-    Q_UNUSED(signal)
+-#endif
+-}
+-
+-/*!
+-    \internal
+-*/
+-void QStorageInfo::disconnectNotify(const QMetaMethod &signal)
+-{
+-#if defined(Q_OS_LINUX) || defined(Q_OS_WIN)
+-    // We can only disconnect with the private implementation, when there is no receivers for the signal.
+-    if (isSignalConnected(signal))
+-        return;
+-
+-    QMetaMethod sourceSignal = proxyToSourceSignal(signal, d_ptr);
+-    disconnect(d_ptr, sourceSignal, this, signal);
+-#else
+-    Q_UNUSED(signal)
+-#endif
+-}
+-
+-QT_END_NAMESPACE
+
+=== removed file 'src/systeminfo/qstorageinfo.h'
+--- old/src/systeminfo/qstorageinfo.h	2013-07-12 13:41:02 +0000
++++ new/src/systeminfo/qstorageinfo.h	1970-01-01 00:00:00 +0000
+@@ -1,94 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-#ifndef QSTORAGEINFO_H
+-#define QSTORAGEINFO_H
+-
+-#include <QtSystemInfo/qsysteminfoglobal.h>
+-#include <QtCore/qobject.h>
+-#include <QtCore/qstringlist.h>
+-
+-QT_BEGIN_NAMESPACE
+-
+-class QStorageInfoPrivate;
+-
+-class Q_SYSTEMINFO_EXPORT QStorageInfo : public QObject
+-{
+-    Q_OBJECT
+-    Q_ENUMS(DriveType)
+-    Q_PROPERTY(QStringList allLogicalDrives READ allLogicalDrives NOTIFY logicalDriveChanged)
+-
+-public:
+-    enum DriveType {
+-        UnknownDrive = 0,
+-        InternalDrive,
+-        RemovableDrive,
+-        RemoteDrive,
+-        CdromDrive,
+-        RamDrive
+-    };
+-
+-    QStorageInfo(QObject *parent = 0);
+-    virtual ~QStorageInfo();
+-
+-    QStringList allLogicalDrives();
+-
+-    Q_INVOKABLE qlonglong availableDiskSpace(const QString &drive) const;
+-    Q_INVOKABLE qlonglong totalDiskSpace(const QString &drive) const;
+-    Q_INVOKABLE QString uriForDrive(const QString &drive) const;
+-    Q_INVOKABLE QStorageInfo::DriveType driveType(const QString &drive) const;
+-
+-Q_SIGNALS:
+-    void logicalDriveChanged(const QString &drive, bool added);
+-
+-protected:
+-    void connectNotify(const QMetaMethod &signal);
+-    void disconnectNotify(const QMetaMethod &signal);
+-
+-private:
+-    Q_DISABLE_COPY(QStorageInfo)
+-    QStorageInfoPrivate * const d_ptr;
+-    Q_DECLARE_PRIVATE(QStorageInfo)
+-};
+-
+-QT_END_NAMESPACE
+-
+-#endif // QSTORAGEINFO_H
+
+=== modified file 'src/systeminfo/simulator/qsysteminfodata_simulator.cpp'
+--- old/src/systeminfo/simulator/qsysteminfodata_simulator.cpp	2013-07-12 13:41:02 +0000
++++ new/src/systeminfo/simulator/qsysteminfodata_simulator.cpp	2015-02-03 15:08:16 +0000
+@@ -54,8 +54,6 @@
+     qRegisterMetaTypeStreamOperators<QNetworkInfoData::BluetoothInfo>("QNetworkInfoData::BluetoothInfo");
+     qRegisterMetaTypeStreamOperators<QDeviceInfoData>("QDeviceInfoData");
+     qRegisterMetaTypeStreamOperators<QBatteryInfoData>("QBatteryInfoData");
+-    qRegisterMetaTypeStreamOperators<QStorageInfoData>("QStorageInfoData");
+-    qRegisterMetaTypeStreamOperators<QStorageInfoData::DriveInfo>("QStorageInfoData::DriveInfo");
+     qRegisterMetaTypeStreamOperators<QScreenSaverData>("QScreenSaverData");
+ }
+ 
+@@ -258,38 +256,6 @@
+     return in;
+ }
+ 
+-QDataStream &operator<<(QDataStream &out, const QStorageInfoData &s)
+-{
+-    out << s.drives;
+-    return out;
+-}
+-
+-QDataStream &operator>>(QDataStream &in, QStorageInfoData &s)
+-{
+-    in >> s.drives;
+-    return in;
+-}
+-
+-QDataStream &operator<<(QDataStream &out, const QStorageInfoData::DriveInfo &s)
+-{
+-    out << s.totalSpace << s.availableSpace;
+-    out << s.uri;
+-    out << static_cast<qint32>(s.type);
+-
+-    return out;
+-}
+-
+-QDataStream &operator>>(QDataStream &in, QStorageInfoData::DriveInfo &s)
+-{
+-    in >> s.totalSpace >> s.availableSpace;
+-    in >> s.uri;
+-    qint32 type;
+-    in >> type;
+-    s.type = static_cast<QStorageInfo::DriveType>(type);
+-
+-    return in;
+-}
+-
+ QDataStream &operator<<(QDataStream &out, const QScreenSaverData &s)
+ {
+     out << s.screenSaverEnabled;
+
+=== modified file 'src/systeminfo/simulator/qsysteminfodata_simulator_p.h'
+--- old/src/systeminfo/simulator/qsysteminfodata_simulator_p.h	2013-07-12 13:41:02 +0000
++++ new/src/systeminfo/simulator/qsysteminfodata_simulator_p.h	2015-02-03 15:08:16 +0000
+@@ -57,7 +57,6 @@
+ #include <qnetworkinfo.h>
+ #include <qdeviceinfo.h>
+ #include <qbatteryinfo.h>
+-#include <qstorageinfo.h>
+ #include <qscreensaver.h>
+ 
+ #include <QHash>
+@@ -143,18 +142,6 @@
+     QMap<QDeviceInfo::Version, QString> versionList;
+ };
+ 
+-struct QStorageInfoData
+-{
+-    struct DriveInfo
+-    {
+-      qint64 totalSpace;
+-      qint64 availableSpace;
+-      QString uri;
+-      QStorageInfo::DriveType type;
+-    };
+-    QHash<QString, DriveInfo> drives;
+-};
+-
+ struct QScreenSaverData
+ {
+     bool screenSaverEnabled;
+@@ -164,7 +151,6 @@
+ Q_DECLARE_METATYPE(QNetworkInfoData)
+ Q_DECLARE_METATYPE(QDeviceInfoData)
+ Q_DECLARE_METATYPE(QBatteryInfoData)
+-Q_DECLARE_METATYPE(QStorageInfoData)
+ Q_DECLARE_METATYPE(QScreenSaverData)
+ 
+ void qt_registerSystemInfoTypes();
+@@ -189,10 +175,6 @@
+ QDataStream &operator>>(QDataStream &in, QDeviceInfo::Version &s);
+ QDataStream &operator<<(QDataStream &out, const QBatteryInfoData &s);
+ QDataStream &operator>>(QDataStream &in, QBatteryInfoData &s);
+-QDataStream &operator<<(QDataStream &out, const QStorageInfoData &s);
+-QDataStream &operator>>(QDataStream &in, QStorageInfoData &s);
+-QDataStream &operator<<(QDataStream &out, const QStorageInfoData::DriveInfo &s);
+-QDataStream &operator>>(QDataStream &in, QStorageInfoData::DriveInfo &s);
+ QDataStream &operator<<(QDataStream &out, const QScreenSaverData &s);
+ QDataStream &operator>>(QDataStream &in, QScreenSaverData &s);
+ 
+
+=== modified file 'src/systeminfo/systeminfo.pro'
+--- old/src/systeminfo/systeminfo.pro	2013-08-09 10:39:01 +0000
++++ new/src/systeminfo/systeminfo.pro	2015-02-03 15:08:16 +0000
+@@ -4,13 +4,11 @@
+ QT = core network
+ PUBLIC_HEADERS = qsysteminfoglobal.h \
+                  qdeviceinfo.h \
+-                 qstorageinfo.h \
+                  qscreensaver.h \
+                  qbatteryinfo.h \
+                  qnetworkinfo.h
+ 
+ SOURCES += qdeviceinfo.cpp \
+-           qstorageinfo.cpp \
+            qscreensaver.cpp \
+            qbatteryinfo.cpp \
+            qnetworkinfo.cpp
+@@ -30,7 +28,6 @@
+ 
+     PRIVATE_HEADERS += windows/qscreensaver_win_p.h \
+                        windows/qdeviceinfo_win_p.h \
+-                       windows/qstorageinfo_win_p.h \
+                        windows/qbatteryinfo_win_p.h \
+                        windows/qnetworkinfo_win_p.h \
+                        windows/qwmihelper_win_p.h \
+@@ -38,7 +35,6 @@
+ 
+     SOURCES += windows/qscreensaver_win.cpp \
+                windows/qdeviceinfo_win.cpp \
+-               windows/qstorageinfo_win.cpp \
+                windows/qbatteryinfo_win.cpp \
+                windows/qnetworkinfo_win.cpp \
+                windows/qwmihelper_win.cpp
+@@ -60,12 +56,10 @@
+ 
+ linux-*: !simulator: {
+     PRIVATE_HEADERS += linux/qdeviceinfo_linux_p.h \
+-                       linux/qstorageinfo_linux_p.h \
+                        linux/qnetworkinfo_linux_p.h \
+                        linux/qscreensaver_linux_p.h
+ 
+     SOURCES += linux/qdeviceinfo_linux.cpp \
+-               linux/qstorageinfo_linux.cpp \
+                linux/qnetworkinfo_linux.cpp \
+                linux/qscreensaver_linux.cpp
+ 
+@@ -133,14 +127,12 @@
+          OBJECTIVE_SOURCES += mac/qbatteryinfo_mac.mm \
+                   mac/qdeviceinfo_mac.mm \
+                   mac/qnetworkinfo_mac.mm \
+-                  mac/qscreensaver_mac.mm \
+-                  mac/qstorageinfo_mac.mm
++                  mac/qscreensaver_mac.mm
+ 
+          PRIVATE_HEADERS += mac/qbatteryinfo_mac_p.h \
+                   mac/qdeviceinfo_mac_p.h \
+                   mac/qnetworkinfo_mac_p.h \
+-                  mac/qscreensaver_mac_p.h \
+-                  mac/qstorageinfo_mac_p.h
++                  mac/qscreensaver_mac_p.h
+ 
+          LIBS += -framework SystemConfiguration \
+                 -framework Foundation \
+@@ -173,12 +165,10 @@
+ 
+     linux-*: {
+         PRIVATE_HEADERS += \
+-                           linux/qscreensaver_linux_p.h \
+-                           linux/qstorageinfo_linux_p.h
++                           linux/qscreensaver_linux_p.h
+ 
+         SOURCES += \
+-                   linux/qscreensaver_linux.cpp \
+-                   linux/qstorageinfo_linux.cpp
++                   linux/qscreensaver_linux.cpp
+ 
+         x11|config_x11 {
+             CONFIG += link_pkgconfig
+
+=== removed file 'src/systeminfo/windows/qstorageinfo_win.cpp'
+--- old/src/systeminfo/windows/qstorageinfo_win.cpp	2013-06-14 10:32:13 +0000
++++ new/src/systeminfo/windows/qstorageinfo_win.cpp	1970-01-01 00:00:00 +0000
+@@ -1,175 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-#include "qstorageinfo_win_p.h"
+-
+-#if !defined( Q_CC_MINGW)
+-#ifndef Q_OS_WINCE
+-#include "qwmihelper_win_p.h"
+-#endif
+-#endif
+-
+-#include <QtCore/qdir.h>
+-#include <QtCore/qmetaobject.h>
+-
+-#include <qt_windows.h>
+-
+-QT_BEGIN_NAMESPACE
+-
+-QStorageInfoPrivate::QStorageInfoPrivate(QStorageInfo *parent)
+-    : QObject(parent)
+-    , q_ptr(parent)
+-{
+-#if !defined( Q_CC_MINGW)
+-#if !defined( Q_OS_WINCE)
+-    WMIHelper *wHelper;
+-    wHelper =  WMIHelper::instance();
+-    wHelper->setWmiNamespace(QLatin1String("root/cimv2"));
+-    wHelper->setClassName(QLatin1String("Win32_VolumeChangeEvent"));
+-    QString aString = QLatin1String("SELECT * FROM __InstanceOperationEvent WITHIN 1 WHERE (TargetInstance ISA 'Win32_LogicalDisk') AND (TargetInstance.DriveType = 5 OR TargetInstance.DriveType = 2)");
+-
+-    wHelper->setupNotfication(QLatin1String("root/cimv2"),aString,QStringList());
+-
+-    connect(wHelper,SIGNAL(wminotificationArrived()),this,SLOT(notificationArrived()));
+-#endif
+-#endif
+-}
+-
+-QStorageInfoPrivate::~QStorageInfoPrivate()
+-{
+-}
+-
+-qlonglong QStorageInfoPrivate::availableDiskSpace(const QString &drive)
+-{
+-    qlonglong availableBytes(-1);
+-    if (!GetDiskFreeSpaceEx((WCHAR *)drive.utf16(), 0, 0, (PULARGE_INTEGER)&availableBytes))
+-        availableBytes = -1;
+-    return availableBytes;
+-}
+-
+-qlonglong QStorageInfoPrivate::totalDiskSpace(const QString &drive)
+-{
+-    qlonglong totalBytes(-1);
+-    if (!GetDiskFreeSpaceEx((WCHAR *)drive.utf16(), 0, (PULARGE_INTEGER)&totalBytes, 0))
+-        totalBytes = -1;
+-    return totalBytes;
+-}
+-
+-QString QStorageInfoPrivate::uriForDrive(const QString &drive)
+-{
+-    WCHAR uri[50];
+-    if (GetVolumeNameForVolumeMountPoint((WCHAR *)drive.utf16(), uri, 50))
+-        return QString::fromUtf16(reinterpret_cast<const unsigned short *>(uri));
+-    return QString();
+-}
+-
+-QStringList QStorageInfoPrivate::allLogicalDrives()
+-{
+-    mountEntriesList.clear();
+-    QFileInfoList drives = QDir::drives();
+-    foreach (const QFileInfo &drive, drives)
+-        mountEntriesList << drive.absoluteFilePath();
+-    return mountEntriesList;
+-}
+-
+-QStorageInfo::DriveType QStorageInfoPrivate::driveType(const QString &drive)
+-{
+-    UINT type = GetDriveType((WCHAR *)drive.utf16());
+-    switch (type) {
+-    case DRIVE_REMOVABLE:
+-        return QStorageInfo::RemovableDrive;
+-    case DRIVE_FIXED:
+-        return QStorageInfo::InternalDrive;
+-    case DRIVE_REMOTE:
+-        return QStorageInfo::RemoteDrive;
+-    case DRIVE_CDROM:
+-        return QStorageInfo::CdromDrive;
+-    case DRIVE_RAMDISK:
+-        return QStorageInfo::RamDrive;
+-    case DRIVE_UNKNOWN:
+-    case DRIVE_NO_ROOT_DIR:
+-    default:
+-        return QStorageInfo::UnknownDrive;
+-    };
+-}
+-
+-void QStorageInfoPrivate::connectNotify(const QMetaMethod &signal)
+-{
+-    static const QMetaMethod logicalDriveChangedSignal = QMetaMethod::fromSignal(&QStorageInfoPrivate::logicalDriveChanged);
+-    if (signal == logicalDriveChangedSignal) {
+-    }
+-}
+-
+-void QStorageInfoPrivate::disconnectNotify(const QMetaMethod &signal)
+-{
+-    static const QMetaMethod logicalDriveChangedSignal = QMetaMethod::fromSignal(&QStorageInfoPrivate::logicalDriveChanged);
+-    if (signal == logicalDriveChangedSignal) {
+-    }
+-}
+-
+-void QStorageInfoPrivate::notificationArrived()
+-{
+-    QStringList oldDrives;
+-
+-     oldDrives = mountEntriesList;
+-     allLogicalDrives();
+-
+-     if (mountEntriesList.count() < oldDrives.count()) {
+-         QStringListIterator i(oldDrives);
+-          while (i.hasNext()) {
+-             QString key = i.next();
+-              if (!mountEntriesList.contains(key)) {
+-                  emit logicalDriveChanged(key, false);
+-              }
+-          }
+-      } else if (mountEntriesList.count() > oldDrives.count()) {
+-         QStringListIterator i(mountEntriesList);
+-          while (i.hasNext()) {
+-             QString key = i.next();
+-
+-              if (oldDrives.contains(key))
+-                  continue;
+-                 emit logicalDriveChanged(key, true);
+-         }
+-     }
+- }
+-
+-QT_END_NAMESPACE
+
+=== removed file 'src/systeminfo/windows/qstorageinfo_win_p.h'
+--- old/src/systeminfo/windows/qstorageinfo_win_p.h	2013-06-14 10:32:13 +0000
++++ new/src/systeminfo/windows/qstorageinfo_win_p.h	1970-01-01 00:00:00 +0000
+@@ -1,96 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-//
+-//  W A R N I N G
+-//  -------------
+-//
+-// This file is not part of the Qt API.  It exists purely as an
+-// implementation detail.  This header file may change from version to
+-// version without notice, or even be removed.
+-//
+-// We mean it.
+-//
+-
+-#ifndef QSTORAGEINFO_WIN_P_H
+-#define QSTORAGEINFO_WIN_P_H
+-
+-#include "qstorageinfo.h"
+-#include "qwmihelper_win_p.h"
+-
+-QT_BEGIN_NAMESPACE
+-
+-class QSocketNotifier;
+-
+-class QStorageInfoPrivate : public QObject
+-{
+-    Q_OBJECT
+-
+-public:
+-    QStorageInfoPrivate(QStorageInfo *parent);
+-    ~QStorageInfoPrivate();
+-
+-    qlonglong availableDiskSpace(const QString &drive);
+-    qlonglong totalDiskSpace(const QString &drive);
+-    QString uriForDrive(const QString &drive);
+-    QStringList allLogicalDrives();
+-    QStorageInfo::DriveType driveType(const QString &drive);
+-
+-Q_SIGNALS:
+-    void logicalDriveChanged(const QString &drive, bool added);
+-
+-protected:
+-    void connectNotify(const QMetaMethod &signal);
+-    void disconnectNotify(const QMetaMethod &signal);
+-
+-private:
+-    QStorageInfo * const q_ptr;
+-    Q_DECLARE_PUBLIC(QStorageInfo);
+-
+-    QStringList mountEntriesList;
+-
+-private Q_SLOTS:
+-    void notificationArrived();
+-};
+-
+-QT_END_NAMESPACE
+-
+-#endif // QSTORAGEINFO_WIN_P_H
+
+=== modified file 'tests/auto/cmake/test_modules/main.cpp'
+--- old/tests/auto/cmake/test_modules/main.cpp	2013-07-12 13:41:02 +0000
++++ new/tests/auto/cmake/test_modules/main.cpp	2015-02-03 15:08:16 +0000
+@@ -41,7 +41,6 @@
+ 
+ #include <QValueSpaceSubscriber>
+ #include <QServiceInterfaceDescriptor>
+-#include <QStorageInfo>
+ 
+ int main(int argc, char **argv)
+ {
+@@ -49,7 +48,5 @@
+ 
+     QServiceInterfaceDescriptor serviceInterfaceDescriptor;
+ 
+-    QStorageInfo storageInfo;
+-
+     return 0;
+ }
+
+=== removed directory 'tests/auto/systeminfo/qstorageinfo'
+=== removed file 'tests/auto/systeminfo/qstorageinfo/qstorageinfo.pro'
+--- old/tests/auto/systeminfo/qstorageinfo/qstorageinfo.pro	2013-07-12 13:41:02 +0000
++++ new/tests/auto/systeminfo/qstorageinfo/qstorageinfo.pro	1970-01-01 00:00:00 +0000
+@@ -1,5 +0,0 @@
+-
+-QT += systeminfo testlib
+-
+-SOURCES += tst_qstorageinfo.cpp
+-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+=== removed file 'tests/auto/systeminfo/qstorageinfo/tst_qstorageinfo.cpp'
+--- old/tests/auto/systeminfo/qstorageinfo/tst_qstorageinfo.cpp	2013-06-14 10:32:13 +0000
++++ new/tests/auto/systeminfo/qstorageinfo/tst_qstorageinfo.cpp	1970-01-01 00:00:00 +0000
+@@ -1,67 +0,0 @@
+-/****************************************************************************
+-**
+-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Contact: http://www.qt-project.org/legal
+-**
+-** This file is part of the QtSystems module of the Qt Toolkit.
+-**
+-** $QT_BEGIN_LICENSE:LGPL$
+-** Commercial License Usage
+-** Licensees holding valid commercial Qt licenses may use this file in
+-** accordance with the commercial license agreement provided with the
+-** Software or, alternatively, in accordance with the terms contained in
+-** a written agreement between you and Digia.  For licensing terms and
+-** conditions see http://qt.digia.com/licensing.  For further information
+-** use the contact form at http://qt.digia.com/contact-us.
+-**
+-** GNU Lesser General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU Lesser
+-** General Public License version 2.1 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.LGPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU Lesser General Public License version 2.1 requirements
+-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-**
+-** In addition, as a special exception, Digia gives you certain additional
+-** rights.  These rights are described in the Digia Qt LGPL Exception
+-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+-**
+-** GNU General Public License Usage
+-** Alternatively, this file may be used under the terms of the GNU
+-** General Public License version 3.0 as published by the Free Software
+-** Foundation and appearing in the file LICENSE.GPL included in the
+-** packaging of this file.  Please review the following information to
+-** ensure the GNU General Public License version 3.0 requirements will be
+-** met: http://www.gnu.org/copyleft/gpl.html.
+-**
+-**
+-** $QT_END_LICENSE$
+-**
+-****************************************************************************/
+-
+-#include <QtTest/QtTest>
+-#include "qstorageinfo.h"
+-
+-QT_USE_NAMESPACE
+-
+-class tst_QStorageInfo : public QObject
+-{
+-    Q_OBJECT
+-
+-private slots:
+-    void tst_diskSpace();
+-};
+-
+-void tst_QStorageInfo::tst_diskSpace()
+-{
+-    QStorageInfo storageInfo;
+-    QStringList drives = storageInfo.allLogicalDrives();
+-    foreach (const QString &drive, drives) {
+-        qlonglong available = storageInfo.availableDiskSpace(drive);
+-        qlonglong total = storageInfo.totalDiskSpace(drive);
+-        QVERIFY(available <= total);
+-    }
+-}
+-
+-QTEST_MAIN(tst_QStorageInfo)
+-#include "tst_qstorageinfo.moc"
+
+=== modified file 'tests/auto/systeminfo/systeminfo.pro'
+--- old/tests/auto/systeminfo/systeminfo.pro	2013-07-12 13:41:02 +0000
++++ new/tests/auto/systeminfo/systeminfo.pro	2015-02-03 15:08:16 +0000
+@@ -2,6 +2,5 @@
+ 
+ SUBDIRS = \
+     qdeviceinfo \
+-    qstorageinfo \
+     qscreensaver \
+     qbatteryinfo
+
+=== modified file 'tests/manual/sysinfo-tester/main.cpp'
+--- old/tests/manual/sysinfo-tester/main.cpp	2013-07-12 13:41:02 +0000
++++ new/tests/manual/sysinfo-tester/main.cpp	2015-02-03 15:08:16 +0000
+@@ -47,7 +47,6 @@
+ #include "qbatteryinfo.h"
+ #include "qdeviceinfo.h"
+ #include "qnetworkinfo.h"
+-#include "qstorageinfo.h"
+ //#include "qscreensaverinfo.h"
+ 
+ 
+@@ -207,65 +206,6 @@
+ }
+ 
+ /* ------------------------------------------------------------------------- *
+- * test_systemstorageinfo
+- * ------------------------------------------------------------------------- */
+-
+-static const char *human_size(qlonglong n)
+-{
+-  if (n == 0) return "0B";
+-
+-  static char buf[256];
+-  char *pos = buf;
+-  char *end = buf + sizeof buf;
+-
+-  int b = n & 1023; n >>= 10;
+-  int k = n & 1023; n >>= 10;
+-  int m = n & 1023; n >>= 10;
+-  int g = n & 1023; n >>= 10;
+-
+-  *pos = 0;
+-#if defined(Q_OS_WIN)
+-  if (g) _snprintf_s(pos, sizeof(pos), end-pos,"%s%dGB", *buf?" ":"", g), pos = strchr(pos,0);
+-  if (m) _snprintf_s(pos, sizeof(pos), end-pos,"%s%dMB", *buf?" ":"", m), pos = strchr(pos,0);
+-  if (k) _snprintf_s(pos, sizeof(pos), end-pos,"%s%dkB", *buf?" ":"", k), pos = strchr(pos,0);
+-  if (b) _snprintf_s(pos, sizeof(pos), end-pos,"%s%dB",  *buf?" ":"", b), pos = strchr(pos,0);
+-#else
+-  if (g) snprintf(pos, end-pos, "%s%dGB", *buf?" ":"", g), pos = strchr(pos,0);
+-  if (m) snprintf(pos, end-pos, "%s%dMB", *buf?" ":"", m), pos = strchr(pos,0);
+-  if (k) snprintf(pos, end-pos, "%s%dkB", *buf?" ":"", k), pos = strchr(pos,0);
+-  if (b) snprintf(pos, end-pos, "%s%dB",  *buf?" ":"", b), pos = strchr(pos,0);
+-#endif
+-  return buf;
+-}
+-
+-static void test_storageinfo(void)
+-{
+-  QStorageInfo storageinfo;
+-
+-  QStringList lst = storageinfo.allLogicalDrives();
+-
+-  qDebug() << "storageinfo.logicalDrives ->" << lst;
+-
+-  for (int i = 0; i < lst.size(); ++i) {
+-    const QString &drv = lst.at(i);
+-
+-    qDebug() << "Logical drive:" << drv;
+-
+-    qlonglong avail = storageinfo.availableDiskSpace(drv);
+-    qDebug() << "  storageinfo.availableDiskSpace() ->" << human_size(avail);
+-
+-    qlonglong total = storageinfo.totalDiskSpace(drv);
+-    qDebug() << "  storageinfo.totalDiskSpace() ->" << human_size(total);
+-
+-    QStorageInfo::DriveType dtype = storageinfo.driveType(drv);
+-    qDebug() << "  storageinfo.typeForDrive() ->" << dtype;
+-
+-    QString duri = storageinfo.uriForDrive(drv);
+-    qDebug() << "  storageinfo.uriForDrive() ->" << duri;
+-  }
+-}
+-
+-/* ------------------------------------------------------------------------- *
+  * test_systemnetworkinfo
+  * ------------------------------------------------------------------------- */
+ 
+@@ -357,7 +297,6 @@
+ #define ADD(x) {#x, test_##x }
+ //  ADD(systeminfo),
+   ADD(deviceinfo),
+-  ADD(storageinfo),
+   ADD(networkinfo),
+ //  ADD(screensaver),
+   ADD(batteryinfo),
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-07-15 09:21:57 +0000
+++ debian/patches/series	2015-02-03 15:58:39 +0000
@@ -3,3 +3,6 @@
 wlan_detect.patch
 skip_failing_tests.patch
 fix_qserviceinterfacedescriptor_unit_test.patch
+remove-storageinfo.patch
+remove-storageinfo-examples.patch
+inputinfo.patch

=== modified file 'debian/qtsystems5-dev.install'
--- debian/qtsystems5-dev.install	2014-05-26 07:37:59 +0000
+++ debian/qtsystems5-dev.install	2015-02-03 15:58:39 +0000
@@ -31,16 +31,17 @@
 usr/include/*/qt5/QtSystemInfo/QDeviceInfo
 usr/include/*/qt5/QtSystemInfo/QNetworkInfo
 usr/include/*/qt5/QtSystemInfo/QScreenSaver
-usr/include/*/qt5/QtSystemInfo/QStorageInfo
 usr/include/*/qt5/QtSystemInfo/QtSystemInfo
 usr/include/*/qt5/QtSystemInfo/QtSystemInfoVersion
 usr/include/*/qt5/QtSystemInfo/qbatteryinfo.h
 usr/include/*/qt5/QtSystemInfo/qdeviceinfo.h
 usr/include/*/qt5/QtSystemInfo/qnetworkinfo.h
 usr/include/*/qt5/QtSystemInfo/qscreensaver.h
-usr/include/*/qt5/QtSystemInfo/qstorageinfo.h
 usr/include/*/qt5/QtSystemInfo/qsysteminfoglobal.h
 usr/include/*/qt5/QtSystemInfo/qtsysteminfoversion.h
+usr/include/*/qt5/QtSystemInfo/qinputinfo.h
+usr/include/*/qt5/QtSystemInfo/QInputDevice
+usr/include/*/qt5/QtSystemInfo/QInputDeviceInfo
 usr/lib/*/cmake/*
 usr/lib/*/libQt5PublishSubscribe.prl
 usr/lib/*/libQt5PublishSubscribe.so

=== modified file 'debian/qtsystems5-examples.install'
--- debian/qtsystems5-examples.install	2013-07-12 13:41:02 +0000
+++ debian/qtsystems5-examples.install	2015-02-03 15:58:39 +0000
@@ -1,8 +1,6 @@
 usr/lib/*/qt5/examples/sysinfo/qml-battery/qml-battery
 usr/lib/*/qt5/examples/sysinfo/qml-battery/qml-battery.qml
-usr/lib/*/qt5/examples/sysinfo/qml-storageinfo/content/ProgressBar.qml
-usr/lib/*/qt5/examples/sysinfo/qml-storageinfo/content/background.png
-usr/lib/*/qt5/examples/sysinfo/qml-storageinfo/qml-storage.qml
-usr/lib/*/qt5/examples/sysinfo/qml-storageinfo/qml-storageinfo
 usr/lib/*/qt5/examples/systeminfo/qml-deviceinfo/qml-deviceinfo
 usr/lib/*/qt5/examples/systeminfo/qml-deviceinfo/qml-deviceinfo.qml
+usr/lib/*/qt5/examples/sysinfo/qml-inputinfo/qml-inputinfo
+usr/lib/*/qt5/examples/sysinfo/qml-inputinfo/qml-inputinfo.qml

=== modified file 'debian/qtsystems5-private-dev.install'
--- debian/qtsystems5-private-dev.install	2014-05-26 07:37:59 +0000
+++ debian/qtsystems5-private-dev.install	2015-02-03 15:58:39 +0000
@@ -38,6 +38,7 @@
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qdeviceinfo_mac_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qdeviceinfo_win_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qdevicekitservice_linux_p.h
+usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qinputdeviceinfo_linux_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qnetworkinfo_linux_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qnetworkinfo_mac_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qnetworkinfo_win_p.h
@@ -45,9 +46,6 @@
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qscreensaver_linux_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qscreensaver_mac_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qscreensaver_win_p.h
-usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qstorageinfo_linux_p.h
-usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qstorageinfo_mac_p.h
-usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qstorageinfo_win_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qsystemalignedtimer_linux_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qsystemalignedtimer_stub_p.h
 usr/include/*/qt5/QtSystemInfo/*/QtSystemInfo/private/qsysteminfo_simulator_p.h

=== modified file 'debian/rules'
--- debian/rules	2014-07-15 09:21:57 +0000
+++ debian/rules	2015-02-03 15:58:39 +0000
@@ -23,14 +23,14 @@
 	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
 
 	# Fix wrong permissions in examples.
-	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/ -type f \( \
-	-name '*.png' \
-	-o -name '*.php' \
-	-o -name '*.xsl' \
-	-o -name '*.xml' \
-	-o -name '*.js' \
-	-o -name '*.jpg' \
-	\) -print0 | xargs -0 chmod a-x
+	#find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/ -type f \( \
+	#-name '*.png' \
+	#-o -name '*.php' \
+	#-o -name '*.xsl' \
+	#-o -name '*.xml' \
+	#-o -name '*.js' \
+	#-o -name '*.jpg' \
+	#\) -print0 | xargs -0 chmod a-x
 
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
@@ -40,5 +40,5 @@
 	dh_install --fail-missing
 
 override_dh_auto_test:
-	export LD_LIBRARY_PATH=$(CURDIR)/lib
-	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && make -f Makefile check
+	[ ! -d $(CURDIR)/home ] && mkdir $(CURDIR)/home
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && env LD_LIBRARY_PATH=$(CURDIR)/lib HOME=$(CURDIR)/home make -f Makefile check