diff options
Diffstat (limited to 'src/quick/qtquick2.cpp')
| -rw-r--r-- | src/quick/qtquick2.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp index 7a04c2146c..4ba7e896db 100644 --- a/src/quick/qtquick2.cpp +++ b/src/quick/qtquick2.cpp @@ -39,7 +39,6 @@ #include "qtquick2_p.h" #include <private/qqmlengine_p.h> -#include <private/qquickutilmodule_p.h> #include <private/qquickvaluetypes_p.h> #include <private/qquickitemsmodule_p.h> #include <private/qquickaccessiblefactory_p.h> @@ -55,6 +54,10 @@ #include <qqmlproperty.h> #include <QtCore/QPointer> +#if QT_CONFIG(shortcut) +Q_DECLARE_METATYPE(QKeySequence::StandardKey) +#endif + QT_BEGIN_NAMESPACE #if !QT_CONFIG(qml_debug) @@ -182,12 +185,12 @@ void QQmlQtQuick2Module::defineModule() { QQuick_initializeProviders(); - QQuickUtilModule::defineModule(); - QQuickItemsModule::defineModule(); - - qmlRegisterUncreatableType<QQuickApplication>("QtQuick",2,0,"Application", QQuickApplication::tr("Application is an abstract class")); +#if QT_CONFIG(shortcut) + qRegisterMetaType<QKeySequence::StandardKey>(); +#endif QQuickValueTypes::registerValueTypes(); + QQuickItemsModule::defineModule(); #if QT_CONFIG(accessibility) QAccessible::installFactory(&qQuickAccessibleFactory); |