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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Conflicts:
	src/plugins/clangformat/clangformatutils.cpp

Change-Id: Ide285cc25fca9101843ab9dca01c5a33644aca7f
This commit is contained in:
Eike Ziller
2023-06-14 08:43:08 +02:00
parent 87a9345398 cf90e478e6
commit e7870f736d
95 changed files with 759 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp
View File

@@ -89,7 +89,7 @@ QString CMakeAutoCompleter::insertMatchingQuote(const QTextCursor &cursor,
int CMakeAutoCompleter::paragraphSeparatorAboutToBeInserted(QTextCursor &cursor)
{
const QString line = cursor.block().text().trimmed();
if (line.contains(QRegularExpression(QStringLiteral("^(endfunction|endmacro|endif|endforeach|endwhile)\\w*\\("))))
if (line.contains(QRegularExpression(QStringLiteral("^(endfunction|endmacro|endif|endforeach|endwhile|endblock)\\w*\\("))))
tabSettings().indentLine(cursor.block(), tabSettings().indentationColumn(cursor.block().text()));
return 0;
}

4
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -175,8 +175,8 @@ void CMakeBuildSystem::triggerParsing()
qCDebug(cmakeBuildSystemLog) << "Parse called with flags:"
<< reparseParametersString(reparseParameters);
const QString cache = m_parameters.buildDirectory.pathAppended("CMakeCache.txt").toString();
if (!QFileInfo::exists(cache)) {
const FilePath cache = m_parameters.buildDirectory.pathAppended("CMakeCache.txt");
if (!cache.exists()) {
reparseParameters |= REPARSE_FORCE_INITIAL_CONFIGURATION | REPARSE_FORCE_CMAKE_RUN;
qCDebug(cmakeBuildSystemLog)
<< "No" << cache

6
src/plugins/cmakeprojectmanager/cmakeindenter.cpp
View File

@@ -52,7 +52,8 @@ static bool lineStartsBlock(const QString &line)
lineContainsFunction(line, QStringLiteral("while")) ||
lineContainsFunction(line, QStringLiteral("if")) ||
lineContainsFunction(line, QStringLiteral("elseif")) ||
lineContainsFunction(line, QStringLiteral("else"));
lineContainsFunction(line, QStringLiteral("else")) ||
lineContainsFunction(line, QStringLiteral("block"));
}
static bool lineEndsBlock(const QString &line)
{
@@ -62,7 +63,8 @@ static bool lineEndsBlock(const QString &line)
lineContainsFunction(line, QStringLiteral("endwhile")) ||
lineContainsFunction(line, QStringLiteral("endif")) ||
lineContainsFunction(line, QStringLiteral("elseif")) ||
lineContainsFunction(line, QStringLiteral("else"));
lineContainsFunction(line, QStringLiteral("else")) ||
lineContainsFunction(line, QStringLiteral("endblock"));
}
static bool lineIsEmpty(const QString &line)
{

11
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -115,7 +115,16 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP
&& left.inherits.value() == right.inherits.value();
const bool leftInheritsRight = left.inherits
&& left.inherits.value().contains(right.name);
if ((left.inherits && !right.inherits) || leftInheritsRight || sameInheritance)
const bool inheritsGreater = left.inherits && right.inherits
&& left.inherits.value().first()
> right.inherits.value().first();
const bool noInheritsGreater = !left.inherits && !right.inherits
&& left.name > right.name;
if ((left.inherits && !right.inherits) || leftInheritsRight || sameInheritance
|| inheritsGreater || noInheritsGreater)
return false;
return true;
});