summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfont.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-01-11 17:48:23 +0100
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-01-11 17:52:14 +0100
commit8798b36880d1387d2d27f7fb35ccbf02af6232a0 (patch)
tree78ace442030532d6cbef78826342cb8d049fe2f0 /src/gui/text/qfont.cpp
parent581b699cfbd729cffb1dbf4b43d6337cafa68d9b (diff)
fix release mode crash in qfont.cpp initFontSubst() on Windows mobile
Since we've disabled LTCG for Windows CE by default, the code in initFontSubst() crashes on Windows mobile. Adding the extra const solves this problem. Task-number: QTBUG-6641 Reviewed-by: ossi
Diffstat (limited to 'src/gui/text/qfont.cpp')
-rw-r--r--src/gui/text/qfont.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index f1cd6bbbf2..b414263022 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -1780,7 +1780,7 @@ Q_GLOBAL_STATIC(QFontSubst, globalFontSubst)
static void initFontSubst()
{
// default substitutions
- static const char *initTbl[] = {
+ static const char * const initTbl[] = {
#if defined(Q_WS_X11)
"arial", "helvetica",
@@ -1812,7 +1812,6 @@ static void initFontSubst()
}
}
-
/*!
Returns the first family name to be used whenever \a familyName is
specified. The lookup is case insensitive.