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/demoserver.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/demoserver.cpp') diff --git a/src/demoserver.cpp b/src/demoserver.cpp index feca7c6d..bc7da1c1 100644 --- a/src/demoserver.cpp +++ b/src/demoserver.cpp @@ -79,8 +79,11 @@ void DemoServer::recv_data() { QString in_data = QString::fromUtf8(client_sock->readAll()); - // Copypasted from NetworkManager +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + const QStringList packet_list = in_data.split("%", QString::SplitBehavior(QString::SkipEmptyParts)); +#else const QStringList packet_list = in_data.split("%", Qt::SkipEmptyParts); +#endif for (const QString &packet : packet_list) { QStringList f_contents; @@ -288,7 +291,9 @@ void DemoServer::load_demo(QString filename) p_path = filename; // Process the demo file QTextStream demo_stream(&demo_file); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) demo_stream.setCodec("UTF-8"); +#endif QString line = demo_stream.readLine(); while (!line.isNull()) { while (!line.endsWith("%")) { @@ -330,7 +335,9 @@ void DemoServer::load_demo(QString filename) if (demo_file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) { QTextStream out(&demo_file); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) out.setCodec("UTF-8"); +#endif out << p_demo_data.dequeue(); for (const QString &line : qAsConst(p_demo_data)) { out << "\n" << line; -- cgit