Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow older qtpy #37

Merged
merged 1 commit into from
Jul 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/app_model/backends/qt/_qkeymap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

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

Expand All @@ -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

Expand Down
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."""
Expand Down