From 3a912e92bb13463a1118c45f8127682a5d918a90 Mon Sep 17 00:00:00 2001
From: Joni Poikelin <joni.poikelin@qt.io>
Date: Thu, 3 May 2018 19:31:53 +0300
Subject: Fix building with -no-feature-shortcut

Change-Id: I7576055a6d81d6a7a075ebff16ca6b0ced4e984e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/plugins/platforms/windows/qwindowskeymapper.cpp | 4 ++++
 src/plugins/platforms/windows/qwindowsmenu.cpp      | 6 ++++++
 src/widgets/dialogs/qwizard_win.cpp                 | 2 ++
 3 files changed, 12 insertions(+)

(limited to 'src')

diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp
index 35f81f0165..950d8ecd36 100644
--- a/src/plugins/platforms/windows/qwindowskeymapper.cpp
+++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp
@@ -855,8 +855,12 @@ bool QWindowsKeyMapper::translateMultimediaKeyEventInternal(QWindow *window, con
     sendExtendedPressRelease(receiver, qtKey, Qt::KeyboardModifier(state), 0, 0, 0);
     // QTBUG-43343: Make sure to return false if Qt does not handle the key, otherwise,
     // the keys are not passed to the active media player.
+# if QT_CONFIG(shortcut)
     const QKeySequence sequence(Qt::Modifier(state) + qtKey);
     return QGuiApplicationPrivate::instance()->shortcutMap.hasShortcutForKeySequence(sequence);
+# else
+    return false;
+# endif
 #else
     Q_UNREACHABLE();
     return false;
diff --git a/src/plugins/platforms/windows/qwindowsmenu.cpp b/src/plugins/platforms/windows/qwindowsmenu.cpp
index b89e1b66a3..71802b9017 100644
--- a/src/plugins/platforms/windows/qwindowsmenu.cpp
+++ b/src/plugins/platforms/windows/qwindowsmenu.cpp
@@ -390,6 +390,7 @@ void QWindowsMenuItem::setChecked(bool isChecked)
     menuItemSetChangeState(parentMenuHandle(), m_id, FALSE, m_checked, MF_CHECKED, MF_UNCHECKED);
 }
 
+#if QT_CONFIG(shortcut)
 void QWindowsMenuItem::setShortcut(const QKeySequence &shortcut)
 {
     qCDebug(lcQpaMenus) << __FUNCTION__ << '(' << shortcut << ')' << this;
@@ -399,6 +400,7 @@ void QWindowsMenuItem::setShortcut(const QKeySequence &shortcut)
     if (m_parentMenu != nullptr)
         updateText();
 }
+#endif
 
 void QWindowsMenuItem::setEnabled(bool enabled)
 {
@@ -441,10 +443,12 @@ UINT QWindowsMenuItem::state() const
 QString QWindowsMenuItem::nativeText() const
 {
     QString result = m_text;
+#if QT_CONFIG(shortcut)
     if (!m_shortcut.isEmpty()) {
         result += QLatin1Char('\t');
         result += m_shortcut.toString(QKeySequence::NativeText);
     }
+#endif
     return result;
 }
 
@@ -894,8 +898,10 @@ void QWindowsMenuItem::formatDebug(QDebug &d) const
         d << ", subMenu=" << static_cast<const void *>(m_subMenu);
     d << ", tag=" << showbase << hex
       << tag() << noshowbase << dec << ", id=" << m_id;
+#if QT_CONFIG(shortcut)
     if (!m_shortcut.isEmpty())
         d << ", shortcut=" << m_shortcut;
+#endif
     if (m_visible)
         d << " [visible]";
     if (m_enabled)
diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp
index 6f0e436ae0..5ef304c9f1 100644
--- a/src/widgets/dialogs/qwizard_win.cpp
+++ b/src/widgets/dialogs/qwizard_win.cpp
@@ -79,7 +79,9 @@ QVistaBackButton::QVistaBackButton(QWidget *widget)
 {
     setFocusPolicy(Qt::NoFocus);
     // Native dialogs use ALT-Left even in RTL mode, so do the same, even if it might be counter-intuitive.
+#if QT_CONFIG(shortcut)
     setShortcut(QKeySequence(Qt::ALT | Qt::Key_Left));
+#endif
 }
 
 QSize QVistaBackButton::sizeHint() const
-- 
cgit v1.2.3