diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-10-14 16:51:20 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-10-14 16:51:20 +0200 |
commit | 1c313a529ff0893c43c3ccaabe92c4e015acf891 (patch) | |
tree | 4e9b735c04e6579763474dd844eef13a8985ac64 /src/gui/text/qfontengine.cpp | |
parent | 7750f3821c7cd526c33bfa09378378da3980a2e6 (diff) | |
parent | 81bc22dbd71e2dd0e25156e753afc6d94d808de9 (diff) |
Merge branch '4.6' into lighthouse
Conflicts:
src/gui/kernel/qapplication.cpp
src/gui/kernel/qwidget.cpp
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
-rw-r--r-- | src/gui/text/qfontengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 728cef411d..37f9674972 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -1160,7 +1160,7 @@ Q_GLOBAL_STATIC_WITH_INITIALIZER(QVector<QRgb>, qt_grayPalette, { QRgb *it = x->data(); for (int i = 0; i < x->size(); ++i, ++it) *it = 0xff000000 | i | (i<<8) | (i<<16); -}); +}) const QVector<QRgb> &QFontEngine::grayPalette() { |