projects / profile / ivi / qtbase.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b2a8832) | patch
Apply 57993ba7 properly to 4.8
authorJiang Jiang <jiang.jiang@nokia.com>
Thu, 14 Jul 2011 07:40:12 +0000 (09:40 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 14 Jul 2011 09:21:55 +0000 (11:21 +0200)
commit042cffd601fd5b7e9ef176531893337a917cf455
treea567e11fa45a6737788be76d121ba90acee41473tree | snapshot
parentb2a8832a10b8b57aaff0e92fc31a2f6326a4822dcommit | diff
Apply 57993ba7 properly to 4.8

Because we have moved alignLine from qtextlayout.cpp to QTextEngine,
this patch has to be applied manually.

Reviewed-by: TrustMe
(cherry picked from commit 705416cdc8ee91ac88d80298dbe2971a9384c196)

Change-Id: Ibd657a52da1c510c839623738d49602b5c4a0824
Reviewed-on: http://codereview.qt.nokia.com/1640
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
src/gui/text/qtextengine.cpp diff | blob | history
Domain: UI Framework / Uncategorized;