diff options
| -rw-r--r-- | src/corelib/global/qlogging.h | 3 | ||||
| -rw-r--r-- | src/corelib/io/qloggingcategory.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h index 829cd7c885..0cbb678e17 100644 --- a/src/corelib/global/qlogging.h +++ b/src/corelib/global/qlogging.h @@ -155,7 +155,6 @@ private: #define qFatal QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC).fatal #define QT_NO_QDEBUG_MACRO while (false) QMessageLogger().noDebug -#define QT_NO_QWARNING_MACRO while (false) QMessageLogger().noDebug #if defined(QT_NO_DEBUG_OUTPUT) # undef qDebug @@ -167,7 +166,7 @@ private: #endif #if defined(QT_NO_WARNING_OUTPUT) # undef qWarning -# define qWarning QT_NO_QWARNING_MACRO +# define qWarning QT_NO_QDEBUG_MACRO #endif Q_CORE_EXPORT void qt_message_output(QtMsgType, const QMessageLogContext &context, diff --git a/src/corelib/io/qloggingcategory.h b/src/corelib/io/qloggingcategory.h index d86f663913..5504ebab3b 100644 --- a/src/corelib/io/qloggingcategory.h +++ b/src/corelib/io/qloggingcategory.h @@ -155,7 +155,7 @@ private: #endif #if defined(QT_NO_WARNING_OUTPUT) # undef qCWarning -# define qCWarning(category) QT_NO_QWARNING_MACRO() +# define qCWarning(category) QT_NO_QDEBUG_MACRO() #endif QT_END_NAMESPACE |