projects / platform / upstream / qtdeclarative.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da6360b aebdf46)
Merge remote-tracking branch 'origin/5.4.1' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:34:35 +0000 (10:34 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:34:35 +0000 (10:34 +0100)
Change-Id: I127c746c4131fc907ea4b6713d307f12a4760666

1  2 
src/quick/items/qquicktext.cpp patch | diff1 | diff2 | blob | history

diff --cc src/quick/items/qquicktext.cpp
Simple merge
Domain: UI Framework / Qt;