summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2010-08-18 14:03:54 (GMT)
committerJiang Jiang <jiang.jiang@nokia.com>2010-08-19 14:42:41 (GMT)
commitee2ff544fec7a40ff3096edc4bf7cc7ca8cfa191 (patch)
treea7816fd2c2f835e7aa2ff1520a194d68b1dbb004
parente0e6fece5f79609a39a410044437e4d78eca56c6 (diff)
downloadQt-ee2ff544fec7a40ff3096edc4bf7cc7ca8cfa191.zip
Qt-ee2ff544fec7a40ff3096edc4bf7cc7ca8cfa191.tar.gz
Qt-ee2ff544fec7a40ff3096edc4bf7cc7ca8cfa191.tar.bz2
Ignore LayoutDirectionChange event in QTextControl
LayoutDirectionChange should no longer affect text direction in 4.7, by ignoring this event in QTextControl, we make the behavior consistent with QLineEdit. Reviewed-by: Lars Knoll
-rw-r--r--src/gui/text/qtextcontrol.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 3d34687..5fe0c0c 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -1101,14 +1101,6 @@ void QTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget *conte
}
}
break;
- case QEvent::LayoutDirectionChange: {
- if (contextWidget) {
- QTextOption opt = document()->defaultTextOption();
- opt.setTextDirection(contextWidget->layoutDirection());
- document()->setDefaultTextOption(opt);
- }
- }
- // FALL THROUGH
default:
break;
}