replaced '__int64' by 'qint64'
Merge remote-tracking branch 'origin/master'
fixed issue with 'std::max'... on Windows this time ;)