diff --git a/launcher/Commandline.cpp b/launcher/Commandline.cpp
index 2c0fde64..8a79d564 100644
--- a/launcher/Commandline.cpp
+++ b/launcher/Commandline.cpp
@@ -47,7 +47,7 @@ QStringList splitArgs(QString args)
             if (cchar == '\\')
                 escape = true;
             else if (cchar == inquotes)
-                inquotes = 0;
+                inquotes = QChar::Null;
             else
                 current += cchar;
             // otherwise
@@ -480,4 +480,4 @@ void Parser::getPrefix(QString &opt, QString &flag)
 ParsingError::ParsingError(const QString &what) : std::runtime_error(what.toStdString())
 {
 }
-}
\ No newline at end of file
+}
diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp
index 3837d75f..8e984b2b 100644
--- a/launcher/FileSystem.cpp
+++ b/launcher/FileSystem.cpp
@@ -346,7 +346,7 @@ bool checkProblemticPathJava(QDir folder)
 }
 
 // Win32 crap
-#if defined Q_OS_WIN
+#ifdef Q_OS_WIN
 
 bool called_coinit = false;
 
@@ -366,7 +366,7 @@ HRESULT CreateLink(LPCSTR linkPath, LPCSTR targetPath, LPCSTR args)
         }
     }
 
-    IShellLink *link;
+    IShellLinkA *link;
     hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink,
                             (LPVOID *)&link);
 
diff --git a/launcher/GZip.cpp b/launcher/GZip.cpp
index 0368c32d..2f91d425 100644
--- a/launcher/GZip.cpp
+++ b/launcher/GZip.cpp
@@ -67,7 +67,7 @@ bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes)
         return true;
     }
 
-    unsigned compLength = std::min(uncompressedBytes.size(), 16);
+    unsigned compLength = qMin(uncompressedBytes.size(), 16);
     compressedBytes.clear();
     compressedBytes.resize(compLength);
 
@@ -112,4 +112,4 @@ bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes)
         return false;
     }
     return true;
-}
\ No newline at end of file
+}
diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp
index d7ad4428..f20d6dff 100644
--- a/launcher/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
@@ -421,7 +421,7 @@ bool MMCZip::collectFileListRecursively(const QString& rootDir, const QString& s
             continue;
         }
 
-        files->append(e.filePath());  // we want the original paths for MMCZip::compressDirFiles
+        files->append(e);  // we want the original paths for MMCZip::compressDirFiles
     }
     return true;
 }
diff --git a/launcher/Version.h b/launcher/Version.h
index 9fe12d6d..292e2a18 100644
--- a/launcher/Version.h
+++ b/launcher/Version.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <QString>
+#include <QStringView>
 #include <QList>
 
 class QUrl;
@@ -39,13 +40,21 @@ private:
                     break;
                 }
             }
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            auto numPart = QStringView{m_fullString}.left(cutoff);
+#else
             auto numPart = m_fullString.leftRef(cutoff);
+#endif
             if(numPart.size())
             {
                 numValid = true;
                 m_numPart = numPart.toInt();
             }
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            auto stringPart = QStringView{m_fullString}.mid(cutoff);
+#else
             auto stringPart = m_fullString.midRef(cutoff);
