diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-20 08:28:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-20 08:28:16 +0200 |
| commit | f5da1a9261d64fdac3b4e12082932cb473098c73 (patch) | |
| tree | bf96e4940ef4f66509589cc31095cf1d8e3b3a2c /src/quick/items/qquickitemsmodule.cpp | |
| parent | 0bfcff9d9bd20f3efef6146bd1da6f263b0e24c4 (diff) | |
| parent | dd313c4c5e383827913bbc106f9d19667f2dd149 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/quick/items/qquickitemsmodule.cpp
tests/auto/quick/rendernode/tst_rendernode.cpp
Change-Id: I90582df69feb95a4e4aafb0b9793c23714654f19
Diffstat (limited to 'src/quick/items/qquickitemsmodule.cpp')
| -rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 944f24c4ad..0705d9b504 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -349,6 +349,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QQuickShaderEffectSource, 1>(uri, 2, 6, "ShaderEffectSource"); #endif + qmlRegisterType<QQuickItem, 7>(uri, 2, 7, "Item"); #if QT_CONFIG(quick_listview) qmlRegisterType<QQuickListView, 7>(uri, 2, 7, "ListView"); #endif |