3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-02 02:42:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

[qt6] Replace all PySide2/shiboken2 imports by PySide6/shiboken6

Browse source
This commit is contained in:
Candice Bentéjac 2024-10-01 12:18:17 +02:00
parent f07c92472b
commit 579371fd7c
17 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meshroom/ui/utils.py
View file

@ -1,12 +1,12 @@
import os
import time
from PySide2.QtCore import QFileSystemWatcher, QUrl, Slot, QTimer, Property, QObject
from PySide2.QtQml import QQmlApplicationEngine
from PySide6.QtCore import QFileSystemWatcher, QUrl, Slot, QTimer, Property, QObject
from PySide6.QtQml import QQmlApplicationEngine
try:
from PySide2 import shiboken2
from PySide6 import shiboken6
except Exception:
import shiboken2
import shiboken6
class QmlInstantEngine(QQmlApplicationEngine):
@ -237,7 +237,7 @@ def makeProperty(T, attributeName, notify=None, resetOnDestroy=False):
setattr(instance, resetCallbackName, lambda self=instance, *args: setter(self, None))
resetCallback = getattr(instance, resetCallbackName, None)
if resetCallback and currentValue and shiboken2.isValid(currentValue):
if resetCallback and currentValue and shiboken6.isValid(currentValue):
currentValue.destroyed.disconnect(resetCallback)
setattr(instance, attributeName, value)
if resetCallback and value: