diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/platform/qquickplatformmenuitem.cpp | 2 | ||||
-rw-r--r-- | src/quickcontrols2/qquickproxytheme.cpp | 2 | ||||
-rw-r--r-- | src/quickcontrols2/qquickproxytheme_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpopupitem.cpp | 10 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/imports/platform/qquickplatformmenuitem.cpp b/src/imports/platform/qquickplatformmenuitem.cpp index 0fb92af8..61a4daab 100644 --- a/src/imports/platform/qquickplatformmenuitem.cpp +++ b/src/imports/platform/qquickplatformmenuitem.cpp @@ -170,12 +170,14 @@ void QQuickPlatformMenuItem::sync() if (m_subMenu && m_subMenu->handle()) m_handle->setMenu(m_subMenu->handle()); +#if QT_CONFIG(shortcut) QKeySequence sequence; if (m_shortcut.type() == QVariant::Int) sequence = QKeySequence(static_cast<QKeySequence::StandardKey>(m_shortcut.toInt())); else sequence = QKeySequence::fromString(m_shortcut.toString()); m_handle->setShortcut(sequence.toString()); +#endif if (m_menu && m_menu->handle()) m_menu->handle()->syncMenuItem(m_handle); diff --git a/src/quickcontrols2/qquickproxytheme.cpp b/src/quickcontrols2/qquickproxytheme.cpp index 3442e465..9b395b28 100644 --- a/src/quickcontrols2/qquickproxytheme.cpp +++ b/src/quickcontrols2/qquickproxytheme.cpp @@ -151,12 +151,14 @@ QIconEngine *QQuickProxyTheme::createIconEngine(const QString &iconName) const return QPlatformTheme::createIconEngine(iconName); } +#if QT_CONFIG(shortcut) QList<QKeySequence> QQuickProxyTheme::keyBindings(QKeySequence::StandardKey key) const { if (m_theme) return m_theme->keyBindings(key); return QPlatformTheme::keyBindings(key); } +#endif QString QQuickProxyTheme::standardButtonText(int button) const { diff --git a/src/quickcontrols2/qquickproxytheme_p.h b/src/quickcontrols2/qquickproxytheme_p.h index ee74e703..04f800f4 100644 --- a/src/quickcontrols2/qquickproxytheme_p.h +++ b/src/quickcontrols2/qquickproxytheme_p.h @@ -84,7 +84,9 @@ public: QIconEngine *createIconEngine(const QString &iconName) const override; +#if QT_CONFIG(shortcut) QList<QKeySequence> keyBindings(QKeySequence::StandardKey key) const override; +#endif QString standardButtonText(int button) const override; diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp index 37d755cb..8596dafd 100644 --- a/src/quicktemplates2/qquickpopupitem.cpp +++ b/src/quicktemplates2/qquickpopupitem.cpp @@ -116,19 +116,19 @@ QQuickPopupItem::QQuickPopupItem(QQuickPopup *popup) void QQuickPopupItem::grabShortcut() { -#ifndef QT_NO_SHORTCUT +#if QT_CONFIG(shortcut) Q_D(QQuickPopupItem); QGuiApplicationPrivate *pApp = QGuiApplicationPrivate::instance(); if (!d->backId) d->backId = pApp->shortcutMap.addShortcut(this, Qt::Key_Back, Qt::WindowShortcut, QQuickShortcutContext::matcher); if (!d->escapeId) d->escapeId = pApp->shortcutMap.addShortcut(this, Qt::Key_Escape, Qt::WindowShortcut, QQuickShortcutContext::matcher); -#endif // QT_NO_SHORTCUT +#endif } void QQuickPopupItem::ungrabShortcut() { -#ifndef QT_NO_SHORTCUT +#if QT_CONFIG(shortcut) Q_D(QQuickPopupItem); QGuiApplicationPrivate *pApp = QGuiApplicationPrivate::instance(); if (d->backId) { @@ -139,7 +139,7 @@ void QQuickPopupItem::ungrabShortcut() pApp->shortcutMap.removeShortcut(d->escapeId, this); d->escapeId = 0; } -#endif // QT_NO_SHORTCUT +#endif } void QQuickPopupItem::updatePolish() @@ -150,6 +150,7 @@ void QQuickPopupItem::updatePolish() bool QQuickPopupItem::event(QEvent *event) { +#if QT_CONFIG(shortcut) Q_D(QQuickPopupItem); if (event->type() == QEvent::Shortcut) { QShortcutEvent *se = static_cast<QShortcutEvent *>(event); @@ -161,6 +162,7 @@ bool QQuickPopupItem::event(QEvent *event) } } } +#endif return QQuickItem::event(event); } |