refactor: fix deprecation up to Qt 5.15

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

45 files changed, 178 insertions, 119 deletions

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index c6e04a85..07658c5d 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -84,6 +84,7 @@
 #include <QDebug>
 #include <QStyleFactory>
 #include <QWindow>
+#include <QIcon>
 
 #include "InstanceList.h"
 
@@ -99,7 +100,6 @@
 #include "tools/JVisualVM.h"
 #include "tools/MCEditTool.h"
 
-#include <xdgicon.h>
 #include "settings/INISettingsObject.h"
 #include "settings/Setting.h"
 
@@ -1182,7 +1182,7 @@ void Application::setApplicationTheme(const QString& name, bool initial)
 
 void Application::setIconTheme(const QString& name)
 {
-    XdgIcon::setThemeName(name);
+    QIcon::setThemeName(name);
 }
 
 QIcon Application::getThemedIcon(const QString& name)
@@ -1190,7 +1190,7 @@ QIcon Application::getThemedIcon(const QString& name)
     if(name == "logo") {
         return QIcon(":/org.polymc.PolyMC.svg");
     }
-    return XdgIcon::fromTheme(name);
+    return QIcon::fromTheme(name);
 }
 
 bool Application::openJsonEditor(const QString &filename)
diff --git a/launcher/ApplicationMessage.cpp b/launcher/ApplicationMessage.cpp
index e22bf13c..9426b5a7 100644
--- a/launcher/ApplicationMessage.cpp
+++ b/launcher/ApplicationMessage.cpp
@@ -2,10 +2,11 @@
 
 #include <QJsonDocument>
 #include <QJsonObject>
+#include "Json.h"
 
 void ApplicationMessage::parse(const QByteArray & input) {
-    auto doc = QJsonDocument::fromBinaryData(input);
-    auto root = doc.object();
+    auto doc = Json::requireDocument(input, "ApplicationMessage");
+    auto root = Json::requireObject(doc, "ApplicationMessage");
 
     command = root.value("command").toString();
     args.clear();
@@ -25,7 +26,5 @@ QByteArray ApplicationMessage::serialize() {
     }
     root.insert("args", outArgs);
 
-    QJsonDocument out;
-    out.setObject(root);
-    return out.toBinaryData();
+    return Json::toText(root);
 }
