Move QShortcutMap to QtGui

QShortcut stays in QtWidgets, what we need in QtGui
is only the basic functionality of the shortcut map.
QML can integrate directly with the map where required.

Change-Id: Ie39e9242f24cbebf824e5c3d2926880325ea4187
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

src/gui/kernel/kernel.pri

@@ -19,6 +19,7 @@ HEADERS += \
         kernel/qkeysequence_p.h \
         kernel/qkeymapper_p.h \
         kernel/qpalette.h \
+        kernel/qshortcutmap_p.h \
         kernel/qsessionmanager.h \
         kernel/qwindowdefs.h \
         kernel/qscreen.h \
@@ -37,6 +38,7 @@ SOURCES += \
         kernel/qpalette.cpp \
         kernel/qguivariant.cpp \
         kernel/qscreen.cpp \
+        kernel/qshortcutmap.cpp \
         kernel/qstylehints.cpp
 
 qpa {

src/gui/kernel/qshortcutmap_p.h

@@ -69,7 +69,7 @@ struct QShortcutEntry;
 class QShortcutMapPrivate;
 class QObject;
 
-class QShortcutMap
+class Q_GUI_EXPORT QShortcutMap
 {
     Q_DECLARE_PRIVATE(QShortcutMap)
 public:

src/widgets/kernel/kernel.pri

@@ -26,6 +26,7 @@ HEADERS += \
 	kernel/qlayout_p.h \
 	kernel/qlayoutengine_p.h \
 	kernel/qlayoutitem.h \
+        kernel/qshortcut.h \
 	kernel/qsizepolicy.h \
         kernel/qstackedlayout.h \
 	kernel/qtooltip.h \
@@ -59,6 +60,7 @@ SOURCES += \
         kernel/qlayout.cpp \
 	kernel/qlayoutengine.cpp \
 	kernel/qlayoutitem.cpp \
+        kernel/qshortcut.cpp \
         kernel/qstackedlayout.cpp \
 	kernel/qtooltip.cpp \
 	kernel/qwhatsthis.cpp \

src/widgets/to_be_moved/to_be_moved.pri

@@ -1,7 +0,0 @@
-HEADERS += \
-        to_be_moved/qshortcut.h \
-        to_be_moved/qshortcutmap_p.h \
-
-SOURCES += \
-        to_be_moved/qshortcut.cpp \
-        to_be_moved/qshortcutmap.cpp \

src/widgets/widgets.pro

@@ -30,9 +30,6 @@ symbian {
     include(s60framework/s60framework.pri)
 }
 
-# to be moved into QtGui
-include(to_be_moved/to_be_moved.pri)
-
 #modules
 include(animation/animation.pri)
 include(kernel/kernel.pri)