diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
| commit | 3cb56800d581dabd18e354a24f018c55bd91f748 (patch) | |
| tree | 9b8e95cf62e22026463a0f87a3625b279f457aad /src/plugins/platforms | |
| parent | aed7540d45096791d1a824f500694a15426fd94b (diff) | |
| parent | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
Change-Id: If899cda251b4dc8b8a7c6764520e88ab719737cd
Diffstat (limited to 'src/plugins/platforms')
| -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); \ |