diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-02-07 13:56:28 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-02-07 14:18:51 +0000 |
| commit | 54aef070625c2b1bd45394f8ffe1ea0b07bc5805 (patch) | |
| tree | a137f97904e48ece46f042fd237a9320b759609c /src/quicktemplates2 | |
| parent | 9c6e655969eb8b90b14367dd7218c79521e3f6db (diff) | |
Fix -no-feature-shortcut build
Change-Id: If567b99889b40528150834c3319cdfec8e5b229e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2')
| -rw-r--r-- | src/quicktemplates2/qquickpopupitem.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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); } |