|
@@ -53,14 +53,20 @@ Logger *Logger::instance()
|
|
|
Logger::Logger( QObject* parent) : QObject(parent),
|
|
Logger::Logger( QObject* parent) : QObject(parent),
|
|
|
_showTime(true), _doLogging(false), _doFileFlush(false), _logExpire(0)
|
|
_showTime(true), _doLogging(false), _doFileFlush(false), _logExpire(0)
|
|
|
{
|
|
{
|
|
|
|
|
+#ifndef NO_MSG_HANDLER
|
|
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
|
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
|
|
|
qSetMessagePattern("%{time MM-dd hh:mm:ss:zzz} %{threadid} %{function}: %{message}");
|
|
qSetMessagePattern("%{time MM-dd hh:mm:ss:zzz} %{threadid} %{function}: %{message}");
|
|
|
#endif
|
|
#endif
|
|
|
qInstallMessageHandler(mirallLogCatcher);
|
|
qInstallMessageHandler(mirallLogCatcher);
|
|
|
|
|
+#else
|
|
|
|
|
+ Q_UNUSED(mirallLogCatcher)
|
|
|
|
|
+#endif
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Logger::~Logger() {
|
|
Logger::~Logger() {
|
|
|
|
|
+#ifndef NO_MSG_HANDLER
|
|
|
qInstallMessageHandler(0);
|
|
qInstallMessageHandler(0);
|
|
|
|
|
+#endif
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|