[Development] 5.5.1 ChangeLog contains important information, please make sure it's in the announcement

Tomasz Siekierda sierdzio at gmail.com
Thu Sep 24 08:54:37 CEST 2015


On 23 September 2015 at 21:47, Thiago Macieira
<thiago.macieira at intel.com> wrote:
> On Wednesday 23 September 2015 08:42:55 Tomasz Siekierda wrote:
>> * Fixed a minor source-incompatibility between Qt 5.4 and 5.5.0
>> involving sets of functions overloaded on QTime and some integer or
>> QDate and some integer."
>>
>> Sorry, what? This could use some rephrasing
>
> Lack of parentheses in the language...
>
>         sets of functions overloaded on (QTime and some integer) or
>         (QDate and some integer)
>
> commit eda79a467ee7e45f3de63973b633e2a790b613eb
> Author: Marc Mutz <marc.mutz at kdab.com>
> Date:   Thu Jun 25 22:34:58 2015 +0200
>
>     QDate/QTime: fix SiC introduced by adding new non-explicit ctors
>
>     The new constructors were added in c94d41d9 to help
>     constexpr'ify QDate and QTime. Even though private,
>     they participate in overload resolution and break
>     function pairs overloaded on QDate and int or
>     QTime and int.
>
>     Mark them explicit.
>
>     [ChangeLog][QtCore][QDate/QTime] Fixed a minor source-incompatibility
>     between Qt 5.4 and 5.5.0 involving sets of functions overloaded on
>     QTime and some integer or QDate and some integer.
>
>     Change-Id: I65a09aaca2b083cda90255c24cc72ef51119d3b1
>     Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart at woboq.com>
>
> diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h
> index 78ec2b1..6651efd 100644
> --- a/src/corelib/tools/qdatetime.h
> +++ b/src/corelib/tools/qdatetime.h
> @@ -59,7 +59,7 @@ public:
>          StandaloneFormat
>      };
>  private:
> -    Q_DECL_CONSTEXPR QDate(qint64 julianDay) : jd(julianDay) {}
> +    explicit Q_DECL_CONSTEXPR QDate(qint64 julianDay) : jd(julianDay) {}
>  public:
>      Q_DECL_CONSTEXPR QDate() : jd(nullJd()) {}
>      QDate(int y, int m, int d);
> @@ -138,7 +138,7 @@ Q_DECLARE_TYPEINFO(QDate, Q_MOVABLE_TYPE);
>
>  class Q_CORE_EXPORT QTime
>  {
> -    Q_DECL_CONSTEXPR QTime(int ms) : mds(ms)
> +    explicit Q_DECL_CONSTEXPR QTime(int ms) : mds(ms)
>  #if defined(Q_OS_WINCE)
>          , startTick(NullTime)
>  #endif

Thank you :-)



More information about the Development mailing list