diff options
Diffstat (limited to 'src/imports/platform')
-rw-r--r-- | src/imports/platform/doc/src/qtlabsplatform-index.qdoc | 2 | ||||
-rw-r--r-- | src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc | 4 | ||||
-rw-r--r-- | src/imports/platform/qtlabsplatformplugin.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/platform/doc/src/qtlabsplatform-index.qdoc b/src/imports/platform/doc/src/qtlabsplatform-index.qdoc index b5fd3046..7b3f78fb 100644 --- a/src/imports/platform/doc/src/qtlabsplatform-index.qdoc +++ b/src/imports/platform/doc/src/qtlabsplatform-index.qdoc @@ -45,6 +45,6 @@ \list \li \l{Qt Quick} - \li \l{Qt Quick Controls 2} + \li \l{Qt Quick Controls} \endlist */ diff --git a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc b/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc index 57f011ef..dec67b72 100644 --- a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc +++ b/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc @@ -33,7 +33,7 @@ The experimental \l{Qt Labs Platform} module provides QML types for native platform extensions. These QML types work in conjunction with \l{Qt Quick} - and \l{Qt Quick Controls 2}. + and \l{Qt Quick Controls}. The QML types can be imported into your application using the following import statement in your .qml file: @@ -51,7 +51,7 @@ \section1 Related Information \list - \li \l {Qt Quick Controls 2 QML Types} + \li \l {Qt Quick Controls QML Types} \endlist \noautolist diff --git a/src/imports/platform/qtlabsplatformplugin.cpp b/src/imports/platform/qtlabsplatformplugin.cpp index b92c1ea0..98d5dcc4 100644 --- a/src/imports/platform/qtlabsplatformplugin.cpp +++ b/src/imports/platform/qtlabsplatformplugin.cpp @@ -83,7 +83,7 @@ void QtLabsPlatformPlugin::registerTypes(const char *uri) qmlRegisterUncreatableType<QQuickPlatformDialog>(uri, 1, 0, "Dialog", QQuickPlatformDialog::tr("Dialog is an abstract base class")); qmlRegisterType<QQuickPlatformColorDialog>(uri, 1, 0, "ColorDialog"); qmlRegisterType<QQuickPlatformFileDialog>(uri, 1, 0, "FileDialog"); - qmlRegisterType<QQuickPlatformFileNameFilter>(); + qmlRegisterAnonymousType<QQuickPlatformFileNameFilter>(uri, 1); qmlRegisterType<QQuickPlatformFolderDialog>(uri, 1, 0, "FolderDialog"); qmlRegisterType<QQuickPlatformFontDialog>(uri, 1, 0, "FontDialog"); qmlRegisterType<QQuickPlatformMessageDialog>(uri, 1, 0, "MessageDialog"); @@ -107,7 +107,7 @@ void QtLabsPlatformPlugin::registerTypes(const char *uri) qRegisterMetaType<QPlatformSystemTrayIcon::MessageIcon>(); #endif - qmlRegisterType<QQuickPlatformIcon>(); + qmlRegisterAnonymousType<QQuickPlatformIcon>(uri, 1); qRegisterMetaType<QQuickPlatformIcon>(); } |