diff options
| -rw-r--r-- | dist/changes-5.0.0 | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index 5987c95108..3749f18d64 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -60,6 +60,8 @@ information about a particular change. in Qt4, so these methods return a bool now. If your code used the undocumented QBool, simply replace it with bool. +- The old macros TRUE and FALSE have been removed, use true and false instead. + - qIsDetached<> has been removed without replacement. - The return type of QFlags<Enum>::operator int() now matches the Enum's underlying diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 60b90dc70f..6c2900e215 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -436,17 +436,6 @@ typedef QIntegerForSizeof<void*>::Unsigned quintptr; typedef QIntegerForSizeof<void*>::Signed qptrdiff; typedef qptrdiff qintptr; -/* - Constant bool values -*/ - -#ifndef QT_LINUXBASE /* the LSB defines TRUE and FALSE for us */ -# ifndef TRUE -# define TRUE true -# define FALSE false -# endif -#endif - /* moc compats (signals/slots) */ #ifndef QT_MOC_COMPAT # define QT_MOC_COMPAT |