Merge master <-> api_changes
[profile/ivi/qtdeclarative.git] / examples / tutorials / extending / chapter2-methods / chapter2-methods.pro