Merge lp:~saviq/qtubuntu/map-power-keys into lp:qtubuntu

[Michał Sawicz]

Map PowerDown and PowerOff keys and fix indentation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/88/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/76
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/76/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/qtubuntu-ci/88/rebuild

review: Approve (continuous-integration)

=== modified file 'src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.cc'
--- src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.cc	2013-10-07 23:17:09 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.cc	2013-10-15 21:57:27 +0000
@@ -100,8 +100,10 @@
 
   XKB_KEY_Mode_switch,             Qt::Key_Mode_switch,
   XKB_KEY_script_switch,           Qt::Key_Mode_switch,
-  XKB_KEY_XF86AudioRaiseVolume,     Qt::Key_VolumeUp,
-  XKB_KEY_XF86AudioLowerVolume,     Qt::Key_VolumeDown,
+  XKB_KEY_XF86AudioRaiseVolume,    Qt::Key_VolumeUp,
+  XKB_KEY_XF86AudioLowerVolume,    Qt::Key_VolumeDown,
+  XKB_KEY_XF86PowerOff,            Qt::Key_PowerOff,
+  XKB_KEY_XF86PowerDown,           Qt::Key_PowerDown,
 
   0,                          0
 };