From: Sergio Ahumada <sahumada@blackberry.com>
Date: Sat, 14 Jun 2014 19:59:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/5.3' into dev
X-Git-Tag: upstream/5.3.1~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d691f5ca2b6749006673e199b1d668a6daa9b990;p=platform%2Fupstream%2Fqtmultimedia.git

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

Conflicts:
	.qmake.conf

Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f
---

d691f5ca2b6749006673e199b1d668a6daa9b990