diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-21 11:34:57 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-22 09:50:11 +0100 |
| commit | aa3813366a8e772cd58c9253461cf2dc50b97a9d (patch) | |
| tree | e306a60fa9b2d1f7dd2e6b245fdf05214c7c55df /src/qml/qml/qqmlextensionplugin.cpp | |
| parent | 4241bb4d26ef69eb212e0274bad0926ec71bead9 (diff) | |
| parent | acb6ed0815f92588c3ff875a568e9561fe61218c (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/qml/qml/qqmlextensionplugin.cpp
tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
Change-Id: Ic58d36a8532015bae30f2690063db9829b3bf372
Diffstat (limited to 'src/qml/qml/qqmlextensionplugin.cpp')
| -rw-r--r-- | src/qml/qml/qqmlextensionplugin.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlextensionplugin.cpp b/src/qml/qml/qqmlextensionplugin.cpp index 26364661a8..7a62c967e7 100644 --- a/src/qml/qml/qqmlextensionplugin.cpp +++ b/src/qml/qml/qqmlextensionplugin.cpp @@ -127,8 +127,6 @@ void QQmlExtensionPlugin::initializeEngine(QQmlEngine *engine, const char *uri) } /*! - \fn void QQmlEngineExtensionPlugin::initializeEngine(QQmlEngine *engine, const char *uri) - Initializes the extension from the \a uri using the \a engine. Here an application plugin might, for example, expose some data or objects to QML, as context properties on the engine's root context. |