diff --git a/launcher/BaseVersionList.cpp b/launcher/BaseVersionList.cpp
index aa9cb6cf..50684409 100644
--- a/launcher/BaseVersionList.cpp
+++ b/launcher/BaseVersionList.cpp
@@ -51,7 +51,7 @@ QVariant BaseVersionList::data(const QModelIndex &index, int role) const
     switch (role)
     {
     case VersionPointerRole:
-        return qVariantFromValue(version);
+        return QVariant::fromValue(version);
 
     case VersionRole:
         return version->name();
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index ec8e84c9..b90f8cd5 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -963,6 +963,7 @@ target_link_libraries(Launcher_logic
     tomlc99
     BuildConfig
     Katabasis
+    Qt5::Widgets
 )
 
 if (UNIX AND NOT CYGWIN AND NOT APPLE)
@@ -979,7 +980,6 @@ target_link_libraries(Launcher_logic
     Qt5::Gui
 )
 target_link_libraries(Launcher_logic
-    Launcher_iconfix
     QuaZip::QuaZip
     hoedown
     LocalPeer
diff --git a/launcher/FileSystem.h b/launcher/FileSystem.h
index 31c7af70..93dfa98b 100644
--- a/launcher/FileSystem.h
+++ b/launcher/FileSystem.h
@@ -49,8 +49,8 @@ class copy
 public:
     copy(const QString & src, const QString & dst)
     {
-        m_src = src;
-        m_dst = dst;
+        m_src.setPath(src);
+        m_dst.setPath(dst);
     }
     copy & followSymlinks(const bool follow)
     {
diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp
index 3e3c81f7..f6714614 100644
--- a/launcher/InstanceList.cpp
+++ b/launcher/InstanceList.cpp
@@ -136,7 +136,7 @@ QVariant InstanceList::data(const QModelIndex &index, int role) const
     {
     case InstancePointerRole:
     {
-        QVariant v = qVariantFromValue((void *)pdata);
+        QVariant v = QVariant::fromValue((void *)pdata);
         return v;
     }
     case InstanceIDRole:
@@ -252,7 +252,7 @@ void InstanceList::setInstanceGroup(const InstanceId& id, const GroupId& name)
 
 QStringList InstanceList::getGroups()
 {
-    return m_groupNameCache.toList();
+    return m_groupNameCache.values();
 }
 
 void InstanceList::deleteGroup(const QString& name)
@@ -353,7 +353,11 @@ QList< InstanceId > InstanceList::discoverInstances()
         out.append(id);
         qDebug() << "Found instance ID" << id;
     }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    instanceSet = QSet<QString>(out.begin(), out.end());
+#else
     instanceSet = out.toSet();
+#endif
     m_instancesProbed = true;
     return out;
 }
diff --git a/launcher/Json.cpp b/launcher/Json.cpp
index 37ada1aa..04b15091 100644
--- a/launcher/Json.cpp
+++ b/launcher/Json.cpp
@@ -22,14 +22,6 @@ void write(const QJsonArray &array, const QString &filename)
     write(QJsonDocument(array), filename);
 }
 
-QByteArray toBinary(const QJsonObject &obj)
-{
-    return QJsonDocument(obj).toBinaryData();
-}
-QByteArray toBinary(const QJsonArray &array)
-{
-    return QJsonDocument(array).toBinaryData();
-}
 QByteArray toText(const QJsonObject &obj)
 {
     return QJsonDocument(obj).toJson(QJsonDocument::Compact);
@@ -48,12 +40,8 @@ QJsonDocument requireDocument(const QByteArray &data, const QString &what)
 {
     if (isBinaryJson(data))
     {
-        QJsonDocument doc = QJsonDocument::fromBinaryData(data);
-        if (doc.isNull())
-        {
-            throw JsonException(what + ": Invalid JSON (binary JSON detected)");
-        }
-        return doc;
+        // FIXME: Is this needed?
+        throw JsonException(what + ": Invalid JSON. Binary JSON unsupported");
     }
     else
     {
diff --git a/launcher/Json.h b/launcher/Json.h
index f2e68f0c..06a45a72 100644
--- a/launcher/Json.h
+++ b/launcher/Json.h
@@ -29,8 +29,6 @@ void write(const QJsonObject &object, const QString &filename);
 /// @throw FileSystemException
 void write(const QJsonArray &array, const QString &filename);
 
-QByteArray toBinary(const QJsonObject &obj);
-QByteArray toBinary(const QJsonArray &array);
 QByteArray toText(const QJsonObject &obj);
 QByteArray toText(const QJsonArray &array);
 
diff --git a/launcher/LoggedProcess.cpp b/launcher/LoggedProcess.cpp
index 2479f4ff..05d2fd74 100644
--- a/launcher/LoggedProcess.cpp
+++ b/launcher/LoggedProcess.cpp
@@ -157,19 +157,6 @@ void LoggedProcess::on_stateChange(QProcess::ProcessState state)
     }
 }
 
-#if defined Q_OS_WIN32
-#include <windows.h>
-#endif
-
-qint64 LoggedProcess::processId() const
-{
-#ifdef Q_OS_WIN
-    return pid() ? pid()->dwProcessId : 0;
-#else
-    return pid();
-#endif
-}
-
 void LoggedProcess::setDetachable(bool detachable)
 {
     m_is_detachable = detachable;
diff --git a/launcher/LoggedProcess.h b/launcher/LoggedProcess.h
index e52b8a7b..03ded98c 100644
--- a/launcher/LoggedProcess.h
+++ b/launcher/LoggedProcess.h
@@ -43,7 +43,6 @@ public:
 
     State state() const;
     int exitCode() const;
-    qint64 processId() const;
 
     void setDetachable(bool detachable);
 
diff --git a/launcher/VersionProxyModel.cpp b/launcher/VersionProxyModel.cpp
index b9a87c9c..684547f8 100644
--- a/launcher/VersionProxyModel.cpp
+++ b/launcher/VersionProxyModel.cpp
@@ -208,7 +208,8 @@ QVariant VersionProxyModel::data(const QModelIndex &index, int role) const
                         {
                             return APPLICATION->getThemedIcon("bug");
                         }
-                        auto pixmap = QPixmapCache::find("placeholder");
+                        QPixmap pixmap;
+                        QPixmapCache::find("placeholder", &pixmap);
                         if(!pixmap)
                         {
                             QPixmap px(16,16);
@@ -216,7 +217,7 @@ QVariant VersionProxyModel::data(const QModelIndex &index, int role) const
                             QPixmapCache::insert("placeholder", px);
                             return px;
                         }
-                        return *pixmap;
+                        return pixmap;
                     }
                 }
                 default:
diff --git a/launcher/icons/IconList.cpp b/launcher/icons/IconList.cpp
index d426aa80..fe7c34ea 100644
--- a/launcher/icons/IconList.cpp
+++ b/launcher/icons/IconList.cpp
@@ -86,7 +86,11 @@ void IconList::directoryChanged(const QString &path)
         QString &foo = (*it);
         foo = m_dir.filePath(foo);
     }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    QSet<QString> new_set(new_list.begin(), new_list.end());
