matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support Qt5.2 since Travis uses Trusty/Qt5.2

Browse Source
This commit is contained in:
Srivats P 2018-03-15 20:03:22 +05:30
parent 9f4b70c5a8
commit e3c2f37956
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -17,7 +17,8 @@ matrix:
before_install: before_install:
- "if [ $TRAVIS_OS_NAME = 'osx' ]; then \ - "if [ $TRAVIS_OS_NAME = 'osx' ]; then \
brew update && \ brew update && \
brew install qt && \ brew install qt5 && \
brew link qt5 --force && \
brew install protobuf && \ brew install protobuf && \
ls -lR /usr/local/include; \ ls -lR /usr/local/include; \
fi" fi"

4
common/uint128.h
View File

@ -157,7 +157,11 @@ inline UInt128 UInt128::operator|(const UInt128 &other) const
return UInt128(hi_ | other.hi_, lo_ | other.lo_); return UInt128(hi_ | other.hi_, lo_ | other.lo_);
} }
#if QT_VERSION >= 0x050700
template <> inline UInt128 qFromBigEndian<UInt128>(const void *src) template <> inline UInt128 qFromBigEndian<UInt128>(const void *src)
#else
template <> inline UInt128 qFromBigEndian<UInt128>(const uchar *src)
#endif
{ {
quint64 hi, lo; quint64 hi, lo;