diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h
index e883cfebdea..10a3246da8e 100644
--- a/src/gui/kernel/qplatformtheme.h
+++ b/src/gui/kernel/qplatformtheme.h
@@ -14,6 +14,7 @@
 //
 
 #include <QtGui/qtguiglobal.h>
+#include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
 #if QT_CONFIG(shortcut)
 #  include <QtGui/QKeySequence>
diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h
index e748b5e0e2e..879b142a69a 100644
--- a/src/testlib/qtest_gui.h
+++ b/src/testlib/qtest_gui.h
@@ -22,7 +22,9 @@
 #include <QtGui/qcolor.h>
 #include <QtGui/qpixmap.h>
 #include <QtGui/qimage.h>
+#if QT_CONFIG(shortcut)
 #include <QtGui/qkeysequence.h>
+#endif
 #include <QtGui/qregion.h>
 #include <QtGui/qvector2d.h>
 #include <QtGui/qvector3d.h>
@@ -104,10 +106,12 @@ template<> inline char *toString(const QVector4D &v)
 }
 #endif // !QT_NO_VECTOR4D
 
+#if QT_CONFIG(shortcut)
 template<> inline char *toString(const QKeySequence &keySequence)
 {
     return toString(keySequence.toString());
 }
+#endif
 
 inline bool qCompare(QIcon const &t1, QIcon const &t2, const char *actual, const char *expected,
                     const char *file, int line)
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 18599eb09e5..75f1f13fddc 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -3247,6 +3247,7 @@ QAction *QWidget::addAction(const QIcon &icon, const QString &text)
     return ret;
 }
 
+#if QT_CONFIG(shortcut)
 QAction *QWidget::addAction(const QString &text, const QKeySequence &shortcut)
 {
     QAction *ret = addAction(text);
@@ -3260,6 +3261,7 @@ QAction *QWidget::addAction(const QIcon &icon, const QString &text, const QKeySe
     ret->setShortcut(shortcut);
     return ret;
 }
+#endif
 
 /*!
     \fn QAction *QWidget::addAction(const QString &text, const QObject *receiver, const char* member, Qt::ConnectionType type)
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 8b02f7c4946..7bfce05d682 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -3216,10 +3216,12 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
         break;
 #endif
     default:
+#if QT_CONFIG(shortcut)
         if (d->container && d->container->isVisible() && e->matches(QKeySequence::Cancel)) {
             hidePopup();
             e->accept();
         }
+#endif
 
         if (!d->lineEdit) {
             if (!e->text().isEmpty())