+#else
     auto new_set = new_list.toSet();
+#endif
     QList<QString> current_list;
     for (auto &it : icons)
     {
@@ -94,7 +98,11 @@ void IconList::directoryChanged(const QString &path)
             continue;
         current_list.push_back(it.m_images[IconType::FileBased].filename);
     }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    QSet<QString> current_set(current_list.begin(), current_list.end());
+#else
     QSet<QString> current_set = current_list.toSet();
+#endif
 
     QSet<QString> to_remove = current_set;
     to_remove -= new_set;
diff --git a/launcher/icons/MMCIcon.cpp b/launcher/icons/MMCIcon.cpp
index f0b82ec9..29e3939b 100644
--- a/launcher/icons/MMCIcon.cpp
+++ b/launcher/icons/MMCIcon.cpp
@@ -15,7 +15,7 @@
 
 #include "MMCIcon.h"
 #include <QFileInfo>
-#include <xdgicon.h>
+#include <QIcon>
 
 IconType operator--(IconType &t, int)
 {
@@ -63,7 +63,7 @@ QIcon MMCIcon::icon() const
     if(!icon.isNull())
         return icon;
     // FIXME: inject this.
-    return XdgIcon::fromTheme(m_images[m_current_type].key);
+    return QIcon::fromTheme(m_images[m_current_type].key);
 }
 
 void MMCIcon::remove(IconType rm_type)
diff --git a/launcher/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp
index 15b22260..c3846288 100644
--- a/launcher/java/JavaChecker.cpp
+++ b/launcher/java/JavaChecker.cpp
@@ -105,7 +105,12 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     bool success = true;
 
     QMap<QString, QString> results;
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    QStringList lines = m_stdout.split("\n", Qt::SkipEmptyParts);
+#else
     QStringList lines = m_stdout.split("\n", QString::SkipEmptyParts);
+#endif
     for(QString line : lines)
     {
         line = line.trimmed();
@@ -114,7 +119,11 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
             continue;
         }
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        auto parts = line.split('=', Qt::SkipEmptyParts);
+#else
         auto parts = line.split('=', QString::SkipEmptyParts);
