diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-07 01:00:08 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-07 01:00:08 +0100 |
commit | c497f79ad460afeb76eb1ade0de86d46bbb11a91 (patch) | |
tree | 10ebe88ea0c3566c2bd33968bbd4401122c9b689 /src/corelib/global | |
parent | 8cf812231405e011b422a1505d9a219618fe5cee (diff) | |
parent | ecdccce8e468784e050b65052da193bb40e2d9b9 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ieb57137ee2b7d0c505e3531d5aa1bcb66978847e
Diffstat (limited to 'src/corelib/global')
-rw-r--r-- | src/corelib/global/qendian.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h index f2e5833468..615f523888 100644 --- a/src/corelib/global/qendian.h +++ b/src/corelib/global/qendian.h @@ -204,9 +204,9 @@ template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source) template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source) { return source; } template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source) -{ return qbswap<T>(source); } +{ return qbswap(source); } template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source) -{ return qbswap<T>(source); } +{ return qbswap(source); } template <typename T> inline void qToBigEndian(T src, void *dest) { qToUnaligned<T>(src, dest); } template <typename T> inline void qToLittleEndian(T src, void *dest) |