From 8443fbe3d480c2cd6414e8daf18964623f34386f Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 21 Jan 2021 18:28:34 +0100 Subject: [PATCH] QmlDesigner: Fix Qt6 build Add more QFont::Weight workarounds. The functions have to be refactored in the future. Change-Id: I5658a725c6c891d65f374484147d7cb5ae150980 Reviewed-by: Miikka Heikkinen --- .../designercore/imagecache/imagecachefontcollector.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp b/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp index f1e32f27fef..9d33dd98c52 100644 --- a/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp +++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp @@ -145,7 +145,11 @@ std::pair ImageCacheFontCollector::createImage( 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); @@ -207,7 +211,11 @@ QIcon ImageCacheFontCollector::createIcon(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 for (QSize size : sizes) { QPixmap pixmap(size); pixmap.fill(Qt::transparent);