+#endif
         if(parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty())
         {
             continue;
diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp
index 9b745095..c32d89e1 100644
--- a/launcher/java/JavaInstallList.cpp
+++ b/launcher/java/JavaInstallList.cpp
@@ -81,7 +81,7 @@ QVariant JavaInstallList::data(const QModelIndex &index, int role) const
     switch (role)
     {
         case VersionPointerRole:
-            return qVariantFromValue(m_vlist[index.row()]);
+            return QVariant::fromValue(m_vlist[index.row()]);
         case VersionIdRole:
             return version->descriptor();
         case VersionRole:
diff --git a/launcher/launch/LaunchTask.cpp b/launcher/launch/LaunchTask.cpp
index d5442a2b..3aa95052 100644
--- a/launcher/launch/LaunchTask.cpp
+++ b/launcher/launch/LaunchTask.cpp
@@ -282,6 +282,23 @@ void LaunchTask::emitFailed(QString reason)
     Task::emitFailed(reason);
 }
 
+void LaunchTask::substituteVariables(const QStringList &args) const
+{
+    auto variables = m_instance->getVariables();
+    auto envVariables = QProcessEnvironment::systemEnvironment();
+
+    for (auto arg : args) {
+        for (auto key : variables)
+        {
+            arg.replace("$" + key, variables.value(key));
+        }
+        for (auto env : envVariables.keys())
+        {
+            arg.replace("$" + env, envVariables.value(env));
+        }
+    }
+}
+
 QString LaunchTask::substituteVariables(const QString &cmd) const
 {
     QString out = cmd;
diff --git a/launcher/launch/LaunchTask.h b/launcher/launch/LaunchTask.h
index a1e891ac..6ab0a393 100644
--- a/launcher/launch/LaunchTask.h
+++ b/launcher/launch/LaunchTask.h
@@ -85,6 +85,7 @@ public: /* methods */
     shared_qobject_ptr<LogModel> getLogModel();
 
 public:
+    void substituteVariables(const QStringList &args) const;
     QString substituteVariables(const QString &cmd) const;
     QString censorPrivateInfo(QString in);
 
diff --git a/launcher/launch/steps/PostLaunchCommand.cpp b/launcher/launch/steps/PostLaunchCommand.cpp
index 143eb441..9aece975 100644
--- a/launcher/launch/steps/PostLaunchCommand.cpp
+++ b/launcher/launch/steps/PostLaunchCommand.cpp
@@ -27,9 +27,19 @@ PostLaunchCommand::PostLaunchCommand(LaunchTask *parent) : LaunchStep(parent)
 
 void PostLaunchCommand::executeTask()
 {
+    //FIXME: where to put this?
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    auto args = QProcess::splitCommand(m_command);
+    m_parent->substituteVariables(args);
+
+    emit logLine(tr("Running Post-Launch command: %1").arg(args.join(' ')), MessageLevel::Launcher);
+    const QString program = args.takeFirst();
+    m_process.start(program, args);
+#else
     QString postlaunch_cmd = m_parent->substituteVariables(m_command);
     emit logLine(tr("Running Post-Launch command: %1").arg(postlaunch_cmd), MessageLevel::Launcher);
     m_process.start(postlaunch_cmd);
+#endif
 }
 
 void PostLaunchCommand::on_state(LoggedProcess::State state)
diff --git a/launcher/launch/steps/PreLaunchCommand.cpp b/launcher/launch/steps/PreLaunchCommand.cpp
index 1a0889c8..d3660b30 100644
--- a/launcher/launch/steps/PreLaunchCommand.cpp
+++ b/launcher/launch/steps/PreLaunchCommand.cpp
@@ -28,9 +28,18 @@ PreLaunchCommand::PreLaunchCommand(LaunchTask *parent) : LaunchStep(parent)
 void PreLaunchCommand::executeTask()
 {
     //FIXME: where to put this?
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    auto args = QProcess::splitCommand(m_command);
+    m_parent->substituteVariables(args);
+
+    emit logLine(tr("Running Pre-Launch command: %1").arg(args.join(' ')), MessageLevel::Launcher);
+    const QString program = args.takeFirst();
+    m_process.start(program, args);
+#else
     QString prelaunch_cmd = m_parent->substituteVariables(m_command);
     emit logLine(tr("Running Pre-Launch command: %1").arg(prelaunch_cmd), MessageLevel::Launcher);
     m_process.start(prelaunch_cmd);
+#endif
 }
 
 void PreLaunchCommand::on_state(LoggedProcess::State state)
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 889c6dde..445a1bf0 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -540,7 +540,11 @@ QStringList MinecraftInstance::processMinecraftArgs(
     token_mapping["assets_root"] = absAssetsDir;
     token_mapping["assets_index_name"] = assets->id;
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    QStringList parts = args_pattern.split(' ', Qt::SkipEmptyParts);
+#else
     QStringList parts = args_pattern.split(' ', QString::SkipEmptyParts);
+#endif
     for (int i = 0; i < parts.length(); i++)
     {
         parts[i] = replaceTokensIn(parts[i], token_mapping);
diff --git a/launcher/minecraft/OneSixVersionFormat.cpp b/launcher/minecraft/OneSixVersionFormat.cpp
index 879f18c1..1983b7bb 100644
--- a/launcher/minecraft/OneSixVersionFormat.cpp
+++ b/launcher/minecraft/OneSixVersionFormat.cpp
@@ -296,7 +296,7 @@ QJsonDocument OneSixVersionFormat::versionFileToJson(const VersionFilePtr &patch
     }
     writeString(root, "appletClass", patch->appletClass);
     writeStringList(root, "+tweakers", patch->addTweakers);
-    writeStringList(root, "+traits", patch->traits.toList());
+    writeStringList(root, "+traits", patch->traits.values());
     if (!patch->libraries.isEmpty())
     {
         QJsonArray array;
diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp
index 01d42b00..f0f23625 100644
--- a/launcher/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
@@ -688,7 +688,11 @@ void PackProfile::move(const int index, const MoveDirection direction)
         return;
     }
     beginMoveRows(QModelIndex(), index, index, QModelIndex(), togap);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
+    d->components.swapItemsAt(index, theirIndex);
+#else
     d->components.swap(index, theirIndex);
+#endif
     endMoveRows();
     invalidateLaunchProfile();
     scheduleSave();
diff --git a/launcher/minecraft/ProfileUtils.cpp b/launcher/minecraft/ProfileUtils.cpp
index 8ca24cc8..28299c8f 100644
--- a/launcher/minecraft/ProfileUtils.cpp
+++ b/launcher/minecraft/ProfileUtils.cpp
@@ -141,24 +141,6 @@ bool saveJsonFile(const QJsonDocument doc, const QString & filename)
     return true;
 }
 
-VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo)
-{
-    QFile file(fileInfo.absoluteFilePath());
-    if (!file.open(QFile::ReadOnly))
-    {
-        auto errorStr = QObject::tr("Unable to open the version file %1: %2.").arg(fileInfo.fileName(), file.errorString());
-        return createErrorVersionFile(fileInfo.completeBaseName(), fileInfo.absoluteFilePath(), errorStr);
-    }
-    QJsonDocument doc = QJsonDocument::fromBinaryData(file.readAll());
-    file.close();
-    if (doc.isNull())
-    {
-        file.remove();
-        throw JSONValidationError(QObject::tr("Unable to process the version file %1.").arg(fileInfo.fileName()));
-    }
-    return guardedParseJson(doc, fileInfo.completeBaseName(), fileInfo.absoluteFilePath(), false);
-}
-
 void removeLwjglFromPatch(VersionFilePtr patch)
 {
     auto filter = [](QList<LibraryPtr>& libs)
diff --git a/launcher/minecraft/ProfileUtils.h b/launcher/minecraft/ProfileUtils.h
index 351c36cb..8b80c488 100644
--- a/launcher/minecraft/ProfileUtils.h
+++ b/launcher/minecraft/ProfileUtils.h
@@ -19,9 +19,6 @@ VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder)
 /// Save a JSON file (in any format)
 bool saveJsonFile(const QJsonDocument doc, const QString & filename);
 
-/// Parse a version file in binary JSON format
-VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo);
-
 /// Remove LWJGL from a patch file. This is applied to all Mojang-like profile files.
 void removeLwjglFromPatch(VersionFilePtr patch);
 
diff --git a/launcher/minecraft/WorldList.cpp b/launcher/minecraft/WorldList.cpp
index 955609bf..75d0877e 100644
--- a/launcher/minecraft/WorldList.cpp
+++ b/launcher/minecraft/WorldList.cpp
@@ -195,7 +195,7 @@ QVariant WorldList::data(const QModelIndex &index, int role) const
         switch (column)
         {
             case SizeColumn:
-                return qVariantFromValue<qlonglong>(world.bytes());
+                return QVariant::fromValue<qlonglong>(world.bytes());
 
             default:
                 return data(index, Qt::DisplayRole);
@@ -215,7 +215,7 @@ QVariant WorldList::data(const QModelIndex &index, int role) const
     }
     case SeedRole:
     {
-        return qVariantFromValue<qlonglong>(world.seed());
+        return QVariant::fromValue<qlonglong>(world.seed());
     }
     case NameRole:
     {
@@ -227,7 +227,7 @@ QVariant WorldList::data(const QModelIndex &index, int role) const
     }
     case SizeRole:
     {
-        return qVariantFromValue<qlonglong>(world.bytes());
+        return QVariant::fromValue<qlonglong>(world.bytes());
     }
     case IconFileRole:
     {
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index bc2362a9..0545352b 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -116,9 +116,17 @@ bool ModFolderModel::update()
 
 void ModFolderModel::finishUpdate()
 {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    auto currentList = modsIndex.keys();
+    QSet<QString> currentSet(currentList.begin(), currentList.end());
+    auto & newMods = m_update->mods;
+    auto newList = newMods.keys();
+    QSet<QString> newSet(newList.begin(), newList.end());
+#else
     QSet<QString> currentSet = modsIndex.keys().toSet();
     auto & newMods = m_update->mods;
     QSet<QString> newSet = newMods.keys().toSet();
+#endif
 
     // see if the kept mods changed in some way
     {
diff --git a/launcher/modplatform/flame/PackManifest.h b/launcher/modplatform/flame/PackManifest.h
index 26a48d1c..51fe8888 100644
--- a/launcher/modplatform/flame/PackManifest.h
+++ b/launcher/modplatform/flame/PackManifest.h
@@ -25,7 +25,7 @@ struct File
     bool resolved = false;
     QString fileName;
     QUrl url;
-    QString targetFolder = QLatin1Literal("mods");
+    QString targetFolder = QStringLiteral("mods");
     enum class Type
     {
         Unknown,
diff --git a/launcher/modplatform/legacy_ftb/PrivatePackManager.cpp b/launcher/modplatform/legacy_ftb/PrivatePackManager.cpp
index 501e6003..824798c0 100644
--- a/launcher/modplatform/legacy_ftb/PrivatePackManager.cpp
+++ b/launcher/modplatform/legacy_ftb/PrivatePackManager.cpp
@@ -10,7 +10,13 @@ void PrivatePackManager::load()
 {
     try
     {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        auto foo = QString::fromUtf8(FS::read(m_filename)).split('\n', Qt::SkipEmptyParts);
+        currentPacks = QSet<QString>(foo.begin(), foo.end());
+#else
         currentPacks = QString::fromUtf8(FS::read(m_filename)).split('\n', QString::SkipEmptyParts).toSet();
+#endif
+
         dirty = false;
     }
     catch(...)
@@ -28,7 +34,7 @@ void PrivatePackManager::save() const
     }
     try
     {
-        QStringList list = currentPacks.toList();
+        QStringList list = currentPacks.values();
         FS::write(m_filename, list.join('\n').toUtf8());
         dirty = false;
     }
diff --git a/launcher/net/NetJob.cpp b/launcher/net/NetJob.cpp
index df899178..34927369 100644
--- a/launcher/net/NetJob.cpp
+++ b/launcher/net/NetJob.cpp
@@ -97,7 +97,12 @@ auto NetJob::abort() -> bool
     bool fullyAborted = true;
 
     // fail all downloads on the queue
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    QSet<int> todoSet(m_todo.begin(), m_todo.end());
+    m_failed.unite(todoSet);
+#else
     m_failed.unite(m_todo.toSet());
+#endif
     m_todo.clear();
 
     // abort active downloads
diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp
index 53722d69..bf5a6d43 100644
--- a/launcher/translations/TranslationsModel.cpp
+++ b/launcher/translations/TranslationsModel.cpp
@@ -52,7 +52,7 @@
 
 #include "Application.h"
 
-const static QLatin1Literal defaultLangCode("en_US");
+const static QLatin1String defaultLangCode("en_US");
 
 enum class FileType
 {
@@ -431,9 +431,7 @@ QVariant TranslationsModel::data(const QModelIndex& index, int role) const
             }
             case Column::Completeness:
             {
-                QString text;
-                text.sprintf("%3.1f %%", lang.percentTranslated());
-                return text;
+                return QString("%1%").arg(lang.percentTranslated(), 3, 'f', 1);
             }
         }
     }
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index aeff8073..18e06349 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -42,31 +42,31 @@
 
 #include "MainWindow.h"
 
-#include <QtCore/QVariant>
-#include <QtCore/QUrl>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-
-#include <QtGui/QKeyEvent>
-
-#include <QtWidgets/QAction>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QMainWindow>
-#include <QtWidgets/QStatusBar>
-#include <QtWidgets/QToolBar>
-#include <QtWidgets/QWidget>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QToolButton>
-#include <QtWidgets/QWidgetAction>
-#include <QtWidgets/QProgressDialog>
-#include <QtWidgets/QShortcut>
+#include <QVariant>
+#include <QUrl>
+#include <QDir>
+#include <QFileInfo>
+
+#include <QKeyEvent>
+#include <QAction>
+
+#include <QApplication>
+#include <QButtonGroup>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QMainWindow>
+#include <QStatusBar>
+#include <QToolBar>
+#include <QWidget>
+#include <QMenu>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QInputDialog>
+#include <QLabel>
+#include <QToolButton>
+#include <QWidgetAction>
+#include <QProgressDialog>
+#include <QShortcut>
 
 #include <BaseInstance.h>
 #include <InstanceList.h>
@@ -1494,7 +1494,11 @@ void MainWindow::updateNotAvailable()
 
 QList<int> stringToIntList(const QString &string)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    QStringList split = string.split(',', Qt::SkipEmptyParts);
+#else
     QStringList split = string.split(',', QString::SkipEmptyParts);
+#endif
     QList<int> out;
     for (int i = 0; i < split.size(); ++i)
     {
diff --git a/launcher/ui/dialogs/CopyInstanceDialog.cpp b/launcher/ui/dialogs/CopyInstanceDialog.cpp
index e5113981..8136502b 100644
--- a/launcher/ui/dialogs/CopyInstanceDialog.cpp
+++ b/launcher/ui/dialogs/CopyInstanceDialog.cpp
@@ -39,8 +39,14 @@ CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget *parent)
     ui->iconButton->setIcon(APPLICATION->icons()->getIcon(InstIconKey));
     ui->instNameTextBox->setText(original->name());
     ui->instNameTextBox->setFocus();
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    auto groupList = APPLICATION->instances()->getGroups();
+    QSet<QString> groups(groupList.begin(), groupList.end());
+    groupList = QStringList(groups.values());
+#else
     auto groups = APPLICATION->instances()->getGroups().toSet();
     auto groupList = QStringList(groups.toList());
+#endif
     groupList.sort(Qt::CaseInsensitive);
     groupList.removeOne("");
     groupList.push_front("");
diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp
index 8631edf6..9f32dd8e 100644
--- a/launcher/ui/dialogs/ExportInstanceDialog.cpp
+++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp
@@ -488,7 +488,11 @@ void ExportInstanceDialog::loadPackIgnore()
     }
     auto data = ignoreFile.readAll();
     auto string = QString::fromUtf8(data);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    proxyModel->setBlockedPaths(string.split('\n', Qt::SkipEmptyParts));
+#else
     proxyModel->setBlockedPaths(string.split('\n', QString::SkipEmptyParts));
+#endif
 }
 
 void ExportInstanceDialog::savePackIgnore()
diff --git a/launcher/ui/dialogs/NewComponentDialog.cpp b/launcher/ui/dialogs/NewComponentDialog.cpp
index 1bbafb0c..cd043e1b 100644
--- a/launcher/ui/dialogs/NewComponentDialog.cpp
+++ b/launcher/ui/dialogs/NewComponentDialog.cpp
@@ -46,7 +46,6 @@ NewComponentDialog::NewComponentDialog(const QString & initialName, const QStrin
     connect(ui->nameTextBox, &QLineEdit::textChanged, this, &NewComponentDialog::updateDialogState);
     connect(ui->uidTextBox, &QLineEdit::textChanged, this, &NewComponentDialog::updateDialogState);
 
-    auto groups = APPLICATION->instances()->getGroups().toSet();
     ui->nameTextBox->setFocus();
 
     originalPlaceholderText = ui->uidTextBox->placeholderText();
diff --git a/launcher/ui/dialogs/NewInstanceDialog.cpp b/launcher/ui/dialogs/NewInstanceDialog.cpp
index 05ea091d..c7bcfe6e 100644
--- a/launcher/ui/dialogs/NewInstanceDialog.cpp
+++ b/launcher/ui/dialogs/NewInstanceDialog.cpp
@@ -54,8 +54,14 @@ NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString
     InstIconKey = "default";
     ui->iconButton->setIcon(APPLICATION->icons()->getIcon(InstIconKey));
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    auto groupList = APPLICATION->instances()->getGroups();
+    auto groups = QSet<QString>(groupList.begin(), groupList.end());
+    groupList = groups.values();
+#else
     auto groups = APPLICATION->instances()->getGroups().toSet();
     auto groupList = QStringList(groups.toList());
+#endif
     groupList.sort(Qt::CaseInsensitive);
     groupList.removeOne("");
     groupList.push_front(initialGroup);
diff --git a/launcher/ui/instanceview/InstanceDelegate.cpp b/launcher/ui/instanceview/InstanceDelegate.cpp
index b446e39d..037b7b5e 100644
--- a/launcher/ui/instanceview/InstanceDelegate.cpp
+++ b/launcher/ui/instanceview/InstanceDelegate.cpp
@@ -24,7 +24,7 @@
 #include "InstanceView.h"
 #include "BaseInstance.h"
 #include "InstanceList.h"
-#include <xdgicon.h>
+#include <QIcon>
 #include <QTextEdit>
 
 // Origin: Qt
@@ -61,7 +61,7 @@ void drawSelectionRect(QPainter *painter, const QStyleOptionViewItem &option,
         painter->fillRect(rect, option.palette.brush(QPalette::Highlight));
     else
     {
-        QColor backgroundColor = option.palette.color(QPalette::Background);
+        QColor backgroundColor = option.palette.color(QPalette::Window);
         backgroundColor.setAlpha(160);
         painter->fillRect(rect, QBrush(backgroundColor));
     }
@@ -142,7 +142,7 @@ void drawBadges(QPainter *painter, const QStyleOptionViewItem &option, BaseInsta
                 return;
             }
             // FIXME: inject this.
-            auto icon = XdgIcon::fromTheme(it.next());
+            auto icon = QIcon::fromTheme(it.next());
             // opt.icon.paint(painter, iconbox, Qt::AlignCenter, mode, state);
             const QPixmap pixmap;
             // itemSide
diff --git a/launcher/ui/pages/instance/LogPage.cpp b/launcher/ui/pages/instance/LogPage.cpp
index 8fefb44c..3d9fb025 100644
--- a/launcher/ui/pages/instance/LogPage.cpp
+++ b/launcher/ui/pages/instance/LogPage.cpp
@@ -63,7 +63,7 @@ public:
         {
             case Qt::FontRole:
                 return m_font;
-            case Qt::TextColorRole:
+            case Qt::ForegroundRole:
             {
                 MessageLevel::Enum level = (MessageLevel::Enum) QIdentityProxyModel::data(index, LogModel::LevelRole).toInt();
                 return m_colors->getFront(level);
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp
index 51163e28..75eb5a3f 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.cpp
+++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp
@@ -270,7 +270,7 @@ ScreenshotsPage::ScreenshotsPage(QString path, QWidget *parent)
     ui->listView->setViewMode(QListView::IconMode);
     ui->listView->setResizeMode(QListView::Adjust);
     ui->listView->installEventFilter(this);
-    ui->listView->setEditTriggers(0);
+    ui->listView->setEditTriggers(QAbstractItemView::NoEditTriggers);
     ui->listView->setItemDelegate(new CenteredEditingDelegate(this));
     ui->listView->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(ui->listView, &QListView::customContextMenuRequested, this, &ScreenshotsPage::ShowContextMenu);
diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index 3971d422..b9583d86 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -288,7 +288,11 @@ public:
             return false;
         }
         beginMoveRows(QModelIndex(), row, row, QModelIndex(), row - 1);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
+        m_servers.swapItemsAt(row-1, row);
+#else
         m_servers.swap(row-1, row);
+#endif
         endMoveRows();
         scheduleSave();
         return true;
@@ -306,7 +310,11 @@ public:
             return false;
         }
         beginMoveRows(QModelIndex(), row, row, QModelIndex(), row + 2);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
+        m_servers.swapItemsAt(row+1, row);
+#else
         m_servers.swap(row+1, row);
+#endif
         endMoveRows();
         scheduleSave();
         return true;
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
index c13b1554..2d135e59 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
@@ -168,7 +168,7 @@ QVariant ListModel::data(const QModelIndex &index, int role) const
         ((ListModel *)this)->requestLogo(pack.logo);
         return icon;
     }
-    else if(role == Qt::TextColorRole)
+    else if(role == Qt::ForegroundRole)
     {
         if(pack.broken)
         {
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
index 7667d169..0b180bf3 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
@@ -151,7 +151,7 @@ void Page::openedImpl()
 
         ftbFetchTask->fetch();
         ftbPrivatePacks->load();
-        ftbFetchTask->fetchPrivate(ftbPrivatePacks->getCurrentPackCodes().toList());
+        ftbFetchTask->fetchPrivate(ftbPrivatePacks->getCurrentPackCodes().values());
         initialized = true;
     }
     suggestCurrent();
diff --git a/launcher/ui/widgets/LabeledToolButton.cpp b/launcher/ui/widgets/LabeledToolButton.cpp
index ab2d3278..3866b43f 100644
--- a/launcher/ui/widgets/LabeledToolButton.cpp
+++ b/launcher/ui/widgets/LabeledToolButton.cpp
@@ -80,9 +80,7 @@ QSize LabeledToolButton::sizeHint() const
     if (popupMode() == MenuButtonPopup)
         w += style()->pixelMetric(QStyle::PM_MenuButtonIndicator, &opt, this);
     
-    QSize rawSize = style()->sizeFromContents(QStyle::CT_ToolButton, &opt, QSize(w, h), this);
-    QSize sizeHint = rawSize.expandedTo(QApplication::globalStrut());
-    return sizeHint;
+    return style()->sizeFromContents(QStyle::CT_ToolButton, &opt, QSize(w, h), this);
 }
 
 
diff --git a/launcher/ui/widgets/LogView.cpp b/launcher/ui/widgets/LogView.cpp
index 26a2a527..3bb5c69a 100644
--- a/launcher/ui/widgets/LogView.cpp
+++ b/launcher/ui/widgets/LogView.cpp
@@ -102,7 +102,7 @@ void LogView::rowsInserted(const QModelIndex& parent, int first, int last)
         {
             format.setFont(font.value<QFont>());
         }
-        auto fg = m_model->data(idx, Qt::TextColorRole);
+        auto fg = m_model->data(idx, Qt::ForegroundRole);
         if(fg.isValid())
         {
             format.setForeground(fg.value<QColor>());
diff --git a/launcher/ui/widgets/PageContainer.cpp b/launcher/ui/widgets/PageContainer.cpp
index 2af7d731..ed8df460 100644
--- a/launcher/ui/widgets/PageContainer.cpp
+++ b/launcher/ui/widgets/PageContainer.cpp
@@ -171,7 +171,7 @@ void PageContainer::createUI()
     headerHLayout->addSpacerItem(new QSpacerItem(rightMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
     headerHLayout->setContentsMargins(0, 6, 0, 0);
 
-    m_pageStack->setMargin(0);
+    m_pageStack->setContentsMargins(0, 0, 0, 0);
     m_pageStack->addWidget(new QWidget(this));
 
     m_layout = new QGridLayout;
diff --git a/launcher/ui/widgets/VersionListView.cpp b/launcher/ui/widgets/VersionListView.cpp
index aba0b1a1..ec5d57b0 100644
--- a/launcher/ui/widgets/VersionListView.cpp
+++ b/launcher/ui/widgets/VersionListView.cpp
@@ -136,7 +136,7 @@ void VersionListView::paintInfoLabel(QPaintEvent *event) const
     auto innerBounds = bounds;
     innerBounds.adjust(10, 10, -10, -10);
 
-    QColor background = QApplication::palette().color(QPalette::Foreground);
+    QColor background = QApplication::palette().color(QPalette::WindowText);
     QColor foreground = QApplication::palette().color(QPalette::Base);
     foreground.setAlpha(190);
     painter.setFont(font);