diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 01:00:42 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 01:00:43 +0100 |
commit | e608b5d55519e3a09ac668710b85e8fb2635bb08 (patch) | |
tree | 6692ddc9370a70945f6ffc8e15de12f6c3462e2e /src/corelib/io | |
parent | 9649c41ed950eaa7dd9d3cb6d37a05d3a9ed8a3e (diff) | |
parent | 097bf6fdd234ca7e5707610edfd3c804b3ba2a52 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I2bf3b4ceb79364330eae4cbf3cdee9a82d1be46d
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qloggingcategory.h | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/src/corelib/io/qloggingcategory.h b/src/corelib/io/qloggingcategory.h index 489e250087..91e3144300 100644 --- a/src/corelib/io/qloggingcategory.h +++ b/src/corelib/io/qloggingcategory.h @@ -120,15 +120,30 @@ private: return category; \ } -#define qCDebug(category, ...) \ +#if !defined(QT_NO_DEBUG_OUTPUT) +# define qCDebug(category, ...) \ for (bool qt_category_enabled = category().isDebugEnabled(); qt_category_enabled; qt_category_enabled = false) \ QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC, category().categoryName()).debug(__VA_ARGS__) -#define qCInfo(category, ...) \ +#else +# define qCDebug(category, ...) QT_NO_QDEBUG_MACRO() +#endif + +#if !defined(QT_NO_INFO_OUTPUT) +# define qCInfo(category, ...) \ for (bool qt_category_enabled = category().isInfoEnabled(); qt_category_enabled; qt_category_enabled = false) \ QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC, category().categoryName()).info(__VA_ARGS__) -#define qCWarning(category, ...) \ +#else +# define qCInfo(category, ...) QT_NO_QDEBUG_MACRO() +#endif + +#if !defined(QT_NO_WARNING_OUTPUT) +# define qCWarning(category, ...) \ for (bool qt_category_enabled = category().isWarningEnabled(); qt_category_enabled; qt_category_enabled = false) \ QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC, category().categoryName()).warning(__VA_ARGS__) +#else +# define qCWarning(category, ...) QT_NO_QDEBUG_MACRO() +#endif + #define qCCritical(category, ...) \ for (bool qt_category_enabled = category().isCriticalEnabled(); qt_category_enabled; qt_category_enabled = false) \ QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC, category().categoryName()).critical(__VA_ARGS__) @@ -144,26 +159,28 @@ private: } // check for enabled category inside QMessageLogger. -#define qCDebug qDebug -#define qCInfo qInfo -#define qCWarning qWarning -#define qCCritical qCritical - -#endif // Q_COMPILER_VARIADIC_MACROS || defined(Q_MOC_RUN) - -#if defined(QT_NO_DEBUG_OUTPUT) -# undef qCDebug +#if !defined(QT_NO_DEBUG_OUTPUT) +# define qCDebug qDebug +#else # define qCDebug(category) QT_NO_QDEBUG_MACRO() #endif -#if defined(QT_NO_INFO_OUTPUT) -# undef qCInfo + +#if !defined(QT_NO_INFO_OUTPUT) +# define qCInfo qInfo +#else # define qCInfo(category) QT_NO_QDEBUG_MACRO() #endif -#if defined(QT_NO_WARNING_OUTPUT) -# undef qCWarning + +#if !defined(QT_NO_WARNING_OUTPUT) +# define qCWarning qWarning +#else # define qCWarning(category) QT_NO_QDEBUG_MACRO() #endif +#define qCCritical qCritical + +#endif // Q_COMPILER_VARIADIC_MACROS || defined(Q_MOC_RUN) + QT_END_NAMESPACE #endif // QLOGGINGCATEGORY_H |