projects / platform / upstream / qttools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c19d021 f5f5057)
Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 16 Sep 2014 13:29:38 +0000 (15:29 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 16 Sep 2014 13:29:38 +0000 (15:29 +0200)
Conflicts:
.qmake.conf

Change-Id: I32718899f94175b7012ac5ba208fc18eb54b3ae9

1  2 
src/macdeployqt/shared/shared.cpp patch | diff1 | diff2 | blob | history

diff --cc src/macdeployqt/shared/shared.cpp
Simple merge
Domain: UI Framework / Qt;