Update MO2 beta 12 integration

10 files changed, 19 insertions, 15 deletions

diff --git a/libs/basic_games/README.md b/libs/basic_games/README.md
index 2c0e98b..f8cb397 100644
--- a/libs/basic_games/README.md
+++ b/libs/basic_games/README.md
@@ -80,7 +80,7 @@ You can rename `modorganizer-basic_games-xxx` to whatever you want (e.g., `basic
 | Tony Hawk's Underground 2 | [uwx](https://github.com/uwx) | [game_thug2.py](games/game_thug2.py) | |
 | Trackmania United Forever — [STEAM](https://store.steampowered.com/app/7200/Trackmania_United_Forever/) | [uwx](https://github.com/uwx) | [game_tmuf.py](games/game_tmuf.py) | |
 | Yu-Gi-Oh! Master Duel — [STEAM](https://store.steampowered.com/app/1449850/) | [The Conceptionist](https://github.com/the-conceptionist) & [uwx](https://github.com/uwx) | [game_masterduel.py](games/game_masterduel.py) | |
-| Zeus and Poseidon — [GOG](https://www.gog.com/game/zeus_poseidon) / [STEAM](https://store.steampowered.com/app/566050/Zeus__Poseidon/) | [Holt59](https://github.com/holt59/) | [game_zeusandpoiseidon.py](games/game_zeusandpoiseidon.py) | <ul><li>mod data checker</li></ul> |
+| Zeus and Poseidon — [GOG](https://www.gog.com/game/zeus_poseidon) / [STEAM](https://store.steampowered.com/app/566050/Zeus__Poseidon/) | [Holt59](https://github.com/holt59/) | [game_zeusandposeidon.py](games/game_zeusandposeidon.py) | <ul><li>mod data checker</li></ul> |
 
 ## How to add a new game?
 
diff --git a/libs/basic_games/games/game_darkestdungeon.py b/libs/basic_games/games/game_darkestdungeon.py
index 5c3ae4e..cfe429a 100644
--- a/libs/basic_games/games/game_darkestdungeon.py
+++ b/libs/basic_games/games/game_darkestdungeon.py
@@ -166,7 +166,7 @@ class DarkestDungeonGame(BasicGame):
     GameNexusName = "darkestdungeon"
     GameNexusId = 804
     GameSteamId = 262060
-    GameGogId = 1719198803
+    GameGogId = 1450711444
     GameBinary = "_windows/win64/Darkest.exe"
     GameDataPath = ""
     GameDocumentsDirectory = "%DOCUMENTS%/Darkest"
diff --git a/libs/cmake_common/mo2_versions.cmake b/libs/cmake_common/mo2_versions.cmake
index ee432f4..6d957ff 100644
--- a/libs/cmake_common/mo2_versions.cmake
+++ b/libs/cmake_common/mo2_versions.cmake
@@ -19,7 +19,7 @@ if (NOT DEFINED MO2_QT_VERSION)
 	if (Qt6_FOUND)
 		set(MO2_QT_VERSION "${Qt6_VERSION}")
 	else()
-		set(MO2_QT_VERSION "6.7.3")
+		set(MO2_QT_VERSION "6.11.1")
 	endif()
 endif()
 
@@ -33,8 +33,8 @@ message(STATUS "[MO2] Qt version: ${MO2_QT_VERSION} (${MO2_QT_VERSION_MAJOR}, ${
 
 mo2_set_if_not_defined(MO2_PYTHON_VERSION "3.12")
 
-if (MO2_QT_VERSION_MAJOR EQUAL 6 AND MO2_QT_VERSION_MINOR EQUAL 10)
-    mo2_set_if_not_defined(MO2_PYQT_VERSION "6.10.2")
+if (MO2_QT_VERSION_MAJOR EQUAL 6 AND MO2_QT_VERSION_MINOR EQUAL 11)
+    mo2_set_if_not_defined(MO2_PYQT_VERSION "6.11.1")
     mo2_set_if_not_defined(MO2_SIP_VERSION "6.15.1")
 else()
     mo2_set_if_not_defined(MO2_PYQT_VERSION "6.7.1")
diff --git a/libs/installer_bsplugins/src/BSPluginInfo/RecordFilterProxyModel.cpp b/libs/installer_bsplugins/src/BSPluginInfo/RecordFilterProxyModel.cpp
index 919e8c9..7c8bc95 100644
--- a/libs/installer_bsplugins/src/BSPluginInfo/RecordFilterProxyModel.cpp
+++ b/libs/installer_bsplugins/src/BSPluginInfo/RecordFilterProxyModel.cpp
@@ -22,7 +22,8 @@ void RecordFilterProxyModel::setFile(const QString& pluginName)
 void RecordFilterProxyModel::setFilterFlags(FilterFlags filterFlags)
 {
   m_FilterFlags = filterFlags;
-  invalidateRowsFilter();
+  beginFilterChange();
+  endFilterChange(QSortFilterProxyModel::Direction::Rows);
 }
 
 void RecordFilterProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
@@ -46,7 +47,8 @@ void RecordFilterProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
 void RecordFilterProxyModel::onSourceDataChanged()
 {
   if (dynamicSortFilter()) {
-    invalidateRowsFilter();
+    beginFilterChange();
+    endFilterChange(QSortFilterProxyModel::Direction::Rows);
   }
 }
 
diff --git a/libs/installer_bsplugins/src/BSPluginList/PluginSortFilterProxyModel.cpp b/libs/installer_bsplugins/src/BSPluginList/PluginSortFilterProxyModel.cpp
index 29de392..d3cf8e3 100644
--- a/libs/installer_bsplugins/src/BSPluginList/PluginSortFilterProxyModel.cpp
+++ b/libs/installer_bsplugins/src/BSPluginList/PluginSortFilterProxyModel.cpp
@@ -9,7 +9,8 @@ namespace BSPluginList
 void PluginSortFilterProxyModel::hideForceEnabledFiles(bool doHide)
 {
   m_HideForceEnabledFiles = doHide;
-  invalidateRowsFilter();
+  beginFilterChange();
+  endFilterChange(QSortFilterProxyModel::Direction::Rows);
 }
 
 bool PluginSortFilterProxyModel::filterMatchesPlugin(const QString& plugin) const
@@ -116,7 +117,8 @@ bool PluginSortFilterProxyModel::lessThan(const QModelIndex& source_left,
 void PluginSortFilterProxyModel::updateFilter(const QString& filter)
 {
   m_CurrentFilter = filter;
-  invalidateRowsFilter();
+  beginFilterChange();
+  endFilterChange(QSortFilterProxyModel::Direction::Rows);
 }
 
 }  // namespace BSPluginList
diff --git a/libs/installer_bsplugins/src/GUI/IconDelegate.cpp b/libs/installer_bsplugins/src/GUI/IconDelegate.cpp
index ff99405..84184cc 100644
--- a/libs/installer_bsplugins/src/GUI/IconDelegate.cpp
+++ b/libs/installer_bsplugins/src/GUI/IconDelegate.cpp
@@ -23,7 +23,7 @@ IconDelegate::IconDelegate(QTreeView* view, int column, int compactSize)
 {
   if (view) {
     connect(view->header(), &QHeaderView::sectionResized,
-            [=](int logicalIndex, [[maybe_unused]] int oldSize, int newSize) {
+            [this](int logicalIndex, [[maybe_unused]] int oldSize, int newSize) {
               if (logicalIndex == m_Column) {
                 m_Compact = newSize < m_CompactSize;
               }
diff --git a/libs/installer_bsplugins/src/TESData/PluginList.cpp b/libs/installer_bsplugins/src/TESData/PluginList.cpp
index 805261c..28a6a40 100644
--- a/libs/installer_bsplugins/src/TESData/PluginList.cpp
+++ b/libs/installer_bsplugins/src/TESData/PluginList.cpp
@@ -1052,7 +1052,7 @@ void PluginList::scanDataFiles(bool invalidate)
         std::make_shared<FileInfo>(this, filename, forceLoaded, forceEnabled,
                                    forceDisabled, lightPluginsAreSupported));
 
-    auto assocTask = std::async(std::launch::async, [=, &smph] {
+    auto assocTask = std::async(std::launch::async, [this, info, tree, &smph] {
       smph.acquire();
       checkBsa(*info, tree);
       checkIni(*info, tree);
diff --git a/libs/installer_bsplugins/src/TESFile/Type.h b/libs/installer_bsplugins/src/TESFile/Type.h
index 3b93b20..a2867ae 100644
--- a/libs/installer_bsplugins/src/TESFile/Type.h
+++ b/libs/installer_bsplugins/src/TESFile/Type.h
@@ -68,7 +68,7 @@ namespace literals
   {
     return T;
   }
-  static_assert("TES4"_ts.value == '4SET');
+  static_assert("TES4"_ts.value == 0x34534554);
   static_assert("AMMO"_ts < "BOOK"_ts);
 }  // namespace literals
 }  // namespace TESFile
diff --git a/libs/preview_nif/src/NifWidget.cpp b/libs/preview_nif/src/NifWidget.cpp
index d224d04..8f24dcf 100644
--- a/libs/preview_nif/src/NifWidget.cpp
+++ b/libs/preview_nif/src/NifWidget.cpp
@@ -99,7 +99,7 @@ void NifWidget::initializeGL()
             this,
             [](const QOpenGLDebugMessage& debugMessage){
                 auto msg = tr("OpenGL debug message: %1").arg(debugMessage.message());
-                qDebug(qUtf8Printable(msg));
+                qDebug("%s", qUtf8Printable(msg));
             });
     }
 
diff --git a/libs/preview_nif/src/PreviewNif.cpp b/libs/preview_nif/src/PreviewNif.cpp
index 8e7e03a..dfb14a1 100644
--- a/libs/preview_nif/src/PreviewNif.cpp
+++ b/libs/preview_nif/src/PreviewNif.cpp
@@ -56,7 +56,7 @@ QWidget* PreviewNif::genFilePreview(const QString& fileName, const QSize&) const
     auto nifFile = std::make_shared<nifly::NifFile>(path);
 
     if (!nifFile->IsValid()) {
-        qWarning(qUtf8Printable(tr("Failed to load file: %1").arg(fileName)));
+        qWarning("%s", qUtf8Printable(tr("Failed to load file: %1").arg(fileName)));
         return nullptr;
     }
 
@@ -71,7 +71,7 @@ QWidget* PreviewNif::genDataPreview(const QByteArray& fileData,
 
     auto nifFile = std::make_shared<nifly::NifFile>();
     if (nifFile->Load(stream) != 0 || !nifFile->IsValid()) {
-        qWarning(qUtf8Printable(tr("Failed to load file: %1").arg(fileName)));
+        qWarning("%s", qUtf8Printable(tr("Failed to load file: %1").arg(fileName)));
         return nullptr;
     }