summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-30 12:38:10 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-30 12:38:10 (GMT)
commitd4da5248006e4a9f4d6a454bf754407a34a09407 (patch)
tree2c6d05606884d8a8fb279e3a74165dbd822da28b
parentdc63643883ecda5d92d561e41e44254276a1ff2b (diff)
parent6699f65e276d24c99d0937f1bb460ced176076d8 (diff)
downloadQt-d4da5248006e4a9f4d6a454bf754407a34a09407.zip
Qt-d4da5248006e4a9f4d6a454bf754407a34a09407.tar.gz
Qt-d4da5248006e4a9f4d6a454bf754407a34a09407.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Minor optimization
-rw-r--r--src/gui/text/qpfutil.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qpfutil.cpp b/src/gui/text/qpfutil.cpp
index 376f49c..7f8c58e 100644
--- a/src/gui/text/qpfutil.cpp
+++ b/src/gui/text/qpfutil.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-static QFontEngineQPF::TagType tagTypes[QFontEngineQPF::NumTags] = {
+static const QFontEngineQPF::TagType tagTypes[QFontEngineQPF::NumTags] = {
QFontEngineQPF::StringType, // FontName
QFontEngineQPF::StringType, // FileName
QFontEngineQPF::UInt32Type, // FileIndex