diff options
| author | Bernhard Rosenkraenzer <bero@arklinux.ch> | 2011-05-30 09:31:42 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-31 16:43:37 (GMT) |
| commit | fc55c05b411bd7cbfe6f04e269e63b8b1319140a (patch) | |
| tree | 51b4721de904c7e87993b9af7be5713e7ea22a26 /src/gui/embedded/qmousepc_qws.cpp | |
| parent | dd33e048451ffc5420adbca9f30dba65f5dcf5e2 (diff) | |
| download | Qt-fc55c05b411bd7cbfe6f04e269e63b8b1319140a.zip Qt-fc55c05b411bd7cbfe6f04e269e63b8b1319140a.tar.gz Qt-fc55c05b411bd7cbfe6f04e269e63b8b1319140a.tar.bz2 | |
Fix build in C++0x mode
This fixes compiler errors (gcc 4.6 -std=gnu++0x on x86_64 Linux):
embedded/qwslock.cpp: In function `bool forceLock(int, int, int)':
embedded/qwslock.cpp:121:39: error: narrowing conversion of `semNum'
from `int' to `short unsigned int' inside { } [-fpermissive]
(and equivalent errors in other lines/files)
See
http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf
Section 8.5.4/6
Change-Id: I2cbac5482b87f33287a416af5a5c9bde621720bc
Reviewed-By: Olivier Goffart
Merge-Request: 1240
Reviewed-on: http://codereview.qt.nokia.com/275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit 15871d606a0a85cfcd2b68b95c0891165f61e402)
Diffstat (limited to 'src/gui/embedded/qmousepc_qws.cpp')
| -rw-r--r-- | src/gui/embedded/qmousepc_qws.cpp | 2 |
1 files changed, 1 insertions, 1 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) { |