1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDate/QTime: fix SiC introduced by adding new non-explicit ctors

Browse Source 
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>
This commit is contained in:
Marc Mutz 2015-06-25 22:34:58 +02:00
parent fdef1dc7fe
commit eda79a467e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qdatetime.h
View File

@ -59,7 +59,7 @@ public:
StandaloneFormat StandaloneFormat
}; };
private: private:
Q_DECL_CONSTEXPR QDate(qint64 julianDay) : jd(julianDay) {} explicit Q_DECL_CONSTEXPR QDate(qint64 julianDay) : jd(julianDay) {}
public: public:
Q_DECL_CONSTEXPR QDate() : jd(nullJd()) {} Q_DECL_CONSTEXPR QDate() : jd(nullJd()) {}
QDate(int y, int m, int d); QDate(int y, int m, int d);
@ -138,7 +138,7 @@ Q_DECLARE_TYPEINFO(QDate, Q_MOVABLE_TYPE);
class Q_CORE_EXPORT QTime 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) #if defined(Q_OS_WINCE)
, startTick(NullTime) , startTick(NullTime)
#endif #endif