diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-01-11 16:48:23 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-01-13 13:29:01 (GMT) |
| commit | 8ea10d62722a16282b03cdea6918d811501a7812 (patch) | |
| tree | 751d1aed5a5def3159ff95a9ca873bd54a9ee729 | |
| parent | b46b5518a7472fa1591bdc402ab4f2f5be07cc5b (diff) | |
| download | Qt-8ea10d62722a16282b03cdea6918d811501a7812.zip Qt-8ea10d62722a16282b03cdea6918d811501a7812.tar.gz Qt-8ea10d62722a16282b03cdea6918d811501a7812.tar.bz2 | |
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
(cherry picked from commit 8798b36880d1387d2d27f7fb35ccbf02af6232a0)
| -rw-r--r-- | src/gui/text/qfont.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index e4121e9..108241f 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. |