5 files changed, 28 insertions, 11 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 2099f2db..bb07d13e 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -44,7 +44,9 @@
 
 #include <QtGui/qstylehints.h>
 #include <QtGui/qguiapplication.h>
-#include <QtGui/private/qshortcutmap_p.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/private/qshortcutmap_p.h>
+#endif
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtQuick/private/qquickevents_p_p.h>
 #include <QtQml/qqmllist.h>
@@ -1015,8 +1017,8 @@ void QQuickAbstractButton::componentComplete()
 
 bool QQuickAbstractButton::event(QEvent *event)
 {
-    Q_D(QQuickAbstractButton);
 #if QT_CONFIG(shortcut)
+    Q_D(QQuickAbstractButton);
     if (event->type() == QEvent::Shortcut) {
         QShortcutEvent *se = static_cast<QShortcutEvent *>(event);
         if (se->shortcutId() == d->shortcutId) {
@@ -1101,9 +1103,9 @@ void QQuickAbstractButton::timerEvent(QTimerEvent *event)
 
 void QQuickAbstractButton::itemChange(ItemChange change, const ItemChangeData &value)
 {
-    Q_D(QQuickAbstractButton);
     QQuickControl::itemChange(change, value);
 #if QT_CONFIG(shortcut)
+    Q_D(QQuickAbstractButton);
     if (change == ItemVisibleHasChanged) {
         if (value.boolValue)
             d->grabShortcut();
diff --git a/src/quicktemplates2/qquickabstractbutton_p_p.h b/src/quicktemplates2/qquickabstractbutton_p_p.h
index 7394f115..8ad479e2 100644
--- a/src/quicktemplates2/qquickabstractbutton_p_p.h
+++ b/src/quicktemplates2/qquickabstractbutton_p_p.h
@@ -50,7 +50,9 @@
 
 #include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 #include <QtQuickTemplates2/private/qquickcontrol_p_p.h>
-#include <QtGui/qkeysequence.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/qkeysequence.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quicktemplates2/qquickaction.cpp b/src/quicktemplates2/qquickaction.cpp
index 9120db37..559c5fc3 100644
--- a/src/quicktemplates2/qquickaction.cpp
+++ b/src/quicktemplates2/qquickaction.cpp
@@ -40,7 +40,9 @@
 #include "qquickshortcutcontext_p_p.h"
 
 #include <QtGui/qevent.h>
-#include <QtGui/private/qshortcutmap_p.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/private/qshortcutmap_p.h>
+#endif
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtQuick/private/qquickitem_p.h>
 
@@ -261,6 +263,8 @@ void QQuickActionPrivate::unregisterItem(QQuickItem *item)
     delete entry;
 
     updateDefaultShortcutEntry();
+#else
+    Q_UNUSED(item);
 #endif
 }
 
@@ -277,6 +281,8 @@ void QQuickActionPrivate::itemVisibilityChanged(QQuickItem *item)
         entry->ungrab();
 
     updateDefaultShortcutEntry();
+#else
+    Q_UNUSED(item);
 #endif
 }
 
@@ -332,8 +338,8 @@ void QQuickActionPrivate::updateDefaultShortcutEntry()
 QQuickAction::QQuickAction(QObject *parent)
     : QObject(*(new QQuickActionPrivate), parent)
 {
-    Q_D(QQuickAction);
 #if QT_CONFIG(shortcut)
+    Q_D(QQuickAction);
     d->defaultShortcutEntry = new QQuickActionPrivate::ShortcutEntry(this);
 #endif
 }
@@ -554,8 +560,8 @@ void QQuickActionPrivate::trigger(QObject* source, bool doToggle)
 
 bool QQuickAction::event(QEvent *event)
 {
-    Q_D(QQuickAction);
 #if QT_CONFIG(shortcut)
+    Q_D(QQuickAction);
     if (event->type() == QEvent::Shortcut)
         return d->handleShortcutEvent(this, static_cast<QShortcutEvent *>(event));
 #endif
@@ -564,10 +570,13 @@ bool QQuickAction::event(QEvent *event)
 
 bool QQuickAction::eventFilter(QObject *object, QEvent *event)
 {
-    Q_D(QQuickAction);
 #if QT_CONFIG(shortcut)
+    Q_D(QQuickAction);
     if (event->type() == QEvent::Shortcut)
         return d->handleShortcutEvent(object, static_cast<QShortcutEvent *>(event));
+#else
+    Q_UNUSED(object);
+    Q_UNUSED(event);
 #endif
     return false;
 }
diff --git a/src/quicktemplates2/qquickaction_p_p.h b/src/quicktemplates2/qquickaction_p_p.h
index 7c70bab1..252b0075 100644
--- a/src/quicktemplates2/qquickaction_p_p.h
+++ b/src/quicktemplates2/qquickaction_p_p.h
@@ -51,7 +51,9 @@
 #include <QtCore/private/qobject_p.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qstring.h>
-#include <QtGui/qkeysequence.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/qkeysequence.h>
+#endif
 #include <QtQuick/private/qquickitemchangelistener_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -119,8 +121,8 @@ public:
     bool checkable = false;
     QString text;
     QQuickIcon icon;
-    QKeySequence keySequence;
 #if QT_CONFIG(shortcut)
+    QKeySequence keySequence;
     QVariant vshortcut;
     ShortcutEntry *defaultShortcutEntry = nullptr;
     QVector<ShortcutEntry *> shortcutEntries;
diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp
index 16d8c4f6..28ddde66 100644
--- a/src/quicktemplates2/qquickpopupitem.cpp
+++ b/src/quicktemplates2/qquickpopupitem.cpp
@@ -42,7 +42,9 @@
 #include "qquickpopup_p_p.h"
 #include "qquickdeferredexecute_p_p.h"
 
-#include <QtGui/private/qshortcutmap_p.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/private/qshortcutmap_p.h>
+#endif
 #include <QtGui/private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE