From 8ec2c0a70e387689d555876875a75391b9cf4e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 14 Feb 2013 09:43:22 +0100 Subject: [PATCH] Revert "Provide better error if min (or max) is defined in QDateTime" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Thorbjørn Lund Martsum Reviewed-by: Frederik Gladhorn --- src/corelib/tools/qdatetime.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index d1d7f5792e6..d1cc10c8779 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::min(); } static inline qint64 minJd() { return Q_INT64_C(-784350574879); } static inline qint64 maxJd() { return Q_INT64_C( 784354017364); }