From: Liang Qi <liang.qi@theqtcompany.com>
Date: Wed, 19 Aug 2015 14:34:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/5.4' into 5.5
X-Git-Tag: v5.5.90+alpha1~2^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d7b5b2e1c798335e20c7fc269e8f8238505eba0;p=platform%2Fupstream%2Fqttools.git

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

Conflicts:
	examples/designer/doc/src/arthurplugin.qdoc

Change-Id: I5c0118a90111b51db04d2ea2eb6b3c47f1fb761f
---

1d7b5b2e1c798335e20c7fc269e8f8238505eba0