[Merge] lp:~marcustomlinson/properties-cpp/fix_qt_keyword_clash into lp:properties-cpp

[Marcus Tomlinson]

This fix has been spurred on by compilation errors experienced when building scopes against the latest unity-scopes-api (which now includes a dependancy on properties-cpp).

http://paste.ubuntu.com/7638421/
-- 
https://code.launchpad.net/~marcustomlinson/properties-cpp/fix_qt_keyword_clash/+merge/223056
Your team Ubuntu Phablet Team is subscribed to branch lp:properties-cpp.