diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-07 13:38:45 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-09 13:14:11 +0100 |
| commit | 979e0512ac7ff55d99785b20f1297d4bb541dff3 (patch) | |
| tree | 72e88b72bd3e3c5b1187e2b976cf5f3a100f2f88 | |
| parent | ef6279fd516befc09d4a6b3664a727a013b82c19 (diff) | |
Get rid of QT_NO_QWARNING_MACRO
Just use QT_NO_QDEBUG_MACRO, like we do already for qInfo.
Change-Id: I4b2ef68427fbe6f253fe02a3ab161fa25186e834
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -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 |