diff --git a/src/tiled/actionsearch.cpp b/src/tiled/actionsearch.cpp
index d1267c0712..47c80fe199 100644
--- a/src/tiled/actionsearch.cpp
+++ b/src/tiled/actionsearch.cpp
@@ -150,7 +150,6 @@ void ActionMatchDelegate::paint(QPainter *painter,
     QStaticText staticText(nameHtml);
     staticText.setTextOption(textOption);
     staticText.setTextFormat(Qt::RichText);
-    staticText.prepare(painter->transform(), fonts.big);
 
     painter->setFont(fonts.big);
     painter->drawStaticText(nameRect.topLeft(), staticText);
@@ -170,7 +169,6 @@ void ActionMatchDelegate::paint(QPainter *painter,
 
         staticText.setTextFormat(Qt::PlainText);
         staticText.setText(shortcutText);
-        staticText.prepare(painter->transform(), fonts.small);
 
         const int centeringMargin = (shortcutRect.height() - smallFontMetrics.height()) / 2;
         painter->setOpacity(0.75);
diff --git a/src/tiled/command.cpp b/src/tiled/command.cpp
index 21b380cc04..9086369ca8 100644
--- a/src/tiled/command.cpp
+++ b/src/tiled/command.cpp
@@ -298,10 +298,12 @@ CommandProcess::CommandProcess(const Command &command, bool inTerminal, bool sho
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
     start(mFinalCommand);
-#else
+#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QStringList args = QProcess::splitCommand(mFinalCommand);
     const QString executable = args.takeFirst();
     start(executable, args);
+#else
+    startCommand(mFinalCommand);
 #endif
 }
 
diff --git a/src/tiled/issuesdock.cpp b/src/tiled/issuesdock.cpp
index c01ab2ae0e..22508a445f 100644
--- a/src/tiled/issuesdock.cpp
+++ b/src/tiled/issuesdock.cpp
@@ -163,7 +163,7 @@ IssuesDock::IssuesDock(QWidget *parent)
 
     mIssuesView->setModel(mProxyModel);
     mIssuesView->setIconSize(Utils::dpiScaled(QSize(16, 16)));
-    mIssuesView->setItemDelegate(new IssueDelegate);
+    mIssuesView->setItemDelegate(new IssueDelegate(this));
     mIssuesView->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
 
     mFilterEdit->setFilteredView(mIssuesView);
diff --git a/src/tiled/locatorwidget.cpp b/src/tiled/locatorwidget.cpp
index 82a161761d..24fa7a1e74 100644
--- a/src/tiled/locatorwidget.cpp
+++ b/src/tiled/locatorwidget.cpp
@@ -173,13 +173,11 @@ void FileMatchDelegate::paint(QPainter *painter,
     QStaticText staticText(fileNameHtml);
     staticText.setTextOption(textOption);
     staticText.setTextFormat(Qt::RichText);
-    staticText.prepare(painter->transform(), fonts.big);
 
     painter->setFont(fonts.big);
     painter->drawStaticText(fileNameRect.topLeft(), staticText);
 
     staticText.setText(filePathHtml);
-    staticText.prepare(painter->transform(), fonts.small);
 
     painter->setOpacity(0.75);
     painter->setFont(fonts.small);
diff --git a/src/tmxrasterizer/tmxrasterizer.cpp b/src/tmxrasterizer/tmxrasterizer.cpp
index b0c75a599c..b7e5779430 100644
--- a/src/tmxrasterizer/tmxrasterizer.cpp
+++ b/src/tmxrasterizer/tmxrasterizer.cpp
@@ -31,8 +31,6 @@
 #include "imagelayer.h"
 #include "map.h"
 #include "mapformat.h"
-#include "mapreader.h"
-#include "maprenderer.h"
 #include "objectgroup.h"
 #include "tilelayer.h"
 #include "tilesetmanager.h"
diff --git a/src/tmxrasterizer/tmxrasterizer.h b/src/tmxrasterizer/tmxrasterizer.h
index 25aaca0078..fe5e8449b0 100644
--- a/src/tmxrasterizer/tmxrasterizer.h
+++ b/src/tmxrasterizer/tmxrasterizer.h
@@ -30,8 +30,8 @@
 
 #include "layer.h"
 
-#include "map.h"
-#include "mapreader.h"
+#include "maprenderer.h"
+
 #include <QString>
 #include <QStringList>