Use categorized logging for the build graph

Use Qt's categorized logging feature for debug and trace messages in
the build graph part of the library.

This greatly simplifies the code as we do not have to check explicitly
for the log level, and we do not have to forward a Logger object.

Change-Id: If44b9ef74ebb2c4670c25e513ec58e1419588196
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 4 insertions, 1 deletions

diff --git a/src/lib/corelib/api/jobs.cpp b/src/lib/corelib/api/jobs.cpp
index 76c1484cf..85c0d2399 100644
--- a/src/lib/corelib/api/jobs.cpp
+++ b/src/lib/corelib/api/jobs.cpp
@@ -44,6 +44,7 @@
 #include <tools/launcherinterface.h>
 #include <tools/qbsassert.h>
 
+#include <QtCore/qloggingcategory.h>
 #include <QtCore/qtimer.h>
 
 namespace qbs {
@@ -217,6 +218,8 @@ void AbstractJob::handleFinished()
 SetupProjectJob::SetupProjectJob(const Logger &logger, QObject *parent)
     : AbstractJob(new InternalJobThreadWrapper(new InternalSetupProjectJob(logger)), parent)
 {
+    if (logger.logSink()->logLevel() == LoggerDebug || logger.logSink()->logLevel() == LoggerTrace)
+        QLoggingCategory::setFilterRules(QStringLiteral("qbs.*.debug=true"));
 }
 
 /*!
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 88f2c689e..7cf3d3ba1 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -516,7 +516,7 @@ void ProjectPrivate::addFiles(const ProductData &product, const GroupData &group
         }
         if (resolvedProduct->enabled) {
             for (const auto &pair : qAsConst(addedSourceArtifacts))
-                createArtifact(resolvedProduct, pair.first, logger);
+                createArtifact(resolvedProduct, pair.first);
         }
     }
     doSanityChecks(internalProject, logger);