lp:~mzanetti/unity8/update-inputinfo

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity8 at revision 2050

Albert Astals Cid (community): Abstain on 2015-11-09

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2015-11-09

Lukáš Tinkl (community): Approve on 2015-11-02

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

Diff: 2544 lines (+903/-1079)

26 files modified

plugins/Unity/InputInfo/CMakeLists.txt (+1/-1)
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp (+146/-98)
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h (+13/-6)
plugins/Unity/InputInfo/plugin.cpp (+2/-2)
plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo.cpp (+0/-143)
plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo_p.h (+0/-86)
plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cpp (+196/-0)
plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h (+102/-0)
plugins/Unity/InputInfo/qinputinfo.cpp (+140/-29)
plugins/Unity/InputInfo/qinputinfo.h (+57/-57)
qml/Components/UnityInputInfo/UnityInputInfo.qml (+0/-93)
qml/Components/UnityInputInfo/qmldir (+0/-1)
qml/OrientedShell.qml (+16/-7)
tests/mocks/Unity/InputInfo/CMakeLists.txt (+7/-2)
tests/mocks/Unity/InputInfo/mockcontroller.cpp (+35/-0)
tests/mocks/Unity/InputInfo/mockcontroller.h (+34/-0)
tests/mocks/Unity/InputInfo/mockqdeclarativeinputdeviceinfo.cpp (+0/-173)
tests/mocks/Unity/InputInfo/mockqdeclarativeinputdeviceinfo_p.h (+0/-94)
tests/mocks/Unity/InputInfo/mockqinputinfo.cpp (+0/-124)
tests/mocks/Unity/InputInfo/mockqinputinfo.h (+0/-139)
tests/mocks/Unity/InputInfo/plugin.cpp (+17/-3)
tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp (+52/-0)
tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock_p.h (+58/-0)
tests/qmltests/Notifications/tst_Notifications.qml (+5/-6)
tests/qmltests/Notifications/tst_SwipeToAct.qml (+5/-6)
tests/qmltests/tst_OrientedShell.qml (+17/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2001. By Michael Zanetti on 2015-11-09

add missing copyright header

2000. By Michael Zanetti on 2015-11-06

merge trunk

1999. By Michael Zanetti on 2015-11-02

drop some debug prints

1998. By Michael Zanetti on 2015-11-02

work around a conflict between Q_GLOBAL_STATIC and qmlRegisterSingletonType

You can't use those together as it will result in a double-free on shutdown

1997. By Michael Zanetti on 2015-11-02

merge trunk

1996. By Michael Zanetti on 2015-10-28

dropped debug print that slipped in

1995. By Michael Zanetti on 2015-10-22

fix include statemant after renaming a file

1994. By Michael Zanetti on 2015-10-22

drop old unused UnityInputInfo wrapper

1993. By Michael Zanetti on 2015-10-22

update tests

1992. By Michael Zanetti on 2015-10-21

merge trunk