Skip to content

Commit

Permalink
Achieve compatibility with Qt 5.15.15
Browse files Browse the repository at this point in the history
  • Loading branch information
Pedro-Beirao committed Nov 11, 2024
1 parent 4bc5ed3 commit dde94db
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/[email protected]

- name: Install Qt Static
# You may pin to the exact commit or the version.
# uses: orestonce/install-qt-static@291bbc9e06c49a197d03164fdf18866fe6d136da
- name: install qt static
uses: orestonce/[email protected]
with:
# Version of Qt to install
version: Qt6.5.3-Windows-x86_64-MinGW13.2.0-ucrt-staticFull-20240527


Expand Down Expand Up @@ -118,7 +115,7 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: mac
path: src/build/dsda-launcher.app
path: src/build/



5 changes: 4 additions & 1 deletion src/dsda-launcher.pro
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ FORMS += \
win32 {
CONFIG += c++11
RC_ICONS = icons/dsda-launcher.ico
QMAKE_LFLAGS += -static-libgcc -static-libstdc++ -static

static {
QMAKE_LFLAGS += -static-libgcc -static-libstdc++ -static
}
}

mac {
Expand Down
2 changes: 1 addition & 1 deletion src/endoom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void endoom::showEndoom(QString consoleOutput)
{
QStringList cs = qsl[i].split("\033");

QString character = cs.last()[cs.last().size() - 1];
QString character = QString(cs.last()[cs.last().size() - 1]);

QString foreground, background;
for (int j = 0; j < cs.size() - 1; j++)
Expand Down
6 changes: 3 additions & 3 deletions src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ void MainWindow::on_launchGame_pushButton_clicked(bool returnTooltip, QString ex
foreach (QString p, arguments)
{
int lastBar = 0;
for (qsizetype i = 0; i < p.length(); i++)
for (int i = 0; i < p.length(); i++)
{
if (p[i] == QDir::separator())
{
Expand Down Expand Up @@ -612,7 +612,7 @@ void MainWindow::Launch(QStringList arguments)

#if defined Q_OS_MACOS
QString gamePath = getGamePath();
QFile port = QFile(getGamePath());
QFile port(getGamePath());
qDebug() << gamePath;
if (port.exists())
{
Expand Down Expand Up @@ -684,7 +684,7 @@ void MainWindow::SaveHistory(QStringList args)
for (qsizetype i = 0; i < args.size(); i++)
checksumString += args.at(i);
QByteArray checksumByteArray = checksumString.toLatin1();
checksum = qChecksum(checksumByteArray.data());
checksum = qChecksum(checksumByteArray.data(), checksumByteArray.length());

QFile file(historyListWindow->historyPath);
file.open(QIODevice::ReadOnly | QIODevice::Text);
Expand Down
2 changes: 1 addition & 1 deletion src/mainwindow_bottom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ void MainWindow::on_additionalArguments_pushButton_clicked()

QString path = getGamePath();

QFile port = QFile(path);
QFile port(path);
if (port.exists())
{
#if defined Q_OS_MACOS
Expand Down
2 changes: 1 addition & 1 deletion src/updater.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ QString getGameVersion()
process->waitForFinished();
process->deleteLater();

QList output = process->readAll().split(' ');
QList<QByteArray> output = process->readAll().split(' ');

if (output.size() >= 2) return output[1];
else return "";
Expand Down
1 change: 1 addition & 0 deletions src/updater.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "funcs.h"
#include <QCommandLineParser>
#include <QDir>
#include <QList>
#include <QProcess>
#include <QRegularExpression>
#include <QRegularExpressionMatchIterator>
Expand Down

0 comments on commit dde94db

Please sign in to comment.