diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-01-20 18:46:06 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-07 23:13:23 (GMT) |
| commit | 166610ff02810e3412c348629862424373676c03 (patch) | |
| tree | 424d03242461e8c8bb705baec65c9372d8829f65 /src | |
| parent | 9dba7627557364c3498809e775ab79bc6f0c3158 (diff) | |
| download | Qt-166610ff02810e3412c348629862424373676c03.zip Qt-166610ff02810e3412c348629862424373676c03.tar.gz Qt-166610ff02810e3412c348629862424373676c03.tar.bz2 | |
Compile in C++11 mode: narrowing conversion problems
Matches qtbase commit a13b17e42a7ca146ec9503285df546d4ade22c91
Change-Id: Ie554499f40c03c715d527f2c1624b97fafe5ce8c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp index f9a4306..cabc4c6 100644 --- a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp +++ b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp @@ -301,10 +301,11 @@ QStringList QBasicUnixFontDatabase::addTTFile(const QByteArray &fontData, const TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, ft_sfnt_os2); if (os2) { quint32 unicodeRange[4] = { - os2->ulUnicodeRange1, os2->ulUnicodeRange2, os2->ulUnicodeRange3, os2->ulUnicodeRange4 + quint32(os2->ulUnicodeRange1), quint32(os2->ulUnicodeRange2), + quint32(os2->ulUnicodeRange3), quint32(os2->ulUnicodeRange4) }; quint32 codePageRange[2] = { - os2->ulCodePageRange1, os2->ulCodePageRange2 + quint32(os2->ulCodePageRange1), quint32(os2->ulCodePageRange2) }; writingSystems = determineWritingSystemsFromTrueTypeBits(unicodeRange, codePageRange); |