From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Tue, 4 Jun 2013 17:43:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/stable' into dev
X-Git-Tag: upstream/5.2.1~795^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a6bf3ed5c5338dca085c3979edc8ec8f51c7980;p=platform%2Fupstream%2Fqtdeclarative.git

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

Conflicts:
	.qmake.conf

Change-Id: Ib8b5509c48a686f6e916708d83914e13e4f67e9c
---

7a6bf3ed5c5338dca085c3979edc8ec8f51c7980