diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2013-02-14 09:43:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-16 08:07:30 +0100 |
| commit | 8ec2c0a70e387689d555876875a75391b9cf4e44 (patch) | |
| tree | ad5c963c57268641a5889c2a5854501f699fbacb /src | |
| parent | f6265182add2b6163069bbcee7f8bfffc7013158 (diff) | |
Revert "Provide better error if min (or max) is defined in QDateTime"
This reverts commit d0804ff2dd3d289a0f0c58aa30c4334e66ea9be0.
The commit breaks JSC which is used by QtWebKit, QtScript and
indirectly by QtQuick1, which blocks integration stable->dev.
JSC should be fixed upstream, but until then we need to revert
the change.
Change-Id: I3f7b8be08b68181e08422d2cb00d7cd70a7fc07f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qdatetime.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index d1d7f5792e..d1cc10c877 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -118,9 +118,6 @@ QT_DEPRECATED inline bool setYMD(int y, int m, int d) inline qint64 toJulianDay() const { return jd; } private: -#if defined(min) || defined(max) -#error min or max defined, cannot continue. If this is caused by an #include of windows.h, NOMINMAX can be defined. -#endif static inline qint64 nullJd() { return std::numeric_limits<qint64>::min(); } static inline qint64 minJd() { return Q_INT64_C(-784350574879); } static inline qint64 maxJd() { return Q_INT64_C( 784354017364); } |