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

Qmake: Add some debug output for file add/remove operations

Browse Source 
This will help collecting feedback from users affected by bugs.

Task-number: QTCREATORBUG-22508
Change-Id: Idfc22245587dd2d71b229b4ab6c7562fb7a5ecfc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Christian Kandeler
2020-03-11 14:01:35 +01:00
parent 9295bfe3e4
commit a102c11d00
4 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -217,6 +217,9 @@ bool QmakeBuildSystem::addFiles(Node *context, const QStringList &filePaths, QSt
actualFilePaths.removeOne(e);
if (notAdded)
*notAdded = alreadyPresentFiles;
qCDebug(qmakeNodesLog) << Q_FUNC_INFO << "file paths:" << filePaths
<< "already present:" << alreadyPresentFiles
<< "actual file paths:" << actualFilePaths;
return pri->addFiles(actualFilePaths, notAdded);
}

4
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -107,6 +107,8 @@ uint qHash(FileOrigin fo) { return ::qHash(int(fo)); }
namespace Internal {
Q_LOGGING_CATEGORY(qmakeNodesLog, "qtc.qmake.nodes", QtWarningMsg)
class QmakeEvalInput
{
public:
@@ -901,6 +903,8 @@ void QmakePriFile::changeFiles(const QString &mimeType,
if (!includeFile)
return;
qCDebug(qmakeNodesLog) << Q_FUNC_INFO << "mime type:" << mimeType << "file paths:"
<< filePaths << "change type:" << int(change) << "mode:" << int(mode);
if (change == AddToProFile) {
// Use the first variable for adding.
ProWriter::addFiles(includeFile, &lines, filePaths, varNameForAdding(mimeType),

2
src/plugins/qmakeprojectmanager/qmakeparsernodes.h
View File

@@ -35,6 +35,7 @@
#include <QFutureWatcher>
#include <QHash>
#include <QLoggingCategory>
#include <QMap>
#include <QPair>
#include <QStringList>
@@ -108,6 +109,7 @@ enum class Variable {
uint qHash(Variable key, uint seed = 0);
namespace Internal {
Q_DECLARE_LOGGING_CATEGORY(qmakeNodesLog)
class QmakeEvalInput;
class QmakeEvalResult;
class QmakePriFileEvalResult;

13
src/shared/proparser/prowriter.cpp
View File

@@ -30,9 +30,12 @@
#include <utils/algorithm.h>
#include <QDir>
#include <QLoggingCategory>
#include <QPair>
#include <QRegularExpression>
Q_LOGGING_CATEGORY(prowriterLog, "qtc.prowriter", QtWarningMsg)
using namespace QmakeProjectManager::Internal;
static uint getBlockLen(const ushort *&tokPtr)
@@ -309,6 +312,9 @@ void ProWriter::putVarValues(ProFile *profile, QStringList *lines, const QString
const QString &var, PutFlags flags, const QString &scope,
const QString &continuationIndent)
{
qCDebug(prowriterLog) << Q_FUNC_INFO << "lines:" << *lines << "values:" << values
<< "var:" << var << "flags:" << int(flags) << "scope:" << scope
<< "indent:" << continuationIndent;
const QString indent = scope.isEmpty() ? QString() : continuationIndent;
const auto effectiveContIndent = [indent, continuationIndent](const ContinuationInfo &ci) {
return !ci.indent.isEmpty() ? ci.indent : continuationIndent + indent;
@@ -325,10 +331,12 @@ void ProWriter::putVarValues(ProFile *profile, QStringList *lines, const QString
if (eqs >= 0) // If this is not true, we mess up the file a bit.
line.truncate(eqs + 1);
// put new values
qCDebug(prowriterLog) << 1 << "old line value:" << line;
for (const QString &v : values) {
line += ((flags & MultiLine) ? QString(" \\\n") + effectiveContIndent(contInfo)
: QString(" ")) + v;
}
qCDebug(prowriterLog) << "new line value:" << line;
} else {
const ContinuationInfo contInfo = skipContLines(lines, lineNo, false);
int endLineNo = contInfo.lineNo;
@@ -343,6 +351,8 @@ void ProWriter::putVarValues(ProFile *profile, QStringList *lines, const QString
} else {
newLine += " \\";
}
qCDebug(prowriterLog) << 2 << "adding new line" << newLine
<< "at line " << curLineNo;
lines->insert(curLineNo, newLine);
++endLineNo;
}
@@ -360,8 +370,10 @@ void ProWriter::putVarValues(ProFile *profile, QStringList *lines, const QString
const QRegularExpression rx("\\A(\\s*" + scope + "\\s*:\\s*)[^\\s{].*\\z");
const QRegularExpressionMatch match(rx.match(lines->at(scopeStart)));
if (match.hasMatch()) {
qCDebug(prowriterLog) << 3 << "old line value:" << (*lines)[scopeStart];
(*lines)[scopeStart].replace(0, match.captured(1).length(),
scope + " {\n" + continuationIndent);
qCDebug(prowriterLog) << "new line value:" << (*lines)[scopeStart];
contInfo = skipContLines(lines, scopeStart, false);
lNo = contInfo.lineNo;
scopeStart = -1;
@@ -395,6 +407,7 @@ void ProWriter::putVarValues(ProFile *profile, QStringList *lines, const QString
}
if (!scope.isEmpty() && scopeStart < 0)
added += "\n}";
qCDebug(prowriterLog) << 4 << "adding" << added << "at line" << lNo;
lines->insert(lNo, added);
}
}