From: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Date: Mon, 19 Jan 2015 13:07:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/5.4' into dev
X-Git-Tag: v5.5.90+alpha1~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6283d0c106e4caeaf25557864890745ab3fe6a3d;p=platform%2Fupstream%2Fqttools.git

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

Conflicts:
	.qmake.conf

Change-Id: Ifdb0e36fde8a63e1a768f1c876521e908810244d
---

6283d0c106e4caeaf25557864890745ab3fe6a3d