summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2010-09-22 13:10:44 (GMT)
committerJiang Jiang <jiang.jiang@nokia.com>2010-09-23 09:59:21 (GMT)
commit6397e5bc49f11e20a9d1838d8d8df46dd9486263 (patch)
tree7e68924eee7191003a55c428d523c0e3d2e267b2 /src
parent9b20aac0ad83b917c46cc44b78dc90fb1d238fe8 (diff)
downloadQt-6397e5bc49f11e20a9d1838d8d8df46dd9486263.zip
Qt-6397e5bc49f11e20a9d1838d8d8df46dd9486263.tar.gz
Qt-6397e5bc49f11e20a9d1838d8d8df46dd9486263.tar.bz2
Fix text direction setting in QTextBlock layout
QTextControl should no longer inherit the layout direction of parent widget as its default text direction. Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Lars Knoll
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qtextcontrol.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 5fe0c0c..7f2c4e9 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -404,12 +404,6 @@ void QTextControlPrivate::init(Qt::TextFormat format, const QString &text, QText
Q_Q(QTextControl);
setContent(format, text, document);
- QWidget *parentWidget = qobject_cast<QWidget*>(parent);
- if (parentWidget) {
- QTextOption opt = doc->defaultTextOption();
- opt.setTextDirection(parentWidget->layoutDirection());
- doc->setDefaultTextOption(opt);
- }
doc->setUndoRedoEnabled(interactionFlags & Qt::TextEditable);
q->setCursorWidth(-1);
}