Merge remote-tracking branch 'origin/qt6' into update-cmake-common-qt6

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
 if(DEFINED DEPENDENCIES_DIR)
 	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
 else()
-	include(${CMAKE_CURRENT_LIST_DIR}/cmake_common/mo2.cmake)
+	include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
 endif()
 
 project(basic_games LANGUAGES NONE)

README.md

@@ -79,7 +79,7 @@ You need to create a class that inherits `BasicGame` and put it in a `game_XX.py
 Below is an example for The Witcher 3 (see also [games/game_witcher3.py](games/game_witcher3.py)):
 
 ```python
-from PyQt5.QtCore import QDir
+from PyQt6.QtCore import QDir
 from ..basic_game import BasicGame
 
 
@@ -106,7 +106,7 @@ to the `version` method, see the table below). If you override the method, you d
 not have to provide the attribute:
 
 ```python
-from PyQt5.QtCore import QDir
+from PyQt6.QtCore import QDir
 from ..basic_game import BasicGame
 
 import mobase

basic_features/basic_save_game_info.py

@@ -4,9 +4,9 @@ import sys
 from pathlib import Path
 from typing import Callable, List, Optional
 
-from PyQt5.QtCore import QDateTime, Qt
-from PyQt5.QtGui import QImage, QPixmap
-from PyQt5.QtWidgets import QLabel, QVBoxLayout, QWidget
+from PyQt6.QtCore import QDateTime, Qt
+from PyQt6.QtGui import QImage, QPixmap
+from PyQt6.QtWidgets import QLabel, QVBoxLayout, QWidget
 
 import mobase
 

basic_game.py

@@ -5,8 +5,8 @@ import sys
 from pathlib import Path
 from typing import Callable, Dict, Generic, List, Optional, TypeVar, Union
 
-from PyQt5.QtCore import QDir, QFileInfo, QStandardPaths
-from PyQt5.QtGui import QIcon
+from PyQt6.QtCore import QDir, QFileInfo, QStandardPaths
+from PyQt6.QtGui import QIcon
 
 import mobase
 
@@ -19,12 +19,12 @@ def replace_variables(value: str, game: "BasicGame") -> str:
     if value.find("%DOCUMENTS%") != -1:
         value = value.replace(
             "%DOCUMENTS%",
-            QStandardPaths.writableLocation(QStandardPaths.DocumentsLocation),
+            QStandardPaths.writableLocation(QStandardPaths.StandardLocation.DocumentsLocation),
         )
     if value.find("%USERPROFILE%") != -1:
         value = value.replace(
             "%USERPROFILE%",
-            QStandardPaths.writableLocation(QStandardPaths.HomeLocation),
+            QStandardPaths.writableLocation(QStandardPaths.StandardLocation.HomeLocation),
         )
     if value.find("%GAME_DOCUMENTS%") != -1:
         value = value.replace(
@@ -211,11 +211,11 @@ class BasicGameMappings:
 
         folders = [
             "{}/My Games/{}".format(
-                QStandardPaths.writableLocation(QStandardPaths.DocumentsLocation),
+                QStandardPaths.writableLocation(QStandardPaths.StandardLocation.DocumentsLocation),
                 game.gameName(),
             ),
             "{}/{}".format(
-                QStandardPaths.writableLocation(QStandardPaths.DocumentsLocation),
+                QStandardPaths.writableLocation(QStandardPaths.StandardLocation.DocumentsLocation),
                 game.gameName(),
             ),
         ]
@@ -501,10 +501,13 @@ class BasicGame(mobase.IPluginGame):
     def initializeProfile(self, path: QDir, settings: int):
         if settings & mobase.ProfileSetting.CONFIGURATION:
             for iniFile in self.iniFiles():
-                shutil.copyfile(
-                    self.documentsDirectory().absoluteFilePath(iniFile),
-                    path.absoluteFilePath(QFileInfo(iniFile).fileName()),
-                )
+                try:
+                    shutil.copyfile(
+                        self.documentsDirectory().absoluteFilePath(iniFile),
+                        path.absoluteFilePath(QFileInfo(iniFile).fileName()),
+                    )
+                except FileNotFoundError:
+                    Path(path.absoluteFilePath(QFileInfo(iniFile).fileName())).touch()
 
     def primarySources(self):
         return []

games/game_blackandwhite2.py

@@ -7,8 +7,8 @@ import time
 from pathlib import Path
 from typing import List
 
-from PyQt5.QtCore import QDir, QFileInfo, QFile, QDateTime, Qt
-from PyQt5.QtGui import QPixmap, QPainter
+from PyQt6.QtCore import QDir, QFileInfo, QFile, QDateTime, Qt
+from PyQt6.QtGui import QPixmap, QPainter
 
 import mobase
 

games/game_da2.py

@@ -1,4 +1,4 @@
-from PyQt5.QtCore import QDir
+from PyQt6.QtCore import QDir
 from ..basic_game import BasicGame
 
 import mobase

games/game_darkestdungeon.py

@@ -3,7 +3,7 @@ import json
 from pathlib import Path
 from typing import List
 
-from PyQt5.QtCore import QDir, QFileInfo, QStandardPaths
+from PyQt6.QtCore import QDir, QFileInfo, QStandardPaths
 
 import mobase
 

games/game_darkmessiahofmightandmagic.py

@@ -2,7 +2,7 @@
 
 import struct
 
-from PyQt5.QtGui import QImage
+from PyQt6.QtGui import QImage
 
 import mobase
 

games/game_dungeonsiege2.py

@@ -2,7 +2,7 @@
 
 from typing import List, Tuple
 
-from PyQt5.QtCore import QFileInfo
+from PyQt6.QtCore import QFileInfo
 
 import mobase
 

games/game_gta-3-de.py

@@ -1,7 +1,7 @@
 import os
 
 from pathlib import Path
-from PyQt5.QtCore import QDir, QFileInfo
+from PyQt6.QtCore import QDir, QFileInfo
 
 import mobase
 

games/game_gta-san-andreas-de.py

@@ -1,7 +1,7 @@
 import os
 
 from pathlib import Path
-from PyQt5.QtCore import QDir, QFileInfo
+from PyQt6.QtCore import QDir, QFileInfo
 
 import mobase
 

games/game_gta-vice-city-de.py

@@ -1,7 +1,7 @@
 import os
 
 from pathlib import Path
-from PyQt5.QtCore import QDir, QFileInfo
+from PyQt6.QtCore import QDir, QFileInfo
 
 import mobase
 

games/game_kingdomcomedeliverance.py

@@ -2,7 +2,7 @@
 
 import os
 
-from PyQt5.QtCore import QDir
+from PyQt6.QtCore import QDir
 
 from ..basic_game import BasicGame
 

games/game_masterduel.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-from PyQt5.QtCore import QFileInfo, QDir
+from PyQt6.QtCore import QFileInfo, QDir
 from typing import List, Optional, cast
 from os.path import join, exists
 

games/game_mountandblade2.py

@@ -2,7 +2,7 @@
 
 from typing import List
 
-from PyQt5.QtCore import QFileInfo
+from PyQt6.QtCore import QFileInfo
 
 import mobase
 

games/game_msfs2020.py

@@ -1,7 +1,7 @@
 import os
 import re
 
-from PyQt5.QtCore import QDir
+from PyQt6.QtCore import QDir
 
 from ..basic_game import BasicGame
 

games/game_nomanssky.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-from PyQt5.QtCore import QFileInfo
+from PyQt6.QtCore import QFileInfo
 
 import mobase
 

games/game_stalkeranomaly.py

@@ -4,8 +4,8 @@ from pathlib import Path
 from typing import List
 from enum import IntEnum
 
-from PyQt5.QtCore import Qt, QDir, QFileInfo
-from PyQt5.QtWidgets import QLabel, QVBoxLayout, QWidget
+from PyQt6.QtCore import Qt, QDir, QFileInfo
+from PyQt6.QtWidgets import QLabel, QVBoxLayout, QWidget
 
 import mobase
 

games/game_stardewvalley.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-from PyQt5.QtCore import QFileInfo
+from PyQt6.QtCore import QFileInfo
 
 import mobase
 

games/game_starsector.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import List
 
-from PyQt5.QtCore import QDir
+from PyQt6.QtCore import QDir
 
 import mobase