From f781a728256b9b25c0df8cc46d386f2ebca27ba7 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 22 Apr 2020 11:27:46 +0200
Subject: [PATCH] QmakeProjectManager: Add more detail do trace message

Change-Id: Ide8917d826baaa7277dde744f3843d5ab7fe0afd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../qmakeprojectmanager/qmakeproject.cpp        | 17 ++++++++++++-----
 src/plugins/qmakeprojectmanager/qmakeproject.h  |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 1925547253c..d424e7da95e 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -448,7 +448,7 @@ void QmakeBuildSystem::scheduleAsyncUpdateFile(QmakeProFile *file, QmakeProFile:
 
 void QmakeBuildSystem::scheduleUpdateAllNowOrLater()
 {
-    qCDebug(qmakeBuildSystemLog) <<  __FUNCTION__ << m_firstParseNeeded;
+    qCDebug(qmakeBuildSystemLog) <<  buildTypeName() << __FUNCTION__ << m_firstParseNeeded;
     if (m_firstParseNeeded)
         scheduleUpdateAll(QmakeProFile::ParseNow);
     else
@@ -489,13 +489,14 @@ void QmakeBuildSystem::scheduleUpdateAll(QmakeProFile::AsyncUpdateDelay delay)
 void QmakeBuildSystem::startAsyncTimer(QmakeProFile::AsyncUpdateDelay delay)
 {
     if (!buildConfiguration()->isActive()) {
-        qCDebug(qmakeBuildSystemLog) <<  __FUNCTION__ << "skipped, not active";
+        qCDebug(qmakeBuildSystemLog) <<  buildTypeName() << __FUNCTION__
+                                      << "skipped, not active";
         return;
     }
 
     const int interval = qMin(parseDelay(),
                               delay == QmakeProFile::ParseLater ? UPDATE_INTERVAL : 0);
-    qCDebug(qmakeBuildSystemLog) <<  __FUNCTION__ << interval;
+    qCDebug(qmakeBuildSystemLog) <<  buildTypeName() << __FUNCTION__ << interval;
     requestParseWithCustomDelay(interval);
 }
 
@@ -542,7 +543,8 @@ void QmakeBuildSystem::decrementPendingEvaluateFutures()
             m_guard.markAsSuccess(); // Qmake always returns (some) data, even when it failed:-)
             m_guard = {}; // This triggers emitParsingFinished by destroying the previous guard.
 
-            qCDebug(qmakeBuildSystemLog) <<  __FUNCTION__ << "first parse succeeded";
+            qCDebug(qmakeBuildSystemLog) <<  buildTypeName() << __FUNCTION__
+                                          << "first parse succeeded";
             m_firstParseNeeded = false;
 
             emitBuildSystemUpdated();
@@ -558,7 +560,7 @@ bool QmakeBuildSystem::wasEvaluateCanceled()
 void QmakeBuildSystem::asyncUpdate()
 {
     setParseDelay(UPDATE_INTERVAL);
-    qCDebug(qmakeBuildSystemLog) <<  __FUNCTION__;
+    qCDebug(qmakeBuildSystemLog) <<  buildTypeName() << __FUNCTION__;
 
     if (m_invalidateQmakeVfsContents) {
         m_invalidateQmakeVfsContents = false;
@@ -672,6 +674,11 @@ FilePath QmakeBuildSystem::buildDir(const FilePath &proFilePath) const
     return FilePath::fromString(QDir::cleanPath(QDir(buildDir).absoluteFilePath(relativeDir)));
 }
 
+QString QmakeBuildSystem::buildTypeName() const
+{
+    return BuildConfiguration::buildTypeName(buildConfiguration()->buildType());
+}
+
 void QmakeBuildSystem::proFileParseError(const QString &errorMessage)
 {
     Core::MessageManager::write(errorMessage);
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h
index 8496c9720b2..5975c99fa6f 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.h
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.h
@@ -178,6 +178,7 @@ public:
     void scheduleUpdateAllLater() { scheduleUpdateAll(QmakeProFile::ParseLater); }
     void scheduleUpdateAllNowOrLater();
     Utils::FilePath buildDir(const Utils::FilePath &proFilePath) const;
+    QString buildTypeName() const;
 
     QmakeBuildConfiguration *qmakeBuildConfiguration() const;