[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [kdelibs4support] src/kdecore: Fix build with Qt 5.5
From:       David Faure <faure () kde ! org>
Date:       2015-02-27 19:13:26
Message-ID: 10970329.D8rzS4QvxX () asterix
[Download RAW message or body]

On Friday 27 February 2015 18:31:51 Dan Vrátil wrote:
> Git commit bbae94f31548082c0e8c8952e4883da3b22fe3a0 by Dan Vrátil.
> Committed on 27/02/2015 at 18:30.
> Pushed by dvratil into branch 'master'.
> 
> Fix build with Qt 5.5
> 
> QTime ctor is not explicit, and since 5.5 it's constexpr, which probably
> confuses compiler in which KDateTime ctor overload it should pick.
> 
> BUG: 344193
> FIXED-IN: 5.8.0
> 
> M  +1    -1    src/kdecore/kdatetime.cpp
> 
> http://commits.kde.org/kdelibs4support/bbae94f31548082c0e8c8952e4883da3b22fe
> 3a0
> 
> 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
>          return *this;
>      }
>      if (d->dateOnly()) {
> -        return KDateTime(d->date(), UTC);
> +        return KDateTime(d->date(), Spec(UTC));
>      }
>      QDateTime udt = d->toUtc();
>      if (!udt.isValid()) {

Would it help to add another KDateTime overload then? To avoid this SIC?

-- 
David Faure, faure@kde.org, http://www.davidfaure.fr
Working on KDE Frameworks 5

[prev in list] [next in list] [prev in thread] [next in thread]