+#endif
             if(stringPart.size())
             {
                 m_stringPart = stringPart.toString();
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index 24a1556e..eeda8bc4 100644
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@@ -195,7 +195,7 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
         DWORD subKeyNameSize, numSubKeys, retCode;
 
         // Get the number of subkeys
-        RegQueryInfoKey(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL,
+        RegQueryInfoKeyA(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL,
                         NULL, NULL);
 
         // Iterate until RegEnumKeyEx fails
@@ -204,31 +204,36 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
             for (DWORD i = 0; i < numSubKeys; i++)
             {
                 subKeyNameSize = 255;
-                retCode = RegEnumKeyEx(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL,
-                                       NULL);
+                retCode = RegEnumKeyExA(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL,
+                                        NULL);
+#ifdef _UNICODE
+                QString newSubkeyName = QString::fromWCharArray(subKeyName);
+#else
+                QString newSubkeyName = QString::fromLocal8Bit(subKeyName);
+#endif
                 if (retCode == ERROR_SUCCESS)
                 {
                     // Now open the registry key for the version that we just got.
-                    QString newKeyName = keyName + "\\" + subKeyName + subkeySuffix;
+                    QString newKeyName = keyName + "\\" + newSubkeyName + subkeySuffix;
 
                     HKEY newKey;
-                    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, newKeyName.toStdString().c_str(), 0,
-                                     KEY_READ | KEY_WOW64_64KEY, &newKey) == ERROR_SUCCESS)
+                    if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, newKeyName.toStdString().c_str(), 0,
+                                      KEY_READ | KEY_WOW64_64KEY, &newKey) == ERROR_SUCCESS)
                     {
                         // Read the JavaHome value to find where Java is installed.
                         value = new char[0];
                         valueSz = 0;
-                        if (RegQueryValueEx(newKey, keyJavaDir.toStdString().c_str(), NULL, NULL, (BYTE *)value,
-                                            &valueSz) == ERROR_MORE_DATA)
+                        if (RegQueryValueExA(newKey, keyJavaDir.toStdString().c_str(), NULL, NULL, (BYTE *)value,
+                                             &valueSz) == ERROR_MORE_DATA)
                         {
                             value = new char[valueSz];
-                            RegQueryValueEx(newKey, keyJavaDir.toStdString().c_str(), NULL, NULL, (BYTE *)value,
-                                            &valueSz);
+                            RegQueryValueExA(newKey, keyJavaDir.toStdString().c_str(), NULL, NULL, (BYTE *)value,
+                                             &valueSz);
 
                             // Now, we construct the version object and add it to the list.
                             JavaInstallPtr javaVersion(new JavaInstall());
 
-                            javaVersion->id = subKeyName;
+                            javaVersion->id = newSubkeyName;
                             javaVersion->arch = archType;
                             javaVersion->path =
                                 QDir(FS::PathCombine(value, "bin")).absoluteFilePath("javaw.exe");
diff --git a/launcher/main.cpp b/launcher/main.cpp
index 3d25b4ff..bb09ea6c 100644
--- a/launcher/main.cpp
+++ b/launcher/main.cpp
@@ -24,8 +24,10 @@ int main(int argc, char *argv[])
     return 42;
 #endif
 
+#if QT_VERSION <= QT_VERSION_CHECK(6, 0, 0)
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+#endif
 
     // initialize Qt
     Application app(argc, argv);
diff --git a/launcher/minecraft/World.cpp b/launcher/minecraft/World.cpp
index dc756e06..e974953a 100644
--- a/launcher/minecraft/World.cpp
+++ b/launcher/minecraft/World.cpp
@@ -321,7 +321,8 @@ bool World::install(const QString &to, const QString &name)
 
     if(ok && !name.isEmpty() && m_actualName != name)
     {
-        World newWorld(finalPath);
+        QFileInfo finalPathInfo(finalPath);
+        World newWorld(finalPathInfo);
         if(newWorld.isValid())
         {
             newWorld.rename(name);
diff --git a/launcher/minecraft/WorldList.cpp b/launcher/minecraft/WorldList.cpp
index 75d0877e..dd6c7c0f 100644
--- a/launcher/minecraft/WorldList.cpp
+++ b/launcher/minecraft/WorldList.cpp
@@ -301,7 +301,11 @@ public:
     }
 
 protected:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QVariant retrieveData(const QString &mimetype, QMetaType type) const
+#else
     QVariant retrieveData(const QString &mimetype, QVariant::Type type) const
+#endif
     {
         QList<QUrl> urls;
         for(auto &world: m_worlds)
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index 0545352b..5ee08cbf 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -317,7 +317,8 @@ bool ModFolderModel::installMod(const QString &filename)
             return false;
         }
         FS::updateTimestamp(newpath);
-        installedMod.repath(newpath);
+        QFileInfo newpathInfo(newpath);
+        installedMod.repath(newpathInfo);
         update();
         return true;
     }
@@ -335,7 +336,8 @@ bool ModFolderModel::installMod(const QString &filename)
             qWarning() << "Copy of folder from" << originalPath << "to" << newpath << "has (potentially partially) failed.";
             return false;
         }
-        installedMod.repath(newpath);
+        QFileInfo newpathInfo(newpath);
+        installedMod.repath(newpathInfo);
         update();
         return true;
     }
