[Merge] lp:~unity-team/qtubuntu/DPR into lp:qtubuntu

[Gerry Boland]

@Daniel, you were correct, I had mixed up a case where pixel != devicePixel. Since this is far too easy to screw up, I thought it a good idea to append "Px" to any variable that is in pixels, and so any other geometry is in device pixels. I think it helps distinguish them.
-- 
https://code.launchpad.net/~unity-team/qtubuntu/DPR/+merge/257515
Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu.