From e3c2f37956283585ba349893b1d02a0eb3738c12 Mon Sep 17 00:00:00 2001 From: Srivats P Date: Thu, 15 Mar 2018 20:03:22 +0530 Subject: [PATCH] Support Qt5.2 since Travis uses Trusty/Qt5.2 --- .travis.yml | 3 ++- common/uint128.h | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e42a6d0..c5feb26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,8 @@ matrix: before_install: - "if [ $TRAVIS_OS_NAME = 'osx' ]; then \ brew update && \ - brew install qt && \ + brew install qt5 && \ + brew link qt5 --force && \ brew install protobuf && \ ls -lR /usr/local/include; \ fi" diff --git a/common/uint128.h b/common/uint128.h index 73037a6..159e973 100644 --- a/common/uint128.h +++ b/common/uint128.h @@ -157,7 +157,11 @@ inline UInt128 UInt128::operator|(const UInt128 &other) const return UInt128(hi_ | other.hi_, lo_ | other.lo_); } +#if QT_VERSION >= 0x050700 template <> inline UInt128 qFromBigEndian(const void *src) +#else +template <> inline UInt128 qFromBigEndian(const uchar *src) +#endif { quint64 hi, lo;