summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-07-02 02:51:13 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-07-05 00:19:16 (GMT)
commitf3c12fedad6b9dd1917c329059b4c05175c03130 (patch)
tree94a95f53274ce5822eab7c8ee43f101a582d4c93
parentdac42b0d66eda9a7101847ced61c118024ef9c6d (diff)
downloadQt-f3c12fedad6b9dd1917c329059b4c05175c03130.zip
Qt-f3c12fedad6b9dd1917c329059b4c05175c03130.tar.gz
Qt-f3c12fedad6b9dd1917c329059b4c05175c03130.tar.bz2
Optimize QDeclarativeStyledText.
Don't set the base font, as this is an expensive operation. The base font will automatically be merged in by the text engine.
-rw-r--r--src/declarative/util/qdeclarativestyledtext.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp
index babd71b..9b4955e 100644
--- a/src/declarative/util/qdeclarativestyledtext.cpp
+++ b/src/declarative/util/qdeclarativestyledtext.cpp
@@ -152,8 +152,6 @@ void QDeclarativeStyledTextPrivate::parse()
QTextCharFormat format;
if (formatStack.count())
format = formatStack.top();
- else
- format.setFont(baseFont);
if (parseTag(ch, text, drawText, format))
formatStack.push(format);
}