mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 18:09:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

deprecate any qt version older than qt 6.9.3

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2026-01-07 03:04:19 +02:00
parent 250d2a87c9
commit 170d59de2a
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
20 changed files with 76 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/codeql.yml vendored
View file

@ -37,7 +37,7 @@ jobs:
uses: ./.github/actions/setup-dependencies
with:
build-type: Debug
qt-version: 6.4.3
qt-version: 6.9.3
- name: Configure and Build
run: |

4
CMakeLists.txt
View file

@ -36,8 +36,8 @@ set(CMAKE_C_STANDARD 11)
include(GenerateExportHeader)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
add_compile_definitions(QT_WARN_DEPRECATED_UP_TO=0x060400)
add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x060400)
add_compile_definitions(QT_WARN_DEPRECATED_UP_TO=0x060D00)
add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x060903)
if(CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
add_compile_options(

9
launcher/MTPixmapCache.h
View file

@ -88,7 +88,14 @@ class PixmapCache final : public QObject {
QPixmapCache::remove(key);
return true;
}
bool _replace(const QPixmapCache::Key& key, const QPixmap& pixmap) { return QPixmapCache::replace(key, pixmap); }
bool _replace(const QPixmapCache::Key& key, const QPixmap& pixmap)
{
if (!key.isValid())
return false;
remove(key);
const_cast<QPixmapCache::Key&>(key) = insert(pixmap);
return key.isValid();
}
bool _setCacheLimit(int n)
{
QPixmapCache::setCacheLimit(n);

10
launcher/VersionProxyModel.cpp
View file

@ -70,7 +70,15 @@ class VersionFilterModel : public QSortFilterProxyModel {
return true;
}
void filterChanged() { invalidateFilter(); }
void filterChanged()
{
#if QT_VERSION < QT_VERSION_CHECK(6, 10, 0)
invalidateFilter();
#else
beginFilterChange();
endFilterChange();
#endif
}
private:
VersionProxyModel* m_parent;

2
launcher/meta/Version.cpp
View file

@ -38,7 +38,7 @@ QString Meta::Version::typeString() const
QDateTime Meta::Version::time() const
{
return QDateTime::fromMSecsSinceEpoch(m_time * 1000, Qt::UTC);
return QDateTime::fromMSecsSinceEpoch(m_time * 1000, QTimeZone::UTC);
}
void Meta::Version::parse(const QJsonObject& obj)

5
launcher/minecraft/auth/steps/MSADeviceCodeStep.cpp
View file

@ -83,11 +83,6 @@ MSADeviceCodeStep::MSADeviceCodeStep(AccountData* data) : AuthStep(data)
connect(&m_oauth2, &QOAuth2DeviceAuthorizationFlow::clientIdentifierChanged, this,
[this](const QString& clientIdentifier) { m_data->msaClientID = clientIdentifier; });
connect(&m_oauth2, &QOAuth2DeviceAuthorizationFlow::userCodeExpirationAtChanged, this, [](const QDateTime& expiration) {
qDebug() << "=============";
qDebug() << expiration;
qDebug() << "=============";
});
}
QString MSADeviceCodeStep::describe()

2
launcher/minecraft/skins/SkinModel.cpp
View file

@ -71,7 +71,7 @@ static QImage improveSkin(QImage skin)
auto copyRect = [&p, &newSkin](int startX, int startY, int offsetX, int offsetY, int sizeX, int sizeY) {
QImage region = newSkin.copy(startX, startY, sizeX, sizeY);
region = region.mirrored(true, false);
region = region.flipped(Qt::Horizontal);
p.drawImage(startX + offsetX, startY + offsetY, region);
};

9
launcher/modplatform/legacy_ftb/PackFetchTask.cpp
View file

@ -134,12 +134,11 @@ bool PackFetchTask::parseAndAddPacks(QByteArray& data, PackType packType, Modpac
{
QDomDocument doc;
QString errorMsg = "Unknown error.";
int errorLine = -1;
int errorCol = -1;
auto result = doc.setContent(data);
if (!doc.setContent(data, false, &errorMsg, &errorLine, &errorCol)) {
auto fullErrMsg = QString("Failed to fetch modpack data: %1 %2:%3!").arg(errorMsg).arg(errorLine).arg(errorCol);
if (!result) {
auto fullErrMsg =
QString("Failed to fetch modpack data: %1 %2:%3!").arg(result.errorMessage).arg(result.errorLine).arg(result.errorColumn);
qWarning() << fullErrMsg;
return false;
}

14
launcher/news/NewsChecker.cpp
View file

@ -76,18 +76,18 @@ void NewsChecker::rssDownloadFinished()
m_newsNetJob.reset();
QDomDocument doc;
{
// Stuff to store error info in.
QString errorMsg = "Unknown error.";
int errorLine = -1;
int errorCol = -1;
QFile feed(m_entry->getFullPath());
if (feed.open(QFile::ReadOnly | QFile::Text)) {
QTextStream in(&feed);
// Parse the XML.
if (!doc.setContent(in.readAll(), false, &errorMsg, &errorLine, &errorCol)) {
fail(QString("Error parsing RSS feed XML. %1 at %2:%3.").arg(errorMsg).arg(errorLine).arg(errorCol));
auto result = doc.setContent(in.readAll());
if (!result) {
QString fullErrorMsg = QString("Error parsing RSS feed XML. %1 at %2:%3.")
.arg(result.errorMessage)
.arg(result.errorLine)
.arg(result.errorColumn);
fail(fullErrorMsg);
return;
}
}

8
launcher/ui/dialogs/ExportToModListDialog.cpp
View file

@ -47,10 +47,10 @@ ExportToModListDialog::ExportToModListDialog(QString name, QList<Mod*> mods, QWi
enableCustom(false);
connect(ui->formatComboBox, &QComboBox::currentIndexChanged, this, &ExportToModListDialog::formatChanged);
connect(ui->authorsCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
connect(ui->versionCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
connect(ui->urlCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
connect(ui->filenameCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
connect(ui->authorsCheckBox, &QCheckBox::checkStateChanged, this, &ExportToModListDialog::trigger);
connect(ui->versionCheckBox, &QCheckBox::checkStateChanged, this, &ExportToModListDialog::trigger);
connect(ui->urlCheckBox, &QCheckBox::checkStateChanged, this, &ExportToModListDialog::trigger);
connect(ui->filenameCheckBox, &QCheckBox::checkStateChanged, this, &ExportToModListDialog::trigger);
connect(ui->authorsButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Authors); });
connect(ui->versionButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Version); });
connect(ui->urlButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Url); });

2
launcher/ui/dialogs/ExportToModListDialog.h
View file

@ -39,7 +39,7 @@ class ExportToModListDialog : public QDialog {
protected slots:
void formatChanged(int index);
void triggerImp();
void trigger(int) { triggerImp(); };
void trigger(Qt::CheckState) { triggerImp(); };
void addExtra(ExportToModList::OptionalData option);
private:

4
launcher/ui/dialogs/skins/SkinManageDialog.cpp
View file

@ -98,7 +98,7 @@ SkinManageDialog::SkinManageDialog(QWidget* parent, MinecraftAccountPtr acct)
connect(contentsWidget->selectionModel(), &QItemSelectionModel::selectionChanged, this, &SkinManageDialog::selectionChanged);
connect(m_ui->listView, &QListView::customContextMenuRequested, this, &SkinManageDialog::show_context_menu);
connect(m_ui->elytraCB, &QCheckBox::stateChanged, this, [this]() {
connect(m_ui->elytraCB, &QCheckBox::checkStateChanged, this, [this]() {
if (m_skinPreview) {
m_skinPreview->setElytraVisible(m_ui->elytraCB->isChecked());
}
@ -186,7 +186,7 @@ QPixmap previewCape(QImage capeImage, bool elytra = false)
{
if (elytra) {
auto wing = capeImage.copy(34, 2, 12, 20);
QImage mirrored = wing.mirrored(true, false);
QImage mirrored = wing.flipped(Qt::Horizontal);
QImage combined(wing.width() * 2 + 1, wing.height() + 14, capeImage.format());
combined.fill(Qt::transparent);

8
launcher/ui/dialogs/skins/draw/Scene.cpp
View file

@ -96,11 +96,11 @@ Scene::Scene(const QImage& skin, bool slim, const QImage& cape) : QOpenGLFunctio
m_elytra << leftWing << rightWing;
// texture init
m_skinTexture = new QOpenGLTexture(skin.mirrored());
m_skinTexture = new QOpenGLTexture(skin.flipped());
m_skinTexture->setMinificationFilter(QOpenGLTexture::Nearest);
m_skinTexture->setMagnificationFilter(QOpenGLTexture::Nearest);
m_capeTexture = new QOpenGLTexture(cape.mirrored());
m_capeTexture = new QOpenGLTexture(cape.flipped());
m_capeTexture->setMinificationFilter(QOpenGLTexture::Nearest);
m_capeTexture->setMagnificationFilter(QOpenGLTexture::Nearest);
}
@ -162,7 +162,7 @@ void updateTexture(QOpenGLTexture* texture, const QImage& img)
void Scene::setSkin(const QImage& skin)
{
updateTexture(m_skinTexture, skin.mirrored());
updateTexture(m_skinTexture, skin.flipped());
}
void Scene::setMode(bool slim)
@ -171,7 +171,7 @@ void Scene::setMode(bool slim)
}
void Scene::setCape(const QImage& cape)
{
updateTexture(m_capeTexture, cape.mirrored());
updateTexture(m_capeTexture, cape.flipped());
}
void Scene::setCapeVisible(bool visible)
{

2
launcher/ui/java/InstallJavaDialog.cpp
View file

@ -207,7 +207,7 @@ InstallDialog::InstallDialog(const QString& uid, BaseInstance* instance, QWidget
auto recommendedCheckBox = new QCheckBox("Recommended", this);
recommendedCheckBox->setCheckState(Qt::CheckState::Checked);
connect(recommendedCheckBox, &QCheckBox::stateChanged, this, [this](int state) {
connect(recommendedCheckBox, &QCheckBox::checkStateChanged, this, [this](Qt::CheckState state) {
for (BasePage* page : container->getPages()) {
pageCast(page)->setRecommend(state == Qt::Checked);
}

10
launcher/ui/pages/modplatform/CustomPage.cpp
View file

@ -51,11 +51,11 @@ CustomPage::CustomPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(par
ui->setupUi(this);
connect(ui->versionList, &VersionSelectWidget::selectedVersionChanged, this, &CustomPage::setSelectedVersion);
filterChanged();
connect(ui->alphaFilter, &QCheckBox::stateChanged, this, &CustomPage::filterChanged);
connect(ui->betaFilter, &QCheckBox::stateChanged, this, &CustomPage::filterChanged);
connect(ui->snapshotFilter, &QCheckBox::stateChanged, this, &CustomPage::filterChanged);
connect(ui->releaseFilter, &QCheckBox::stateChanged, this, &CustomPage::filterChanged);
connect(ui->experimentsFilter, &QCheckBox::stateChanged, this, &CustomPage::filterChanged);
connect(ui->alphaFilter, &QCheckBox::checkStateChanged, this, &CustomPage::filterChanged);
connect(ui->betaFilter, &QCheckBox::checkStateChanged, this, &CustomPage::filterChanged);
connect(ui->snapshotFilter, &QCheckBox::checkStateChanged, this, &CustomPage::filterChanged);
connect(ui->releaseFilter, &QCheckBox::checkStateChanged, this, &CustomPage::filterChanged);
connect(ui->experimentsFilter, &QCheckBox::checkStateChanged, this, &CustomPage::filterChanged);
connect(ui->refreshBtn, &QPushButton::clicked, this, &CustomPage::refresh);
connect(ui->loaderVersionList, &VersionSelectWidget::selectedVersionChanged, this, &CustomPage::setSelectedLoaderVersion);

5
launcher/ui/widgets/JavaSettingsWidget.cpp
View file

@ -62,9 +62,9 @@ JavaSettingsWidget::JavaSettingsWidget(BaseInstance* instance, QWidget* parent)
if (m_instance == nullptr) {
m_ui->javaDownloadBtn->hide();
if (BuildConfig.JAVA_DOWNLOADER_ENABLED) {
connect(m_ui->autodetectJavaCheckBox, &QCheckBox::stateChanged, this, [this](bool state) {
connect(m_ui->autodetectJavaCheckBox, &QCheckBox::checkStateChanged, this, [this](Qt::CheckState state) {
m_ui->autodownloadJavaCheckBox->setEnabled(state);
if (!state)
if (state != Qt::Checked)
m_ui->autodownloadJavaCheckBox->setChecked(false);
});
} else {
@ -135,7 +135,6 @@ void JavaSettingsWidget::loadSettings()
if (m_instance == nullptr) {
m_ui->skipWizardCheckBox->setChecked(settings->get("IgnoreJavaWizard").toBool());
m_ui->autodetectJavaCheckBox->setChecked(settings->get("AutomaticJavaSwitch").toBool());
m_ui->autodetectJavaCheckBox->stateChanged(m_ui->autodetectJavaCheckBox->isChecked());
m_ui->autodownloadJavaCheckBox->setChecked(settings->get("AutomaticJavaDownload").toBool());
}

4
launcher/ui/widgets/JavaWizardWidget.cpp
View file

@ -152,13 +152,13 @@ void JavaWizardWidget::setupUi()
m_autodownloadCheckBox->setObjectName("autodownloadCheckBox");
m_autodownloadCheckBox->setEnabled(m_autodetectJavaCheckBox->isChecked());
m_veriticalJavaLayout->addWidget(m_autodownloadCheckBox);
connect(m_autodetectJavaCheckBox, &QCheckBox::stateChanged, this, [this] {
connect(m_autodetectJavaCheckBox, &QCheckBox::checkStateChanged, this, [this] {
m_autodownloadCheckBox->setEnabled(m_autodetectJavaCheckBox->isChecked());
if (!m_autodetectJavaCheckBox->isChecked())
m_autodownloadCheckBox->setChecked(false);
});
connect(m_autodownloadCheckBox, &QCheckBox::stateChanged, this, [this] {
connect(m_autodownloadCheckBox, &QCheckBox::checkStateChanged, this, [this] {
auto isChecked = m_autodownloadCheckBox->isChecked();
m_versionWidget->setVisible(!isChecked);
m_javaStatusBtn->setVisible(!isChecked);

4
launcher/ui/widgets/LanguageSelectionWidget.cpp
View file

@ -35,8 +35,8 @@ LanguageSelectionWidget::LanguageSelectionWidget(QWidget* parent) : QWidget(pare
formatCheckbox = new QCheckBox(this);
formatCheckbox->setObjectName(QStringLiteral("formatCheckbox"));
formatCheckbox->setCheckState(APPLICATION->settings()->get("UseSystemLocale").toBool() ? Qt::Checked : Qt::Unchecked);
connect(formatCheckbox, &QCheckBox::stateChanged,
[this]() { APPLICATION->translations()->setUseSystemLocale(formatCheckbox->isChecked()); });
connect(formatCheckbox, &QCheckBox::checkStateChanged,
[this] { APPLICATION->translations()->setUseSystemLocale(formatCheckbox->isChecked()); });
verticalLayout->addWidget(formatCheckbox);
auto translations = APPLICATION->translations();

2
launcher/ui/widgets/MinecraftSettingsWidget.cpp
View file

@ -118,7 +118,7 @@ MinecraftSettingsWidget::MinecraftSettingsWidget(MinecraftInstance* instance, QW
for (auto c : { m_ui->neoForge, m_ui->forge, m_ui->fabric, m_ui->quilt, m_ui->liteLoader, m_ui->babric, m_ui->btaBabric,
m_ui->legacyFabric, m_ui->ornithe, m_ui->rift }) {
connect(c, &QCheckBox::stateChanged, this, &MinecraftSettingsWidget::saveSelectedLoaders);
connect(c, &QCheckBox::checkStateChanged, this, &MinecraftSettingsWidget::saveSelectedLoaders);
}
}

38
launcher/ui/widgets/ModFilterWidget.cpp
View file

@ -140,21 +140,21 @@ ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended)
ui->versions->setStyleSheet("combobox-popup: 0;");
ui->version->setStyleSheet("combobox-popup: 0;");
connect(ui->showAllVersions, &QCheckBox::stateChanged, this, &ModFilterWidget::onShowAllVersionsChanged);
connect(ui->showAllVersions, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onShowAllVersionsChanged);
connect(ui->versions, &QComboBox::currentIndexChanged, this, &ModFilterWidget::onVersionFilterChanged);
connect(ui->versions, &CheckComboBox::checkedItemsChanged, this, [this] { onVersionFilterChanged(0); });
connect(ui->version, &QComboBox::currentTextChanged, this, &ModFilterWidget::onVersionFilterTextChanged);
connect(ui->neoForge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->forge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->fabric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->quilt, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->liteLoader, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->babric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->btaBabric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->legacyFabric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->ornithe, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->rift, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->neoForge, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->forge, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->fabric, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->quilt, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->liteLoader, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->babric, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->btaBabric, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->legacyFabric, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->ornithe, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->rift, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->showMoreButton, &QPushButton::clicked, this, &ModFilterWidget::onShowMoreClicked);
@ -164,17 +164,17 @@ ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended)
}
if (extended) {
connect(ui->clientSide, &QCheckBox::stateChanged, this, &ModFilterWidget::onSideFilterChanged);
connect(ui->serverSide, &QCheckBox::stateChanged, this, &ModFilterWidget::onSideFilterChanged);
connect(ui->clientSide, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onSideFilterChanged);
connect(ui->serverSide, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onSideFilterChanged);
}
connect(ui->hideInstalled, &QCheckBox::stateChanged, this, &ModFilterWidget::onHideInstalledFilterChanged);
connect(ui->openSource, &QCheckBox::stateChanged, this, &ModFilterWidget::onOpenSourceFilterChanged);
connect(ui->hideInstalled, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onHideInstalledFilterChanged);
connect(ui->openSource, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onOpenSourceFilterChanged);
connect(ui->releaseCb, &QCheckBox::stateChanged, this, &ModFilterWidget::onReleaseFilterChanged);
connect(ui->betaCb, &QCheckBox::stateChanged, this, &ModFilterWidget::onReleaseFilterChanged);
connect(ui->alphaCb, &QCheckBox::stateChanged, this, &ModFilterWidget::onReleaseFilterChanged);
connect(ui->unknownCb, &QCheckBox::stateChanged, this, &ModFilterWidget::onReleaseFilterChanged);
connect(ui->releaseCb, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onReleaseFilterChanged);
connect(ui->betaCb, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onReleaseFilterChanged);
connect(ui->alphaCb, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onReleaseFilterChanged);
connect(ui->unknownCb, &QCheckBox::checkStateChanged, this, &ModFilterWidget::onReleaseFilterChanged);
setHidden(true);
loadVersionList();