diff options
| author | Sergey Gusarov <laborer2008@gmail.com> | 2012-03-31 10:55:51 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-05 13:38:51 (GMT) |
| commit | 72bf355b037648029a76cf7923e3f529c909f21a (patch) | |
| tree | dd1e8aa506e4ed16edc4f2fbbf41d29a434faba6 | |
| parent | 6714e05152bfe6bc17d8328c5c506395a3483129 (diff) | |
| download | Qt-72bf355b037648029a76cf7923e3f529c909f21a.zip Qt-72bf355b037648029a76cf7923e3f529c909f21a.tar.gz Qt-72bf355b037648029a76cf7923e3f529c909f21a.tar.bz2 | |
Fix signed/unsigned warnings (QWS)
Change-Id: I98ba87fa236b1a10ea2499e270e71a94f54c1c3b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/gui/embedded/qscreenlinuxfb_qws.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_qws.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp index 3fe9713..6d16af8 100644 --- a/src/gui/embedded/qscreenlinuxfb_qws.cpp +++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp @@ -383,9 +383,9 @@ bool QLinuxFbScreen::connect(const QString &displaySpec) dh=h; int xxoff, yyoff; if (sscanf(qwssize, "%*dx%*d+%d+%d", &xxoff, &yyoff) == 2) { - if (xxoff < 0 || xxoff + w > vinfo.xres) + if (xxoff < 0 || xxoff + w > (int)vinfo.xres) xxoff = vinfo.xres - w; - if (yyoff < 0 || yyoff + h > vinfo.yres) + if (yyoff < 0 || yyoff + h > (int)vinfo.yres) yyoff = vinfo.yres - h; xoff += xxoff; yoff += yyoff; diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp index 5ce4048..1215b1f 100644 --- a/src/gui/text/qfontengine_qws.cpp +++ b/src/gui/text/qfontengine_qws.cpp @@ -331,7 +331,7 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn) d->used_mmap = false; #endif d->mmapStart = new uchar[d->mmapLength]; - if (QT_READ(fd, d->mmapStart, d->mmapLength) != d->mmapLength) + if (QT_READ(fd, d->mmapStart, d->mmapLength) != (qint64)d->mmapLength) qFatal("Failed to read '%s'", QFile::encodeName(fn).constData()); } QT_CLOSE(fd); |