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

[PS Jenkins bot]

Review: Approve continuous-integration

PASSED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/properties-cpp-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/properties-cpp-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/properties-cpp-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/properties-cpp-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/properties-cpp-utopic-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/properties-cpp-ci/8/rebuild

-- 
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.