diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp b/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp
index 57d254e7787..d74b28b0e38 100644
--- a/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp
+++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp
@@ -127,7 +127,7 @@ void ImageCacheFontCollector::start(Utils::SmallStringView name,
                                     AbortCallback abortCallback)
 {
     QFont font;
-    if (int fontId = resolveFont(QString(name), font) >= 0) {
+    if (resolveFont(QString(name), font) >= 0) {
         auto &&auxiliaryData = Utils::get<ImageCache::FontCollectorSizeAuxiliaryData>(auxiliaryDataValue);
         QColor textColor = auxiliaryData.colorName;
         QSize size = auxiliaryData.size;
@@ -149,7 +149,7 @@ std::pair<QImage, QImage> ImageCacheFontCollector::createImage(
     const ImageCache::AuxiliaryData &auxiliaryDataValue)
 {
     QFont font;
-    if (int fontId = resolveFont(QString(name), font) >= 0) {
+    if (resolveFont(QString(name), font) >= 0) {
         auto &&auxiliaryData = Utils::get<ImageCache::FontCollectorSizeAuxiliaryData>(auxiliaryDataValue);
         QColor textColor = auxiliaryData.colorName;
         QSize size = auxiliaryData.size;
@@ -171,7 +171,7 @@ QIcon ImageCacheFontCollector::createIcon(Utils::SmallStringView name,
     QIcon icon;
 
     QFont font;
-    if (int fontId = resolveFont(QString(name), font) >= 0) {
+    if (resolveFont(QString(name), font) >= 0) {
         auto &&auxiliaryData = Utils::get<ImageCache::FontCollectorSizesAuxiliaryData>(auxiliaryDataValue);
         QColor textColor = auxiliaryData.colorName;
         const auto sizes = auxiliaryData.sizes;
diff --git a/tests/auto/qml/codemodel/check/tst_check.cpp b/tests/auto/qml/codemodel/check/tst_check.cpp
index 27b3a02a644..0df1bca5b6d 100644
--- a/tests/auto/qml/codemodel/check/tst_check.cpp
+++ b/tests/auto/qml/codemodel/check/tst_check.cpp
@@ -100,9 +100,9 @@ void tst_Check::initTestCase()
     for (auto p: paths)
         lPaths.maybeInsert(Utils::FilePath::fromString(p), Dialect::Qml);
     ModelManagerInterface::importScan(result, ModelManagerInterface::workingCopy(), lPaths,
-                                      ModelManagerInterface::instance(), false);
+                                      modelManager, false);
     QCoreApplication::processEvents();
-    ModelManagerInterface::instance()->test_joinAllThreads();
+    modelManager->test_joinAllThreads();
     QCoreApplication::processEvents();
 }