diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-31 19:47:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-31 19:47:43 (GMT) |
| commit | 3cbf4e94d5c02eb97bd56fc65bf354024edc3413 (patch) | |
| tree | 51bca1656e5a732e02706d5d0f3f4d0dd8a0a80d /src | |
| parent | 271a96f201ebcd346bb532e207c1d0e465f89584 (diff) | |
| parent | fc55c05b411bd7cbfe6f04e269e63b8b1319140a (diff) | |
| download | Qt-3cbf4e94d5c02eb97bd56fc65bf354024edc3413.zip Qt-3cbf4e94d5c02eb97bd56fc65bf354024edc3413.tar.gz Qt-3cbf4e94d5c02eb97bd56fc65bf354024edc3413.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix build in C++0x mode
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/embedded/qmousepc_qws.cpp | 2 | ||||
| -rw-r--r-- | src/gui/embedded/qwslock.cpp | 10 | ||||
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/embedded/qmousepc_qws.cpp b/src/gui/embedded/qmousepc_qws.cpp index 5d3b182..c22cab9 100644 --- a/src/gui/embedded/qmousepc_qws.cpp +++ b/src/gui/embedded/qmousepc_qws.cpp @@ -261,7 +261,7 @@ public: usleep(50000); QT_WRITE(fd,"@EeI!",5); usleep(10000); - static const char ibuf[] = { 246, 244 }; + static const unsigned char ibuf[] = { 246, 244 }; QT_WRITE(fd,ibuf,1); QT_WRITE(fd,ibuf+1,1); if (tcflush(fd,TCIOFLUSH) == -1) { diff --git a/src/gui/embedded/qwslock.cpp b/src/gui/embedded/qwslock.cpp index 0d65b61..a64dc3d 100644 --- a/src/gui/embedded/qwslock.cpp +++ b/src/gui/embedded/qwslock.cpp @@ -114,7 +114,7 @@ QWSLock::~QWSLock() QWSSignalHandler::instance()->removeSemaphore(semId); } -static bool forceLock(int semId, int semNum, int) +static bool forceLock(int semId, unsigned short semNum, int) { int ret; do { @@ -135,7 +135,7 @@ static bool forceLock(int semId, int semNum, int) return (ret != -1); } -static bool up(int semId, int semNum) +static bool up(int semId, unsigned short semNum) { int ret; do { @@ -148,7 +148,7 @@ static bool up(int semId, int semNum) return (ret != -1); } -static bool down(int semId, int semNum) +static bool down(int semId, unsigned short semNum) { int ret; do { @@ -161,7 +161,7 @@ static bool down(int semId, int semNum) return (ret != -1); } -static int getValue(int semId, int semNum) +static int getValue(int semId, unsigned short semNum) { int ret; do { @@ -210,7 +210,7 @@ void QWSLock::unlock(LockType type) return; } - const int semNum = type; + const unsigned short semNum = type; int ret; do { sembuf sops = {semNum, 1, 0}; diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 7a8a912..98186df 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -879,10 +879,10 @@ QStringList QFontDatabasePrivate::addTTFile(const QByteArray &file, const QByteA 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 + static_cast<quint32>(os2->ulUnicodeRange1), static_cast<quint32>(os2->ulUnicodeRange2), static_cast<quint32>(os2->ulUnicodeRange3), static_cast<quint32>(os2->ulUnicodeRange4) }; quint32 codePageRange[2] = { - os2->ulCodePageRange1, os2->ulCodePageRange2 + static_cast<quint32>(os2->ulCodePageRange1), static_cast<quint32>(os2->ulCodePageRange2) }; writingSystems = qt_determine_writing_systems_from_truetype_bits(unicodeRange, codePageRange); |