From a449aa86e9f1758b5661fba640a626bc12080988 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 28 Dec 2022 21:35:11 +0100 Subject: Qt6 (#824) * Major cleanup of screenshake code * Add pre-5.10 support for screenshake math * more compat, uglier too * add surprise tool * we don't need inline functions * only run qsrand on old versions * Squash compiler warnings * >= not > please * don't set codec in qt6 * switch to new regex * remove qdesktopwidget (was unused) * make enter event an enter event * forgot header file * rename emote_mod enum as there is an enum of the same name in chat_message * regexp * no more codec * fix warning about emote_mod type * change to new qtconcurrent * misc was unused * fix run * change qtconcurrent for music * codecs came back * make CI run on qt6 too * seperate artifacts * qFormatLogMessage is wonky here * maybe actually use the qt version from matrix * change qt version here as well * even lower * use my own fixed installer * use my own fixed version of qapng * get websockets * minor spelling mistake * yOu nEeD aDdOnS * aaaaaaaaaaaaaaaaaaaaaaaaaaaaa * Revert "maybe actually use the qt version from matrix" This reverts commit 7ab6b1b4c2f1200318d52f325efd2ef46c3fbd6a. * Revert "Revert "maybe actually use the qt version from matrix"" This reverts commit a6f7c5bedf214a1992c15b296edd195f96a9196a. * use jurplels again * Revert "use jurplels again" This reverts commit 5795474bca64590f1479af3ccbf7d8cc57f427e7. * revert CI to master * main not master Co-authored-by: in1tiate --- src/evidence.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/evidence.cpp') diff --git a/src/evidence.cpp b/src/evidence.cpp index 4bff79d7..337e8303 100644 --- a/src/evidence.cpp +++ b/src/evidence.cpp @@ -800,7 +800,9 @@ void Courtroom::evidence_load(QString filename) return; } QSettings inventory(filename, QSettings::IniFormat); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) inventory.setIniCodec("UTF-8"); +#endif private_evidence_list.clear(); foreach (QString evi, inventory.childGroups()) { if (evi == "General") @@ -825,7 +827,9 @@ void Courtroom::evidence_save(QString filename) } QSettings inventory(filename, QSettings::IniFormat); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) inventory.setIniCodec("UTF-8"); +#endif inventory.clear(); for (int i = 0; i < private_evidence_list.size(); i++) { inventory.beginGroup(QString::number(i)); -- cgit