feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmakeProjectManager: Add more detail do trace message

Browse Source 
Change-Id: Ide8917d826baaa7277dde744f3843d5ab7fe0afd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-04-22 11:27:46 +02:00
parent 162ea716e6
commit f781a72825
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -448,7 +448,7 @@ void QmakeBuildSystem::scheduleAsyncUpdateFile(QmakeProFile *file, QmakeProFile:
void QmakeBuildSystem::scheduleUpdateAllNowOrLater() void QmakeBuildSystem::scheduleUpdateAllNowOrLater()
{ {
qCDebug(qmakeBuildSystemLog) << __FUNCTION__ << m_firstParseNeeded; qCDebug(qmakeBuildSystemLog) << buildTypeName() << __FUNCTION__ << m_firstParseNeeded;
if (m_firstParseNeeded) if (m_firstParseNeeded)
scheduleUpdateAll(QmakeProFile::ParseNow); scheduleUpdateAll(QmakeProFile::ParseNow);
else else
@@ -489,13 +489,14 @@ void QmakeBuildSystem::scheduleUpdateAll(QmakeProFile::AsyncUpdateDelay delay)
void QmakeBuildSystem::startAsyncTimer(QmakeProFile::AsyncUpdateDelay delay) void QmakeBuildSystem::startAsyncTimer(QmakeProFile::AsyncUpdateDelay delay)
{ {
if (!buildConfiguration()->isActive()) { if (!buildConfiguration()->isActive()) {
qCDebug(qmakeBuildSystemLog) << __FUNCTION__ << "skipped, not active"; qCDebug(qmakeBuildSystemLog) << buildTypeName() << __FUNCTION__
<< "skipped, not active";
return; return;
} }
const int interval = qMin(parseDelay(), const int interval = qMin(parseDelay(),
delay == QmakeProFile::ParseLater ? UPDATE_INTERVAL : 0); delay == QmakeProFile::ParseLater ? UPDATE_INTERVAL : 0);
qCDebug(qmakeBuildSystemLog) << __FUNCTION__ << interval; qCDebug(qmakeBuildSystemLog) << buildTypeName() << __FUNCTION__ << interval;
requestParseWithCustomDelay(interval); requestParseWithCustomDelay(interval);
} }
@@ -542,7 +543,8 @@ void QmakeBuildSystem::decrementPendingEvaluateFutures()
m_guard.markAsSuccess(); // Qmake always returns (some) data, even when it failed:-) m_guard.markAsSuccess(); // Qmake always returns (some) data, even when it failed:-)
m_guard = {}; // This triggers emitParsingFinished by destroying the previous guard. 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; m_firstParseNeeded = false;
emitBuildSystemUpdated(); emitBuildSystemUpdated();
@@ -558,7 +560,7 @@ bool QmakeBuildSystem::wasEvaluateCanceled()
void QmakeBuildSystem::asyncUpdate() void QmakeBuildSystem::asyncUpdate()
{ {
setParseDelay(UPDATE_INTERVAL); setParseDelay(UPDATE_INTERVAL);
qCDebug(qmakeBuildSystemLog) << __FUNCTION__; qCDebug(qmakeBuildSystemLog) << buildTypeName() << __FUNCTION__;
if (m_invalidateQmakeVfsContents) { if (m_invalidateQmakeVfsContents) {
m_invalidateQmakeVfsContents = false; m_invalidateQmakeVfsContents = false;
@@ -672,6 +674,11 @@ FilePath QmakeBuildSystem::buildDir(const FilePath &proFilePath) const
return FilePath::fromString(QDir::cleanPath(QDir(buildDir).absoluteFilePath(relativeDir))); return FilePath::fromString(QDir::cleanPath(QDir(buildDir).absoluteFilePath(relativeDir)));
} }
QString QmakeBuildSystem::buildTypeName() const
{
return BuildConfiguration::buildTypeName(buildConfiguration()->buildType());
}
void QmakeBuildSystem::proFileParseError(const QString &errorMessage) void QmakeBuildSystem::proFileParseError(const QString &errorMessage)
{ {
Core::MessageManager::write(errorMessage); Core::MessageManager::write(errorMessage);

1
src/plugins/qmakeprojectmanager/qmakeproject.h
View File

@@ -178,6 +178,7 @@ public:
void scheduleUpdateAllLater() { scheduleUpdateAll(QmakeProFile::ParseLater); } void scheduleUpdateAllLater() { scheduleUpdateAll(QmakeProFile::ParseLater); }
void scheduleUpdateAllNowOrLater(); void scheduleUpdateAllNowOrLater();
Utils::FilePath buildDir(const Utils::FilePath &proFilePath) const; Utils::FilePath buildDir(const Utils::FilePath &proFilePath) const;
QString buildTypeName() const;
QmakeBuildConfiguration *qmakeBuildConfiguration() const; QmakeBuildConfiguration *qmakeBuildConfiguration() const;