[Merge] lp:~gerboland/qtubuntu/adopt-more-eglconvenience2 into lp:qtubuntu

[Michał Sawicz]

Review: Needs Fixing

Text conflict in src/ubuntumirclient/glcontext.cpp
Text conflict in src/ubuntumirclient/integration.cpp
2 conflicts encountered.
-- 
https://code.launchpad.net/~gerboland/qtubuntu/adopt-more-eglconvenience2/+merge/295248
Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu.