Merge master <-> api_changes
[profile/ivi/qtdeclarative.git] / examples / quick / imageelements / borderimage.qml