--nextPart11886519.CyzYkZMnH4
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="iso-8859-1"

On Friday, February 27, 2015 08:13:26 PM David Faure wrote:
> On Friday 27 February 2015 18:31:51 Dan Vr=E1til wrote:
> > Git commit bbae94f31548082c0e8c8952e4883da3b22fe3a0 by Dan Vr=E1til=
.
> > Committed on 27/02/2015 at 18:30.
> > Pushed by dvratil into branch 'master'.
> >=20
> > Fix build with Qt 5.5
> >=20
> > QTime ctor is not explicit, and since 5.5 it's constexpr, which pro=
bably
> > confuses compiler in which KDateTime ctor overload it should pick.
> >=20
> > BUG: 344193
> > FIXED-IN: 5.8.0
> >=20
> > M  +1    -1    src/kdecore/kdatetime.cpp
> >=20
> > http://commits.kde.org/kdelibs4support/bbae94f31548082c0e8c8952e488=
3da3b22
> > fe 3a0
> >=20
> > diff --git a/src/kdecore/kdatetime.cpp b/src/kdecore/kdatetime.cpp
> > index 8ea0101..74d1815 100644
> > --- a/src/kdecore/kdatetime.cpp
> > +++ b/src/kdecore/kdatetime.cpp
> > @@ -943,7 +943,7 @@ KDateTime KDateTime::toUtc() const
> >=20
> >          return *this;
> >     =20
> >      }
> >      if (d->dateOnly()) {
> >=20
> > -        return KDateTime(d->date(), UTC);
> > +        return KDateTime(d->date(), Spec(UTC));
> >=20
> >      }
> >      QDateTime udt =3D d->toUtc();
> >      if (!udt.isValid()) {
>=20
> Would it help to add another KDateTime overload then? To avoid this S=
IC?

I'm not sure if an overload would help: if I understand it correctly, i=
t's=20
because compiler is able to convert KDateTime::SpecType enum to both=20=

QTime(int) and KDateTime::Spec(KDateTime::SpecType), leading to ambigui=
ty=20
between KDateTime::KDateTime(const QDate &date, const QTime &time, Spec=
 &spec=20
=3D Spec(LocalZone))  and KDateTime::KDateTime(const QDate &date, const=
=20
KDateTime::Spec &spec).

I tried adding KDateTime::KDateTime(QDate, KDateTime::SpecType) overloa=
d, but=20
that only extends the ambiguity...

If you have another idea, I'd be happy to write a patch :)

Cheers,
Daniel




=2D-=20
Daniel Vr=E1til | dvratil@redhat.com | dvratil on #kde-devel, #kontact,=
 #akonadi
Software Engineer - KDE Desktop Team, Red Hat Inc.

GPG Key: 0xC59D614F6F4AE348
Fingerprint: 4EC1 86E3 C54E 0B39 5FDD B5FB C59D 614F 6F4A E348
--nextPart11886519.CyzYkZMnH4
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAABAgAGBQJU9DeyAAoJEMWdYU9vSuNIfZUH/R562tGbOMqPVoAxtTweeAPX
VpGTfTZp+HNgLzNNCsbS5khETtL1B6K2w109OFn4bYwel1YQUKNZvl6iiiemcKBC
fSVsfD1qYXyocSGVJCW1ZL+JgjmoInG83yaFOOUN+0PrPSbJ1yLpHsFdgaW4tuDK
0iGyKeVIwA4bidpfAwwlzVKac9AJfq+b+r6BGKe/+ifcvOLYXZRbvDBld5/wjn8e
IYwqZmsf3QBZyoNCpl4lgvBtQCwasm2RlJGRW3l3Vx4I/+OO49c+5Mha56OsTj2I
fjm16Q37UwEM14hIO7/q9sbC/HuYFFv1PLr4oMzErHN3L3u8w/UWuZ0Odtz9FtQ=
=KowY
-----END PGP SIGNATURE-----

--nextPart11886519.CyzYkZMnH4--