From: Simon Hausmann <simon.hausmann@theqtcompany.com>
Date: Fri, 31 Oct 2014 19:20:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/5.4' into dev
X-Git-Tag: v5.5.90+alpha1~787
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=473ef83dba6976250a1ff27175716aa1af970f2f;p=platform%2Fupstream%2Fqtdeclarative.git

Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I30f9c925631991ceb22339d1333936faecffbaf4
---

473ef83dba6976250a1ff27175716aa1af970f2f