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

Fix Qt 6 build of ProjectExplorer and targets & build systems

Browse Source 
QStringRef is gone.
qsizetype vs int.
QMultiHash::insertMulti is gone.
QXmlStreamWriter writes UTF-8 by default.

Task-number: QTCREATORBUG-24098
Change-Id: Id217e40a1f17993a84fc725976e9cb84618b0580
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Eike Ziller
2020-09-18 13:15:18 +02:00
parent dc1439dedd
commit 3f42c989ee
20 changed files with 64 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ static bool lineIsEmpty(const QString &line)
static int paranthesesLevel(const QString &line)
{
const QStringRef beforeComment = line.midRef(0, line.indexOf(QLatin1Char('#')));
const QString beforeComment = line.mid(0, line.indexOf(QLatin1Char('#')));
const int opening = beforeComment.count(QLatin1Char('('));
const int closing = beforeComment.count(QLatin1Char(')'));
if (opening == closing)

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

@@ -84,7 +84,7 @@ void CMakeTargetLocatorFilter::prepareSearch(const QString &entry)
Core::LocatorFilterEntry filterEntry(this, target.title, extraData);
filterEntry.extraInfo = path.shortNativePath();
filterEntry.highlightInfo = {index, entry.length()};
filterEntry.highlightInfo = {index, int(entry.length())};
filterEntry.fileName = path.toString();
m_result.append(filterEntry);