diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-25 22:34:58 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-06-28 21:12:43 +0000 |
| commit | eda79a467ee7e45f3de63973b633e2a790b613eb (patch) | |
| tree | bd828e6a0fa5b1d67f4bdc4e51361a3bf1d50a9e | |
| parent | fdef1dc7fe0ff721b393fa9077117869a5d6ac01 (diff) | |
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@woboq.com>
| -rw-r--r-- | src/corelib/tools/qdatetime.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index 78ec2b156a..6651efdc13 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 |