projects / platform / upstream / qttools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec56885 7ae0a0a)
Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 15:57:07 +0000 (16:57 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 15:57:07 +0000 (16:57 +0100)
Conflicts:
.qmake.conf

Change-Id: Ifbda2445e6665d66a1372f6c0a2d0a1c30ae029d


Trivial merge
Domain: UI Framework / Qt;