Skip to content

Commit

Permalink
[ui] Qt6 Compatibility: Updated Plugin Manager Components to work wit…
Browse files Browse the repository at this point in the history
…h Qt6
  • Loading branch information
waaake committed Nov 28, 2024
1 parent a8e569c commit 8b9c9b9
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion meshroom/core/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# coding:utf-8
# Types
from __future__ import annotations
from typing import List
from typing import Callable, List, Optional

import atexit
import copy
Expand Down
2 changes: 1 addition & 1 deletion meshroom/ui/plugins.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
""" UI Component for the Plugin System.
"""
# Qt
from PySide2.QtCore import Slot, QObject, Property, Signal
from PySide6.QtCore import Slot, QObject, Property, Signal

# Internal
from meshroom.core import pluginManager
Expand Down
2 changes: 1 addition & 1 deletion meshroom/ui/qml/Application.qml
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ Page {
uigraph: _reconstruction

// When a plugin package has been browsed
onBrowsed: {
onBrowsed: (directory) => {
// Load Plugins
_pluginator.load(Filepath.urlToString(directory))
}
Expand Down
6 changes: 3 additions & 3 deletions meshroom/ui/qml/GraphEditor/PluginManager.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Qt.labs.platform 1.0 as Platform
import MaterialIcons 2.2
import Controls 1.0
Expand Down
2 changes: 1 addition & 1 deletion tests/test_compatibility.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ def test_failsOnNodeDescriptionCompatibilityIssue(self, graphSavedOnDisk):
graph.save()

# Replace saved node description by V2
meshroom.core.nodesDesc[SampleNodeV1.__name__] = SampleNodeV2
meshroom.core.pluginManager.register(SampleNodeV1.__name__, SampleNodeV2)

with pytest.raises(GraphCompatibilityError):
loadGraph(graph.filepath, strictCompatibility=True)
Expand Down

0 comments on commit 8b9c9b9

Please sign in to comment.