aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-05-30 17:06:58 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-01 18:02:33 +0200
commitea045d82a3a837f83fec82462feebf2bc262f9d9 (patch)
tree5236ec962b89f3fdc883fc2fa813bdbe9317ba81 /src/quick/util
parent101a5185138f4eb4d1ed0e69065d8e4c30a7fff7 (diff)
Add bool QQuickKeyEvent::matches(QKeySequence::StandardKey)
Change-Id: Iaa8392c1b113856fa80cd2507f8640050eb9bec2 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src/quick/util')
-rw-r--r--src/quick/util/qquickutilmodule.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/quick/util/qquickutilmodule.cpp b/src/quick/util/qquickutilmodule.cpp
index a45ec4ef15..fdf8314145 100644
--- a/src/quick/util/qquickutilmodule.cpp
+++ b/src/quick/util/qquickutilmodule.cpp
@@ -58,6 +58,9 @@
#include <private/qquickanimationcontroller_p.h>
#include <QtCore/qcoreapplication.h>
#include <QtGui/QInputMethod>
+#include <QtGui/QKeySequence>
+
+Q_DECLARE_METATYPE(QKeySequence::StandardKey)
void QQuickUtilModule::defineModule()
{
@@ -91,4 +94,7 @@ void QQuickUtilModule::defineModule()
qmlRegisterType<QQuickStateOperation>();
qmlRegisterCustomType<QQuickPropertyChanges>("QtQuick",2,0,"PropertyChanges", new QQuickPropertyChangesParser);
+
+ qRegisterMetaType<QKeySequence::StandardKey>();
+ qmlRegisterUncreatableType<QKeySequence, 2>("QtQuick", 2, 2, "StandardKey", QStringLiteral("Cannot create an instance of StandardKey."));
}