diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-12 08:16:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-12 08:16:39 (GMT) |
| commit | 575cadb3fed155face4344508a936efd93fbd52b (patch) | |
| tree | 41c57cd9876bb94b4647527a84c4629d7383720c | |
| parent | 1571281bc0839cf504ac7692050ef4fe61532470 (diff) | |
| parent | 693e39f3b630afa44cd1bd8d942825922a5d59fe (diff) | |
| download | Qt-575cadb3fed155face4344508a936efd93fbd52b.zip Qt-575cadb3fed155face4344508a936efd93fbd52b.tar.gz Qt-575cadb3fed155face4344508a936efd93fbd52b.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fix warning for uninitialized variable
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index c900918..db50bdf 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -323,7 +323,7 @@ static QChar::Direction skipBoundryNeutrals(QScriptAnalysis *analysis, const ushort *unicode, int length, int &sor, int &eor, QBidiControl &control) { - QChar::Direction dir; + QChar::Direction dir = control.basicDirection(); int level = sor > 0 ? analysis[sor - 1].bidiLevel : control.level; while (sor < length) { dir = QChar::direction(unicode[sor]); |