diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-03 15:54:27 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-18 13:59:34 +0000 |
| commit | 43573c8df170c5662b350703a06537c457c2d2fd (patch) | |
| tree | e57e2f7235fc51467d2f761ed2753bc5e76ad3c9 /src/quick | |
| parent | 851387d40662cd82ff44a1792825265f82fe7ddf (diff) | |
Clean up type registration
The QML-specific types need to be registered only for "QtQml". Make sure
we don't accidentally add new QML-specific types to QtQuick.
We also don't want the base types to be registered under any random URI
and version. Formally qmlRegisterBaseTypes() is a public function, but
it _really_ should not be called by anyone.
Finally, split the types into ones that should belong to QtQml.Models
and ones that belong to QtQml proper. Add a plugin that handles QtQml
itself rather than using the QQmlEngine ctor for this.
[ChangeLog] The accidentally exported function qmlRegisterBaseTypes()
was removed.
Change-Id: I8bf9f8515e18b016750c721fe694d4cda076780b
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/qtquick2.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp index 63f3b91b82..7a04c2146c 100644 --- a/src/quick/qtquick2.cpp +++ b/src/quick/qtquick2.cpp @@ -183,7 +183,6 @@ void QQmlQtQuick2Module::defineModule() QQuick_initializeProviders(); QQuickUtilModule::defineModule(); - QQmlEnginePrivate::defineQtQuick2Module(); QQuickItemsModule::defineModule(); qmlRegisterUncreatableType<QQuickApplication>("QtQuick",2,0,"Application", QQuickApplication::tr("Application is an abstract class")); |