diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-03 18:26:22 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:26:29 +0000 |
commit | f0f66c1aa001c630a6b246e312bef7f8e83958d2 (patch) | |
tree | 388cd87156d06120ee2bdef444213a3c49b165ce /src/imports/platform/qtlabsplatformplugin.cpp | |
parent | 430fe83ecb7106118cbebd735637aee9e9253914 (diff) |
Qt.labs.platform: declare and register enums to the meta system
To make them correctly available in QML so that they also work as
signal arguments.
Task-number: QTBUG-64259
Change-Id: I5fa00871f96357d924661c4b8af323a0f1748c9d
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/imports/platform/qtlabsplatformplugin.cpp')
-rw-r--r-- | src/imports/platform/qtlabsplatformplugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/platform/qtlabsplatformplugin.cpp b/src/imports/platform/qtlabsplatformplugin.cpp index bcb9ac98..1eac7d80 100644 --- a/src/imports/platform/qtlabsplatformplugin.cpp +++ b/src/imports/platform/qtlabsplatformplugin.cpp @@ -56,9 +56,6 @@ # include "qquickplatformsystemtrayicon_p.h" #endif -Q_DECLARE_METATYPE(QStandardPaths::StandardLocation) -Q_DECLARE_METATYPE(QStandardPaths::LocateOptions) - static inline void initResources() { #ifdef QT_STATIC @@ -102,6 +99,7 @@ void QtLabsPlatformPlugin::registerTypes(const char *uri) qmlRegisterType<QQuickPlatformMenuItem>(uri, 1, 0, "MenuItem"); qmlRegisterType<QQuickPlatformMenuItemGroup>(uri, 1, 0, "MenuItemGroup"); qmlRegisterType<QQuickPlatformMenuSeparator>(uri, 1, 0, "MenuSeparator"); + qRegisterMetaType<QPlatformMenu::MenuType>(); qmlRegisterUncreatableType<QPlatformDialogHelper>(uri, 1, 0, "StandardButton", QQuickPlatformDialog::tr("Cannot create an instance of StandardButton")); qmlRegisterSingletonType<QQuickPlatformStandardPaths>(uri, 1, 0, "StandardPaths", QQuickPlatformStandardPaths::create); @@ -110,6 +108,8 @@ void QtLabsPlatformPlugin::registerTypes(const char *uri) #if QT_CONFIG(systemtrayicon) qmlRegisterType<QQuickPlatformSystemTrayIcon>(uri, 1, 0, "SystemTrayIcon"); + qRegisterMetaType<QPlatformSystemTrayIcon::ActivationReason>(); + qRegisterMetaType<QPlatformSystemTrayIcon::MessageIcon>(); #endif } |