From f1f3881cdbdb541b7fdf82ad4de6dbcd73990444 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 21 Jan 2021 13:26:26 +0100 Subject: [PATCH] Fix build with Qt6 Some type issues (int vs long long, int vs QFont::Weight), no "midRef" any more. Task-number: QTCREATORBUG-24098 Change-Id: Id39f70edc14832baaeebb2572bca5491deadaf1d Reviewed-by: hjk Reviewed-by: Miikka Heikkinen --- .../clangactivationsequencecontextprocessor.cpp | 5 +++-- src/plugins/cpaster/pastebindotcomprotocol.cpp | 2 +- src/plugins/projectexplorer/projectexplorer.cpp | 2 +- .../designercore/imagecache/imagecachefontcollector.cpp | 4 ++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp b/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp index 564d2e400d2..a23cbd026a7 100644 --- a/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp +++ b/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp @@ -291,8 +291,9 @@ void ActivationSequenceContextProcessor::goBackToStartOfName() const int tokIndex = CPlusPlus::SimpleLexer::tokenAt(tokens, tokenPos); if (tokIndex > -1 && tokens.at(tokIndex).isStringLiteral()) { const int tokenStart = tokens.at(tokIndex).utf16charOffset; - const int slashIndex = m_textCursor.block().text().lastIndexOf('/', - std::min(m_textCursor.positionInBlock(), m_textCursor.block().text().length() - 1)); + const int slashIndex = m_textCursor.block().text().lastIndexOf( + '/', + std::min(m_textCursor.positionInBlock(), int(m_textCursor.block().text().length() - 1))); m_startOfNamePosition = m_textCursor.block().position() + std::max(slashIndex, tokenStart) + 1; } else { diff --git a/src/plugins/cpaster/pastebindotcomprotocol.cpp b/src/plugins/cpaster/pastebindotcomprotocol.cpp index e2f4bdf0c38..c503bfe3330 100644 --- a/src/plugins/cpaster/pastebindotcomprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcomprotocol.cpp @@ -227,7 +227,7 @@ static QString replaceEntities(const QString &original) const QRegularExpressionMatch match = it.next(); const QString value = match.captured(1); if (value.startsWith('x')) - result.replace(match.captured(0), QChar(value.midRef(1).toInt(nullptr, 16))); + result.replace(match.captured(0), QChar(value.mid(1).toInt(nullptr, 16))); else result.replace(match.captured(0), QChar(value.toInt(nullptr, 10))); } diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 5e73e5ec68d..1bd863b26a2 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -2267,7 +2267,7 @@ void ProjectExplorerPluginPrivate::savePersistentSettings() dd->m_buildPropertiesSettings.qtQuickCompiler.toVariant(), TriState::Default.toVariant()); - s->setValueWithDefault(Constants::CUSTOM_PARSER_COUNT_KEY, dd->m_customParsers.count(), 0); + s->setValueWithDefault(Constants::CUSTOM_PARSER_COUNT_KEY, int(dd->m_customParsers.count()), 0); for (int i = 0; i < dd->m_customParsers.count(); ++i) { s->setValue(Constants::CUSTOM_PARSER_PREFIX_KEY + QString::number(i), dd->m_customParsers.at(i).toMap()); diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp b/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp index 4eec8a19bcf..709d7469930 100644 --- a/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp +++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp @@ -81,7 +81,11 @@ void ImageCacheFontCollector::start(Utils::SmallStringView name, QFont font(fontFamily); font.setStyle(rawFont.style()); font.setStyleName(rawFont.styleName()); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + font.setWeight(QFont::Weight(rawFont.weight())); +#else font.setWeight(rawFont.weight()); +#endif QImage image(size, QImage::Format_ARGB32); image.fill(Qt::transparent); int pixelSize(200);