diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-09-24 09:55:02 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2014-10-01 16:06:27 +0200 |
| commit | d78fb442d750b33afe2e41f31588ec94cf4023ad (patch) | |
| tree | 15bed899511153580fae3a4cc24ff7dc16260e85 /src/corelib/global/qlogging.h | |
| parent | 377ef06aefd66c67c8d65d9e3cb3137b506c6014 (diff) | |
Logging: Disable tracking of debug source info for release builds
Tracking the file, line, function means the information has to be stored
in the binaries, enlarging the size. It also might be a surprise to some
commercial customers that their internal file & function names are
'leaked'. Therefore we enable it for debug builds only.
[ChangeLog][QtCore][Logging] File, line, function information are not
recorded anymore for logging statements in release builds. Set
QT_MESSAGELOGCONTEXT explicitly to enable recording in all configurations.
Change-Id: I454bdb42bcf5b5a8de6507f29f2a61109dca9b91
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/corelib/global/qlogging.h')
| -rw-r--r-- | src/corelib/global/qlogging.h | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h index b952f999cb..f9bbf7fcce 100644 --- a/src/corelib/global/qlogging.h +++ b/src/corelib/global/qlogging.h @@ -124,13 +124,28 @@ private: QMessageLogContext context; }; -/* - qDebug, qWarning, qCritical, qFatal are redefined to automatically include context information - */ -#define qDebug QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).debug -#define qWarning QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).warning -#define qCritical QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).critical -#define qFatal QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).fatal +#if !defined(QT_MESSAGELOGCONTEXT) && !defined(QT_NO_MESSAGELOGCONTEXT) +# if defined(QT_NO_DEBUG) +# define QT_NO_MESSAGELOGCONTEXT +# else +# define QT_MESSAGELOGCONTEXT +# endif +#endif + +#ifdef QT_MESSAGELOGCONTEXT + #define QT_MESSAGELOG_FILE __FILE__ + #define QT_MESSAGELOG_LINE __LINE__ + #define QT_MESSAGELOG_FUNC Q_FUNC_INFO +#else + #define QT_MESSAGELOG_FILE 0 + #define QT_MESSAGELOG_LINE 0 + #define QT_MESSAGELOG_FUNC 0 +#endif + +#define qDebug QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC).debug +#define qWarning QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC).warning +#define qCritical QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC).critical +#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 |