Commit 6c568900 authored by Andrew Branson's avatar Andrew Branson

Merge branch 'master' into 'master'

[Qt] QFlag won't take a ulong on an LP64 environment. Contributes JB#36790

QFlag has several constructors, and they all just convert to an int anyway.

See merge request !6
parents 767ef110 4b6ced07
......@@ -55,7 +55,7 @@ void QContactStatusFlags::setFlags(Flags flags)
QContactStatusFlags::Flags QContactStatusFlags::flags() const
{
return Flags(static_cast<ulong>(flagsValue()));
return Flags(static_cast<uint>(flagsValue()));
}
void QContactStatusFlags::setFlagsValue(quint64 value)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment