Merge remote-tracking branch 'origin/4.8'

Change-Id: I0ff6f659b7ccd4ff5a79e422a1d54488508fe05f

7 files changed, 4 insertions, 10 deletions

diff --git a/src/tools/clangbackend/clangbackendmain.cpp b/src/tools/clangbackend/clangbackendmain.cpp
index 338fec7982..d165ebb6dd 100644
--- a/src/tools/clangbackend/clangbackendmain.cpp
+++ b/src/tools/clangbackend/clangbackendmain.cpp
@@ -69,8 +69,6 @@ int main(int argc, char *argv[])
 #ifdef Q_OS_WIN
     qInstallMessageHandler(messageOutput);
 #endif
-    QLoggingCategory::setFilterRules(QStringLiteral("qtc.*.debug=false"));
-
     QCoreApplication::setOrganizationName(QStringLiteral("QtProject"));
     QCoreApplication::setOrganizationDomain(QStringLiteral("qt-project.org"));
     QCoreApplication::setApplicationName(QStringLiteral("ClangBackend"));
diff --git a/src/tools/clangbackend/source/clangcodemodelserver.cpp b/src/tools/clangbackend/source/clangcodemodelserver.cpp
index 5f63e21f1b..66caaf2b49 100644
--- a/src/tools/clangbackend/source/clangcodemodelserver.cpp
+++ b/src/tools/clangbackend/source/clangcodemodelserver.cpp
@@ -44,7 +44,7 @@
 #include <QDebug>
 #include <QLoggingCategory>
 
-Q_LOGGING_CATEGORY(serverLog, "qtc.clangbackend.server");
+Q_LOGGING_CATEGORY(serverLog, "qtc.clangbackend.server", QtWarningMsg);
 
 static bool useSupportiveTranslationUnit()
 {
diff --git a/src/tools/clangbackend/source/clangiasyncjob.cpp b/src/tools/clangbackend/source/clangiasyncjob.cpp
index c325c494c9..2ce218e99e 100644
--- a/src/tools/clangbackend/source/clangiasyncjob.cpp
+++ b/src/tools/clangbackend/source/clangiasyncjob.cpp
@@ -25,7 +25,7 @@
 
 #include "clangiasyncjob.h"
 
-Q_LOGGING_CATEGORY(jobsLog, "qtc.clangbackend.jobs");
+Q_LOGGING_CATEGORY(jobsLog, "qtc.clangbackend.jobs", QtWarningMsg);
 
 namespace ClangBackEnd {
 
diff --git a/src/tools/clangbackend/source/clangtranslationunits.cpp b/src/tools/clangbackend/source/clangtranslationunits.cpp
index f47513b6dc..f649775d16 100644
--- a/src/tools/clangbackend/source/clangtranslationunits.cpp
+++ b/src/tools/clangbackend/source/clangtranslationunits.cpp
@@ -35,7 +35,7 @@
 #include <QLoggingCategory>
 #include <QUuid>
 
-Q_LOGGING_CATEGORY(tuLog, "qtc.clangbackend.translationunits");
+Q_LOGGING_CATEGORY(tuLog, "qtc.clangbackend.translationunits", QtWarningMsg);
 
 namespace ClangBackEnd {
 
diff --git a/src/tools/clangbackend/source/clangtranslationunitupdater.cpp b/src/tools/clangbackend/source/clangtranslationunitupdater.cpp
index c74e626ffb..a45a898738 100644
--- a/src/tools/clangbackend/source/clangtranslationunitupdater.cpp
+++ b/src/tools/clangbackend/source/clangtranslationunitupdater.cpp
@@ -32,7 +32,7 @@
 
 #include <QLoggingCategory>
 
-static Q_LOGGING_CATEGORY(verboseLibLog, "qtc.clangbackend.verboselib");
+static Q_LOGGING_CATEGORY(verboseLibLog, "qtc.clangbackend.verboselib", QtWarningMsg);
 
 static bool isVerboseModeEnabled()
 {
diff --git a/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp b/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp
index 81ff17520c..db4dc76aaa 100644
--- a/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp
+++ b/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp
@@ -184,8 +184,6 @@ struct Data // because we have a cycle dependency
 int main(int argc, char *argv[])
 {
     try {
-        //QLoggingCategory::setFilterRules(QStringLiteral("*.debug=false"));
-
         QCoreApplication::setOrganizationName(QStringLiteral("QtProject"));
         QCoreApplication::setOrganizationDomain(QStringLiteral("qt-project.org"));
         QCoreApplication::setApplicationName(QStringLiteral("ClangPchManagerBackend"));
diff --git a/src/tools/clangrefactoringbackend/clangrefactoringbackendmain.cpp b/src/tools/clangrefactoringbackend/clangrefactoringbackendmain.cpp
index 9cb45e0e35..07e594b721 100644
--- a/src/tools/clangrefactoringbackend/clangrefactoringbackendmain.cpp
+++ b/src/tools/clangrefactoringbackend/clangrefactoringbackendmain.cpp
@@ -100,8 +100,6 @@ struct Data // because we have a cycle dependency
 int main(int argc, char *argv[])
 {
     try {
-        //QLoggingCategory::setFilterRules(QStringLiteral("*.debug=false"));
-
         QCoreApplication::setOrganizationName(QStringLiteral("QtProject"));
         QCoreApplication::setOrganizationDomain(QStringLiteral("qt-project.org"));
         QCoreApplication::setApplicationName(QStringLiteral("ClangRefactoringBackend"));