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

List:       kde-commits
Subject:    [kdelibs4support] src/kdecore: Fix build with Qt 5.5
From:       Dan_Vrátil <dvratil () redhat ! com>
Date:       2015-02-27 18:31:51
Message-ID: E1YRPhX-0000qc-DC () scm ! kde ! org
[Download RAW message or body]

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/bbae94f31548082c0e8c8952e4883da3b22fe3a0

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()) {
[prev in list] [next in list] [prev in thread] [next in thread]