diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-18 17:18:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-18 17:18:30 (GMT) |
| commit | ceb068261e326f38b4049becd75c7160a6b84f87 (patch) | |
| tree | 6a74799e299e345da35ac9feedd893e48089f2ba /src | |
| parent | 9ab7a8512957465d16c24e86ad3d90f14ce037bc (diff) | |
| parent | f803f2e68918bfaef14f6f8fc691d6bf851f8767 (diff) | |
| download | Qt-ceb068261e326f38b4049becd75c7160a6b84f87.zip Qt-ceb068261e326f38b4049becd75c7160a6b84f87.tar.gz Qt-ceb068261e326f38b4049becd75c7160a6b84f87.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
respect the layout direction in the default text option
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qtextobject.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 5fb3384..d25fb05 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -1156,6 +1156,10 @@ Qt::LayoutDirection QTextBlock::textDirection() const if (dir != Qt::LayoutDirectionAuto) return dir; + dir = p->defaultTextOption.textDirection(); + if (dir != Qt::LayoutDirectionAuto) + return dir; + const QString buffer = p->buffer(); const int pos = position(); |