diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-18 11:16:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-18 11:16:39 (GMT) |
| commit | f803f2e68918bfaef14f6f8fc691d6bf851f8767 (patch) | |
| tree | dbb7458842d254194a802e408341d7067b860921 /src | |
| parent | babb444554958718c70fcc4f2ec73e3dfcc4dd11 (diff) | |
| parent | 3e4f85dbbdb8b8a62e33f8680b0cc87ce2ed9e7e (diff) | |
| download | Qt-f803f2e68918bfaef14f6f8fc691d6bf851f8767.zip Qt-f803f2e68918bfaef14f6f8fc691d6bf851f8767.tar.gz Qt-f803f2e68918bfaef14f6f8fc691d6bf851f8767.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(); |