Support Qt5.2 since Travis uses Trusty/Qt5.2
This commit is contained in:
parent
9f4b70c5a8
commit
e3c2f37956
@ -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"
|
||||
|
@ -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<UInt128>(const void *src)
|
||||
#else
|
||||
template <> inline UInt128 qFromBigEndian<UInt128>(const uchar *src)
|
||||
#endif
|
||||
{
|
||||
quint64 hi, lo;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user