diff --git a/launcher/modplatform/ModAPI.h b/launcher/modplatform/ModAPI.h
index 91b760df..d11ed7ca 100644
--- a/launcher/modplatform/ModAPI.h
+++ b/launcher/modplatform/ModAPI.h
@@ -2,6 +2,7 @@
 
 #include <QString>
 #include <QList>
+#include <list>
 
 #include "Version.h"
 
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 73ab0b13..0ed0ad29 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -36,7 +36,7 @@
 
 #include "ATLPackInstallTask.h"
 
-#include <QtConcurrent/QtConcurrent>
+#include <QtConcurrent>
 
 #include <quazip/quazip.h>
 
@@ -557,7 +557,11 @@ void PackInstallTask::extractConfigs()
         return;
     }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), QOverload<QString, QString>::of(MMCZip::extractDir), archivePath, extractDir.absolutePath() + "/minecraft");
+#else
     m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractDir, archivePath, extractDir.absolutePath() + "/minecraft");
+#endif
     connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, [&]()
     {
         downloadMods();
@@ -702,7 +706,11 @@ void PackInstallTask::onModsDownloaded() {
     jobPtr.reset();
 
     if(!modsToExtract.empty() || !modsToDecomp.empty() || !modsToCopy.empty()) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        m_modExtractFuture = QtConcurrent::run(QThreadPool::globalInstance(), &PackInstallTask::extractMods, this, modsToExtract, modsToDecomp, modsToCopy);
+#else
         m_modExtractFuture = QtConcurrent::run(QThreadPool::globalInstance(), this, &PackInstallTask::extractMods, modsToExtract, modsToDecomp, modsToCopy);
+#endif
         connect(&m_modExtractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, &PackInstallTask::onModsExtracted);
         connect(&m_modExtractFutureWatcher, &QFutureWatcher<QStringList>::canceled, this, [&]()
         {
diff --git a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
index 961fe868..5bc01ed2 100644
--- a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
@@ -103,7 +103,7 @@ bool PackFetchTask::parseAndAddPacks(QByteArray &data, PackType packType, Modpac
 
     if(!doc.setContent(data, false, &errorMsg, &errorLine, &errorCol))
     {
-        auto fullErrMsg = QString("Failed to fetch modpack data: %1 %2:3d!").arg(errorMsg, errorLine, errorCol);
+        auto fullErrMsg = QString("Failed to fetch modpack data: %1 %2:%3!").arg(errorMsg).arg(errorLine).arg(errorCol);
         qWarning() << fullErrMsg;
         data.clear();
         return false;
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
index c63a9f1e..1493e8f2 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
@@ -88,7 +88,11 @@ void PackInstallTask::unzip()
         return;
     }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), QOverload<QString, QString>::of(MMCZip::extractDir), archivePath, extractDir.absolutePath() + "/unzip");
+#else
     m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractDir, archivePath, extractDir.absolutePath() + "/unzip");
+#endif
     connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, &PackInstallTask::onUnzipFinished);
     connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::canceled, this, &PackInstallTask::onUnzipCanceled);
     m_extractFutureWatcher.setFuture(m_extractFuture);
