projects / platform / upstream / qtdeclarative.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 81b876b) | patch
Fix Text wrapping when growing from 0 width.
authorMichael Brasser <michael.brasser@live.com>
Mon, 2 Feb 2015 17:23:31 +0000 (11:23 -0600)
committerMichael Brasser <michael.brasser@live.com>
Tue, 3 Feb 2015 14:46:57 +0000 (14:46 +0000)
commit3b2e59130bf264ec63bf51b2049989f697d91ca1
tree0e58a0762a92982d6e3204328e3b287b8cf8203ftree | snapshot
parent81b876b7177cf0d55b7c009342e501bfa900175ccommit | diff
Fix Text wrapping when growing from 0 width.

The fix for QTBUG-30896 caused a regression in the test case. Now check
both width and implicit width validity before resetting widthExceeded.

Change-Id: I4aba2aad299746906cfe20e288fa60cfe2acc64f
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
src/quick/items/qquicktext.cpp diff | blob | history
tests/auto/quick/qquicktext/data/growFromZeroWidth.qml [new file with mode: 0644] blob
tests/auto/quick/qquicktext/tst_qquicktext.cpp diff | blob | history
Domain: UI Framework / Qt;