Skip to content

Commit

Permalink
fix: allow older qtpy (#37)
Browse files Browse the repository at this point in the history
tlambert03 authored Jul 13, 2022

Verified

This commit was signed with the committer’s verified signature.
MikePopoloski Michael Popoloski
1 parent ba97ec6 commit b5dea46
Showing 3 changed files with 16 additions and 3 deletions.
7 changes: 6 additions & 1 deletion src/app_model/backends/qt/_qkeymap.py
Original file line number Diff line number Diff line change
@@ -2,13 +2,18 @@
from functools import reduce
from typing import Dict, Optional, cast

from qtpy import QT6
from qtpy.QtCore import Qt
from qtpy.QtGui import QKeySequence

from ...types._constants import OperatingSystem
from ...types._keys import KeyBinding, KeyCode, KeyMod, SimpleKeyBinding

try:
from qtpy import QT6
except ImportError:
QT6 = False


QMETA = Qt.KeyboardModifier.MetaModifier
QCTRL = Qt.KeyboardModifier.ControlModifier

6 changes: 5 additions & 1 deletion src/app_model/backends/qt/_qmenu.py
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
Union,
)

from qtpy import QT6
from qtpy.QtCore import QObject
from qtpy.QtWidgets import QMenu, QMenuBar, QToolBar

@@ -21,6 +20,11 @@
from ._qaction import QMenuItemAction
from ._util import to_qicon

try:
from qtpy import QT6
except ImportError:
QT6 = False

if TYPE_CHECKING:
from qtpy.QtWidgets import QAction, QWidget

6 changes: 5 additions & 1 deletion src/app_model/backends/qt/_qmenubar.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
from typing import List, Mapping, Optional, Union

from qtpy import QT6
from qtpy.QtWidgets import QMenuBar, QWidget

from ... import Application
from ._qaction import QMenuItemAction
from ._qmenu import QModelMenu

try:
from qtpy import QT6
except ImportError:
QT6 = False


class QModelMenuBar(QMenuBar):
"""QMenuBar that is built from a list of model menu ids."""

0 comments on commit b5dea46

Please sign in to comment.