lp:~bfiller/ubuntu-keyboard/adding_autopilot_tests_and_emulators

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-keyboard at revision 23

PS Jenkins bot: Approve (continuous-integration) on 2013-08-23

Bill Filler (community): Approve on 2013-08-23

Thomi Richards: Pending requested 2013-08-23

Diff: 1124 lines (+859/-4)

16 files modified

debian/control (+11/-0)
debian/rules (+9/-3)
debian/ubuntu-keyboard-autopilot.install (+1/-0)
qml/Keyboard.qml (+10/-0)
qml/WordRibbon.qml (+3/-0)
src/lib/logic/layouthelper.h (+2/-0)
src/lib/logic/layoutupdater.cpp (+11/-0)
src/lib/models/layout.cpp (+18/-0)
src/lib/models/layout.h (+17/-1)
src/plugin/inputmethod.cpp (+3/-0)
tests/autopilot/setup.py (+32/-0)
tests/autopilot/ubuntu_keyboard/__init__.py (+18/-0)
tests/autopilot/ubuntu_keyboard/emulators/__init__.py (+18/-0)
tests/autopilot/ubuntu_keyboard/emulators/keyboard.py (+346/-0)
tests/autopilot/ubuntu_keyboard/tests/__init__.py (+18/-0)
tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+342/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

35. By Bill Filler on 2013-08-23

merge from trunk

34. By Christopher Lee on 2013-08-23

Merge Trunk

33. By Christopher Lee on 2013-08-22

Merge trunk, resolve conflict in Keyboard.qml

32. By Christopher Lee on 2013-08-22

Fix issues with exceptions, added objectname (for when there are >1 keyboards installed)

31. By Christopher Lee on 2013-08-21

Docs improvements and minor code cleanup.

30. By Christopher Lee on 2013-08-21

fix reference to maliit-keyboard in debian/control

29. By Christopher Lee on 2013-08-21

Add notes about failing tests. added bug number references.

28. By Christopher Lee on 2013-08-21

Fixes and improvements as per MR comments

27. By Christopher Lee on 2013-08-20

Fix copyright headers

26. By Christopher Lee on 2013-08-20

debian/ depends re-order as per mterry's comment