diff --git a/launcher/net/NetJob.cpp b/launcher/net/NetJob.cpp
index 34927369..bf73829c 100644
--- a/launcher/net/NetJob.cpp
+++ b/launcher/net/NetJob.cpp
@@ -106,7 +106,7 @@ auto NetJob::abort() -> bool
     m_todo.clear();
 
     // abort active downloads
-    auto toKill = m_doing.toList();
+    auto toKill = m_doing.values();
     for (auto index : toKill) {
         auto part = m_downloads[index];
         fullyAborted &= part->abort();
diff --git a/launcher/news/NewsChecker.cpp b/launcher/news/NewsChecker.cpp
index 6724950f..8180b6ff 100644
--- a/launcher/news/NewsChecker.cpp
+++ b/launcher/news/NewsChecker.cpp
@@ -61,7 +61,7 @@ void NewsChecker::rssDownloadFinished()
         // Parse the XML.
         if (!doc.setContent(newsData, false, &errorMsg, &errorLine, &errorCol))
         {
-            QString fullErrorMsg = QString("Error parsing RSS feed XML. %s at %d:%d.").arg(errorMsg, errorLine, errorCol);
+            QString fullErrorMsg = QString("Error parsing RSS feed XML. %1 at %2:%3.").arg(errorMsg).arg(errorLine).arg(errorCol);
             fail(fullErrorMsg);
             newsData.clear();
             return;
diff --git a/launcher/settings/INIFile.cpp b/launcher/settings/INIFile.cpp
index 6a3c801d..450ddc3f 100644
--- a/launcher/settings/INIFile.cpp
+++ b/launcher/settings/INIFile.cpp
@@ -29,7 +29,7 @@ INIFile::INIFile()
 QString INIFile::unescape(QString orig)
 {
     QString out;
-    QChar prev = 0;
+    QChar prev = QChar::Null;
     for(auto c: orig)
     {
         if(prev == '\\')
@@ -42,7 +42,7 @@ QString INIFile::unescape(QString orig)
                 out += '#';
             else
                 out += c;
-            prev = 0;
+            prev = QChar::Null;
         }
         else
         {
@@ -52,7 +52,7 @@ QString INIFile::unescape(QString orig)
                 continue;
             }
             out += c;
-            prev = 0;
+            prev = QChar::Null;
         }
     }
     return out;
@@ -117,7 +117,9 @@ bool INIFile::loadFile(QString fileName)
 bool INIFile::loadFile(QByteArray file)
 {
     QTextStream in(file);
+#if QT_VERSION <= QT_VERSION_CHECK(6, 0, 0)
     in.setCodec("UTF-8");
+#endif
 
     QStringList lines = in.readAll().split('\n');
     for (int i = 0; i < lines.count(); i++)
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 8dadb755..c5367d5b 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -64,7 +64,9 @@ QString getCreditsHtml()
 {
     QString output;
     QTextStream stream(&output);
+#if QT_VERSION <= QT_VERSION_CHECK(6, 0, 0)
     stream.setCodec(QTextCodec::codecForName("UTF-8"));
+#endif
     stream << "<center>\n";
 
     //: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Developers"
diff --git a/launcher/ui/dialogs/NewsDialog.cpp b/launcher/ui/dialogs/NewsDialog.cpp
index df620464..d3b21627 100644
--- a/launcher/ui/dialogs/NewsDialog.cpp
+++ b/launcher/ui/dialogs/NewsDialog.cpp
@@ -16,7 +16,7 @@ NewsDialog::NewsDialog(QList<NewsEntryPtr> entries, QWidget* parent) : QDialog(p
     m_article_list_hidden = ui->articleListWidget->isHidden();
 
     auto first_item = ui->articleListWidget->item(0);
-    ui->articleListWidget->setItemSelected(first_item, true);
+    first_item->setSelected(true);
 
     auto article_entry = m_entries.constFind(first_item->text()).value();
     ui->articleTitleLabel->setText(QString("<a href='%1'>%2</a>").arg(article_entry->link, first_item->text()));
diff --git a/launcher/ui/instanceview/InstanceView.cpp b/launcher/ui/instanceview/InstanceView.cpp
index 25aec1ab..41e0ce12 100644
--- a/launcher/ui/instanceview/InstanceView.cpp
+++ b/launcher/ui/instanceview/InstanceView.cpp
@@ -425,7 +425,12 @@ void InstanceView::mouseReleaseEvent(QMouseEvent *event)
         {
             emit clicked(index);
         }
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        QStyleOptionViewItem option;
+        initViewItemOption(&option);
+#else
         QStyleOptionViewItem option = viewOptions();
+#endif
         if (m_pressedAlreadySelected)
         {
             option.state |= QStyle::State_Selected;
@@ -461,7 +466,12 @@ void InstanceView::mouseDoubleClickEvent(QMouseEvent *event)
     QPersistentModelIndex persistent = index;
     emit doubleClicked(persistent);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QStyleOptionViewItem option;
+    initViewItemOption(&option);
+#else
     QStyleOptionViewItem option = viewOptions();
+#endif
     if ((model()->flags(index) & Qt::ItemIsEnabled) && !style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, &option, this))
     {
         emit activated(index);
@@ -474,7 +484,12 @@ void InstanceView::paintEvent(QPaintEvent *event)
 
     QPainter painter(this->viewport());
 
-    QStyleOptionViewItem option(viewOptions());
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QStyleOptionViewItem option;
+    initViewItemOption(&option);
+#else
+    QStyleOptionViewItem option = viewOptions();
+#endif
     option.widget = this;
 
     int wpWidth = viewport()->width();
@@ -528,9 +543,9 @@ void InstanceView::paintEvent(QPaintEvent *event)
 #if 0
     if (!m_lastDragPosition.isNull())
     {
-        QPair<Group *, int> pair = rowDropPos(m_lastDragPosition);
-        Group *category = pair.first;
-        int row = pair.second;
+        std::pair<VisualGroup *, VisualGroup::HitResults> pair = rowDropPos(m_lastDragPosition);
+        VisualGroup *category = pair.first;
+        VisualGroup::HitResults row = pair.second;
         if (category)
         {
             int internalRow = row - category->firstItemIndex;
@@ -618,7 +633,7 @@ void InstanceView::dropEvent(QDropEvent *event)
     {
         if(event->possibleActions() & Qt::MoveAction)
         {
-            QPair<VisualGroup *, VisualGroup::HitResults> dropPos = rowDropPos(event->pos());
+            std::pair<VisualGroup *, VisualGroup::HitResults> dropPos = rowDropPos(event->pos());
             const VisualGroup *group = dropPos.first;
             auto hitresult = dropPos.second;
 
@@ -709,10 +724,18 @@ QRect InstanceView::geometryRect(const QModelIndex &index) const
     int x = pos.first;
     // int y = pos.second;
 
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QStyleOptionViewItem option;
+    initViewItemOption(&option);
+#else
+    QStyleOptionViewItem option = viewOptions();
+#endif
+
     QRect out;
     out.setTop(cat->verticalPosition() + cat->headerHeight() + 5 + cat->rowTopOf(index));
     out.setLeft(m_spacing + x * (itemWidth() + m_spacing));
-    out.setSize(itemDelegate()->sizeHint(viewOptions(), index));
+    out.setSize(itemDelegate()->sizeHint(option, index));
     geometryCache.insert(row, new QRect(out));
     return out;
 }
@@ -759,7 +782,12 @@ QPixmap InstanceView::renderToPixmap(const QModelIndexList &indices, QRect *r) c
     QPixmap pixmap(r->size());
     pixmap.fill(Qt::transparent);
     QPainter painter(&pixmap);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QStyleOptionViewItem option;
+    initViewItemOption(&option);
+#else
     QStyleOptionViewItem option = viewOptions();
+#endif
     option.state |= QStyle::State_Selected;
     for (int j = 0; j < paintPairs.count(); ++j)
     {
@@ -770,16 +798,16 @@ QPixmap InstanceView::renderToPixmap(const QModelIndexList &indices, QRect *r) c
     return pixmap;
 }
 
-QList<QPair<QRect, QModelIndex>> InstanceView::draggablePaintPairs(const QModelIndexList &indices, QRect *r) const
+QList<std::pair<QRect, QModelIndex>> InstanceView::draggablePaintPairs(const QModelIndexList &indices, QRect *r) const
 {
     Q_ASSERT(r);
     QRect &rect = *r;
-    QList<QPair<QRect, QModelIndex>> ret;
+    QList<std::pair<QRect, QModelIndex>> ret;
     for (int i = 0; i < indices.count(); ++i)
     {
         const QModelIndex &index = indices.at(i);
         const QRect current = geometryRect(index);
-        ret += qMakePair(current, index);
+        ret += std::make_pair(current, index);
         rect |= current;
     }
     return ret;
@@ -790,11 +818,11 @@ bool InstanceView::isDragEventAccepted(QDropEvent *event)
     return true;
 }
 
-QPair<VisualGroup *, VisualGroup::HitResults> InstanceView::rowDropPos(const QPoint &pos)
+std::pair<VisualGroup *, VisualGroup::HitResults> InstanceView::rowDropPos(const QPoint &pos)
 {
     VisualGroup::HitResults hitresult;
     auto group = categoryAt(pos + offset(), hitresult);
-    return qMakePair<VisualGroup*, int>(group, hitresult);
+    return std::make_pair(group, hitresult);
 }
 
 QPoint InstanceView::offset() const
diff --git a/launcher/ui/instanceview/InstanceView.h b/launcher/ui/instanceview/InstanceView.h
index 406362e6..25d8ba0b 100644
--- a/launcher/ui/instanceview/InstanceView.h
+++ b/launcher/ui/instanceview/InstanceView.h
@@ -143,11 +143,11 @@ private: /* methods */
     int calculateItemsPerRow() const;
     int verticalScrollToValue(const QModelIndex &index, const QRect &rect, QListView::ScrollHint hint) const;
     QPixmap renderToPixmap(const QModelIndexList &indices, QRect *r) const;
-    QList<QPair<QRect, QModelIndex>> draggablePaintPairs(const QModelIndexList &indices, QRect *r) const;
+    QList<std::pair<QRect, QModelIndex>> draggablePaintPairs(const QModelIndexList &indices, QRect *r) const;
 
     bool isDragEventAccepted(QDropEvent *event);
 
-    QPair<VisualGroup *, VisualGroup::HitResults> rowDropPos(const QPoint &pos);
+    std::pair<VisualGroup *, VisualGroup::HitResults> rowDropPos(const QPoint &pos);
 
     QPoint offset() const;
 };
diff --git a/launcher/ui/instanceview/VisualGroup.cpp b/launcher/ui/instanceview/VisualGroup.cpp
index 8991fb2d..1c2dd7fc 100644
--- a/launcher/ui/instanceview/VisualGroup.cpp
+++ b/launcher/ui/instanceview/VisualGroup.cpp
@@ -55,7 +55,14 @@ void VisualGroup::update()
             positionInRow = 0;
             maxRowHeight = 0;
         }
-        auto itemHeight = view->itemDelegate()->sizeHint(view->viewOptions(), item).height();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        QStyleOptionViewItem viewItemOption;
+        view->initViewItemOption(&viewItemOption);
+#else
+        QStyleOptionViewItem viewItemOption = view->viewOptions();
+#endif
+
+        auto itemHeight = view->itemDelegate()->sizeHint(viewItemOption, item).height();
         if(itemHeight > maxRowHeight)
         {
             maxRowHeight = itemHeight;