diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 82257259a84..a9daedc70f3 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -374,7 +374,6 @@ static void qt_message(QtMsgType msgType, const QMessageLogContext &context, con qt_message_fatal(msgType, context, buf); } -#undef qDebug /*! Logs a debug message specified with format \a msg. Additional parameters, specified by \a msg, may be used. @@ -389,8 +388,6 @@ void QMessageLogger::debug(const char *msg, ...) const va_end(ap); } - -#undef qInfo /*! Logs an informational message specified with format \a msg. Additional parameters, specified by \a msg, may be used. @@ -619,7 +616,6 @@ QDebug QMessageLogger::info(QMessageLogger::CategoryFunction catFunc) const #endif -#undef qWarning /*! Logs a warning message specified with format \a msg. Additional parameters, specified by \a msg, may be used. @@ -725,8 +721,6 @@ QDebug QMessageLogger::warning(QMessageLogger::CategoryFunction catFunc) const #endif -#undef qCritical - /*! Logs a critical message specified with format \a msg. Additional parameters, specified by \a msg, may be used. @@ -833,8 +827,6 @@ QDebug QMessageLogger::critical(QMessageLogger::CategoryFunction catFunc) const #endif -#undef qFatal - /*! Logs a fatal message specified with format \a msg for the context \a cat. Additional parameters, specified by \a msg, may be used. diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp index ad967398fb5..d87874261ca 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -2,13 +2,6 @@ // Copyright (C) 2016 Intel Corporation. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifdef QT_NO_DEBUG -#undef QT_NO_DEBUG -#endif -#ifdef qDebug -#undef qDebug -#endif - #include "qdebug.h" #include "private/qdebug_p.h" #include "qmetaobject.h"