Don't forget QT_LOGGING_RULES

2 files changed, 2 insertions, 12 deletions

diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp
index 401622816..67bbb7df3 100644
--- a/src/libsync/logger.cpp
+++ b/src/libsync/logger.cpp
@@ -152,15 +152,6 @@ void Logger::close()
     }
 }
 
-void Logger::mirallLog(const QString &message)
-{
-    Log log_;
-    log_.timeStamp = QDateTime::currentDateTimeUtc();
-    log_.message = message;
-
-    Logger::instance()->log(log_);
-}
-
 void Logger::setLogFile(const QString &name)
 {
     QMutexLocker locker(&_mutex);
@@ -248,8 +239,9 @@ void Logger::disableTemporaryFolderLogDir()
 
 void Logger::setLogRules(const QSet<QString> &rules)
 {
+    static const QString defaultRule = qEnvironmentVariable("QT_LOGGING_RULES").replace(QLatin1Char(';'), QLatin1Char('\n'));
     _logRules = rules;
-    QLoggingCategory::setFilterRules(rules.toList().join(QLatin1Char('\n')));
+    QLoggingCategory::setFilterRules(rules.toList().join(QLatin1Char('\n')) + QLatin1Char('\n') + defaultRule);
 }
 
 static bool compressLog(const QString &originalName, const QString &targetName)
diff --git a/src/libsync/logger.h b/src/libsync/logger.h
index 55340a720..f9d828e52 100644
--- a/src/libsync/logger.h
+++ b/src/libsync/logger.h
@@ -49,8 +49,6 @@ public:
     void doLog(const QString &log);
     void close();
 
-    static void mirallLog(const QString &message);
-
     const QList<Log> &logs() const { return _logs; }
 
     static Logger *instance();