diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 12:25:24 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-16 12:25:24 +0000 |
| commit | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (patch) | |
| tree | 84bb5a5f766ce04ff4d243a38ce5e408db5e7782 /src/plugins/platforms/xcb/qxcbxsettings.cpp | |
| parent | 874eb8b44b3ca9cfab63372af10886d16dfc327d (diff) | |
| parent | c4e472ea1037afde7b99d9132a49eb616cad240e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7.0' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbxsettings.cpp')
| -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); \ |