diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-07 12:31:14 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-07 12:31:14 (GMT) |
| commit | 30cf45cf53e030158fef4dfb262e7444332d3138 (patch) | |
| tree | 3bfe9133feb8d1505b6e394e791a348cdf4d475f /src/gui/text | |
| parent | d52f0887a740d147a74c3e38ae587f688fbf896a (diff) | |
| parent | 3505c6cdcdfac5a6d0f4b94dbdbcc8ad72f8048a (diff) | |
| download | Qt-30cf45cf53e030158fef4dfb262e7444332d3138.zip Qt-30cf45cf53e030158fef4dfb262e7444332d3138.tar.gz Qt-30cf45cf53e030158fef4dfb262e7444332d3138.tar.bz2 | |
Merge branch '4.7-oslo1' into 4.7-doc
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qstatictext.cpp | 6 | ||||
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 21c2e02..b950b13 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -400,9 +400,9 @@ QStaticTextPrivate::QStaticTextPrivate() QStaticTextPrivate::QStaticTextPrivate(const QStaticTextPrivate &other) : text(other.text), font(other.font), textWidth(other.textWidth), matrix(other.matrix), - items(0), itemCount(0), glyphPool(0), positionPool(0), charPool(0), needsRelayout(true), - useBackendOptimizations(other.useBackendOptimizations), textFormat(other.textFormat), - untransformedCoordinates(other.untransformedCoordinates) + items(0), itemCount(0), glyphPool(0), positionPool(0), charPool(0), textOption(other.textOption), + needsRelayout(true), useBackendOptimizations(other.useBackendOptimizations), + textFormat(other.textFormat), untransformedCoordinates(other.untransformedCoordinates) { } diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 119217a..05de8f5 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2263,6 +2263,9 @@ bool QTextEngine::atWordSeparator(int position) const case ',': case '?': case '!': + case '@': + case '#': + case '$': case ':': case ';': case '-': @@ -2283,6 +2286,7 @@ bool QTextEngine::atWordSeparator(int position) const case '*': case '\'': case '"': + case '`': case '~': case '|': return true; |