AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in MinGW when initializing font database

Browse Source 
Make sure that stacks are properly aligned so that we don't crash in
SSE2 code (as used in QString).

Task-number: QTBUG-36807
Change-Id: I765c1972fbb0a4b0c2dc5e4465e1d19e00b3322b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Kai Koehne 2014-02-12 16:38:51 +01:00 committed by The Qt Project
parent 0b700fb6f9
commit 2b66a37a3e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
View File

@ -933,8 +933,8 @@ static bool addFontToDatabase(const QString &familyName, uchar charSet,
return true;
}
static int CALLBACK storeFont(ENUMLOGFONTEX* f, NEWTEXTMETRICEX *textmetric,
int type, LPARAM namesSetIn)
static int QT_ENSURE_STACK_ALIGNED_FOR_SSE CALLBACK
storeFont(ENUMLOGFONTEX* f, NEWTEXTMETRICEX *textmetric, int type, LPARAM namesSetIn)
{
typedef QSet<QString> StringSet;
const QString familyName = QString::fromWCharArray(f->elfLogFont.lfFaceName);