diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:30:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:30:02 +0200 |
| commit | c4e472ea1037afde7b99d9132a49eb616cad240e (patch) | |
| tree | c9e66fdda63a2e5c3f5a944d711e5c9845de33ac /src/plugins/platforms/xcb | |
| parent | 7b23ebefb2360feb139ff6e10d2253396e58721e (diff) | |
| parent | 6c1e352803a6efbd8b14e5296434e22165b65084 (diff) | |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Conflicts:
src/corelib/tools/qsimd_p.h
Change-Id: I7c6bfc5873d97ad7f51a540dd9c18b9359dde59f
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbxsettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbxsettings.cpp b/src/plugins/platforms/xcb/qxcbxsettings.cpp index 899dc0158a..401eb8043c 100644 --- a/src/plugins/platforms/xcb/qxcbxsettings.cpp +++ b/src/plugins/platforms/xcb/qxcbxsettings.cpp @@ -158,8 +158,8 @@ public: #define ADJUST_BO(b, t, x) \ ((b == LSBFirst) ? \ - qFromLittleEndian<t>((const uchar *)(x)) : \ - qFromBigEndian<t>((const uchar *)(x))) + qFromLittleEndian<t>(x) : \ + qFromBigEndian<t>(x)) #define VALIDATE_LENGTH(x) \ if ((size_t)xSettings.length() < (offset + local_offset + 12 + x)) { \ qWarning("Length %d runs past end of data", x); \ |