prismlauncher: add patch for qt 6.6 support
This commit is contained in:
parent
03a0b60226
commit
864c11de15
2 changed files with 39 additions and 1 deletions
|
@ -0,0 +1,36 @@
|
|||
From c39637720109dd5d97750907c51e9c0fb8f43f0b Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Wed, 11 Oct 2023 22:51:23 -0400
|
||||
Subject: [PATCH] launcher/translations: explicitly convert QVector iterators
|
||||
to pointers
|
||||
|
||||
---
|
||||
launcher/translations/TranslationsModel.cpp | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp
|
||||
index 2763cca2..64c21dbd 100644
|
||||
--- a/launcher/translations/TranslationsModel.cpp
|
||||
+++ b/launcher/translations/TranslationsModel.cpp
|
||||
@@ -524,7 +524,7 @@ Language * TranslationsModel::findLanguage(const QString& key)
|
||||
}
|
||||
else
|
||||
{
|
||||
- return found;
|
||||
+ return &(*found);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -655,8 +655,7 @@ QModelIndex TranslationsModel::selectedIndex()
|
||||
auto found = findLanguage(d->m_selectedLanguage);
|
||||
if(found)
|
||||
{
|
||||
- // QVector iterator freely converts to pointer to contained type
|
||||
- return index(found - d->m_languages.begin(), 0, QModelIndex());
|
||||
+ return index(found - &(*d->m_languages.begin()), 0, QModelIndex());
|
||||
}
|
||||
return QModelIndex();
|
||||
}
|
||||
--
|
||||
2.42.0
|
||||
|
|
@ -42,7 +42,9 @@ rec {
|
|||
sha256 = "sha256-RArg60S91YKp1Mt97a5JNfBEOf2cmuX4pK3VAx2WfqM=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
patches = [
|
||||
./0001-launcher-translations-explicitly-convert-QVector-ite.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# https://github.com/PrismLauncher/PrismLauncher/pull/1452
|
||||
# These patches allow us to disable the Sparkle updater and cmake bundling
|
||||
# TODO: remove these when updating to 8.0
|
||||
|
|
Loading…
Reference in a new issue