summaryrefslogtreecommitdiffstats
path: root/src/qt3support/text/q3richtext.cpp
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-11-10 23:00:13 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-11-10 23:00:13 (GMT)
commitfce752ba402535a62e420a83483d0f92623d684a (patch)
tree24b1456a4136515524642138854d6232fb6ef634 /src/qt3support/text/q3richtext.cpp
parentd7da33a914a7e84ebf38cbb3244aac936838ecb1 (diff)
parent38e1ed3b51d6aad46912eb548490d038e58203d9 (diff)
downloadQt-fce752ba402535a62e420a83483d0f92623d684a.zip
Qt-fce752ba402535a62e420a83483d0f92623d684a.tar.gz
Qt-fce752ba402535a62e420a83483d0f92623d684a.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/qt3support/text/q3richtext.cpp')
-rw-r--r--src/qt3support/text/q3richtext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp
index d82d0f0..e24eeb5 100644
--- a/src/qt3support/text/q3richtext.cpp
+++ b/src/qt3support/text/q3richtext.cpp
@@ -2914,7 +2914,7 @@ QString Q3TextDocument::selectedText(int id, bool asRichText) const
}
}
// ### workaround for plain text export until we get proper
- // mime types: turn unicode line seperators into the more
+ // mime types: turn unicode line separators into the more
// widely understood \n. Makes copy and pasting code snipplets
// from within Assistent possible
QChar* uc = (QChar*) s.unicode();