From ad09faab4e74812a93a71652c945d16f40ed8282 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 22 Jan 2021 09:58:08 +0100
Subject: [PATCH] Fix build with Qt 6

Change-Id: I5c775460563dde17a363ea875d7f993e4e4d6ecd
Reviewed-by: Leander Schulten <Leander.Schulten@rwth-aachen.de>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/debugger/gdb/gdbengine.cpp                          | 2 +-
 .../designercore/imagecache/imagecachecollectorinterface.h      | 1 +
 .../qmldesigner/designercore/include/synchronousimagecache.h    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 1f7f4df33cb..87f77402cea 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3168,7 +3168,7 @@ void GdbEngine::handleRegisterListing(const DebuggerResponse &response)
         reg.name = parts.at(0);
         reg.size = parts.at(4).toInt();
         reg.reportedType = parts.at(5);
-        reg.groups = parts.at(6).split(',').toSet();
+        reg.groups = Utils::toSet(parts.at(6).split(','));
         m_registers[gdbRegisterNumber] = reg;
     }
 }
diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollectorinterface.h b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollectorinterface.h
index ea1f121273e..4ac288c6f86 100644
--- a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollectorinterface.h
+++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollectorinterface.h
@@ -28,6 +28,7 @@
 #include <imagecacheauxiliarydata.h>
 #include <utils/smallstringview.h>
 
+#include <QIcon>
 #include <QImage>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designercore/include/synchronousimagecache.h b/src/plugins/qmldesigner/designercore/include/synchronousimagecache.h
index 2f043fd2a31..7f6573cf6ef 100644
--- a/src/plugins/qmldesigner/designercore/include/synchronousimagecache.h
+++ b/src/plugins/qmldesigner/designercore/include/synchronousimagecache.h
@@ -29,6 +29,7 @@
 
 #include <utils/smallstring.h>
 
+#include <QIcon>
 #include <QImage>
 
 #include <condition_variable>