diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index d10e4b2e37e..1796fe66760 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -351,7 +351,6 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters) \table \header \li Version \li Disabled APIs \row \li 6.0.0 \li \l{foreach-keyword}{foreach} (see \l{QT_NO_FOREACH}) - \row \li 6.0.0 \li QString constructors from \c{const char *} (see \l{QT_NO_CAST_FROM_ASCII}) \row \li 6.0.0 \li QString conversions towards \c{const char *} / QByteArray (see \l{QT_NO_CAST_TO_ASCII}) \row \li 6.0.0 \li QByteArray implicit conversions towards \c{const char *} (see \l{QT_NO_CAST_FROM_BYTEARRAY}) \row \li 6.0.0 \li QUrl implicit conversions from QString (see \l{QT_NO_URL_CAST_FROM_STRING}) diff --git a/src/corelib/global/qtconfigmacros.h b/src/corelib/global/qtconfigmacros.h index 141932af63e..48a1c31def6 100644 --- a/src/corelib/global/qtconfigmacros.h +++ b/src/corelib/global/qtconfigmacros.h @@ -185,9 +185,6 @@ namespace QT_NAMESPACE {} # ifndef QT_NO_FOREACH # define QT_NO_FOREACH # endif -# ifndef QT_NO_CAST_FROM_ASCII -# define QT_NO_CAST_FROM_ASCII -#endif # ifndef QT_NO_CAST_TO_ASCII # define QT_NO_CAST_TO_ASCII # endif