summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-10-12 22:29:41 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-18 14:15:39 +0200
commit044770f9b004ff364a1581a4a442bcad2e663325 (patch)
tree685819667cea5950cd6fd9475bb410162509d3fd
parent5d4756fc1b0e0acc862509887fdb8d9767387dcc (diff)
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>
-rw-r--r--src/gui/kernel/kernel.pri2
-rw-r--r--src/gui/kernel/qshortcutmap.cpp (renamed from src/widgets/to_be_moved/qshortcutmap.cpp)0
-rw-r--r--src/gui/kernel/qshortcutmap_p.h (renamed from src/widgets/to_be_moved/qshortcutmap_p.h)2
-rw-r--r--src/widgets/kernel/kernel.pri2
-rw-r--r--src/widgets/kernel/qshortcut.cpp (renamed from src/widgets/to_be_moved/qshortcut.cpp)0
-rw-r--r--src/widgets/kernel/qshortcut.h (renamed from src/widgets/to_be_moved/qshortcut.h)0
-rw-r--r--src/widgets/to_be_moved/to_be_moved.pri7
-rw-r--r--src/widgets/widgets.pro3
8 files changed, 5 insertions, 11 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 7bdd3079e8..318adcd9bd 100644
--- a/src/gui/kernel/kernel.pri
+++ b/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 {
diff --git a/src/widgets/to_be_moved/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index 64b0aa1741..64b0aa1741 100644
--- a/src/widgets/to_be_moved/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
diff --git a/src/widgets/to_be_moved/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h
index 29045eb7db..bfd3607e5e 100644
--- a/src/widgets/to_be_moved/qshortcutmap_p.h
+++ b/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:
diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
index 8fbf968581..4f0129add0 100644
--- a/src/widgets/kernel/kernel.pri
+++ b/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 \
diff --git a/src/widgets/to_be_moved/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp
index 94f809d199..94f809d199 100644
--- a/src/widgets/to_be_moved/qshortcut.cpp
+++ b/src/widgets/kernel/qshortcut.cpp
diff --git a/src/widgets/to_be_moved/qshortcut.h b/src/widgets/kernel/qshortcut.h
index 6e3c647852..6e3c647852 100644
--- a/src/widgets/to_be_moved/qshortcut.h
+++ b/src/widgets/kernel/qshortcut.h
diff --git a/src/widgets/to_be_moved/to_be_moved.pri b/src/widgets/to_be_moved/to_be_moved.pri
deleted file mode 100644
index fc570ce2d9..0000000000
--- a/src/widgets/to_be_moved/to_be_moved.pri
+++ /dev/null
@@ -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 \
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
index bff487bf3f..74d5e9d7ed 100644
--- a/src/widgets/widgets.pro
+++ b/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)