diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-12 10:35:21 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-01-04 14:41:16 +0100 |
| commit | 2bee46e3f10e2c44d185d7a51a06830b68529676 (patch) | |
| tree | b65ac19203edfc2972b6020dd040e46c43b5d1fb /tests/auto/qml/qqmlmetatype/data/testUnregisterCustomType.qml | |
| parent | 52f7ab28172cea3710a16775b7a512fce821fc77 (diff) | |
| parent | 41293196b4db1aa7a0c616af312875c484639644 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/qml/memory/qv4mm.cpp
src/qml/memory/qv4mmdefs_p.h
src/quick/items/qquickwindow.cpp
src/quick/items/qquickwindow_p.h
tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
Change-Id: I7021fa1edf076627a67048f41f7b201220262b09
Diffstat (limited to 'tests/auto/qml/qqmlmetatype/data/testUnregisterCustomType.qml')
| -rw-r--r-- | tests/auto/qml/qqmlmetatype/data/testUnregisterCustomType.qml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlmetatype/data/testUnregisterCustomType.qml b/tests/auto/qml/qqmlmetatype/data/testUnregisterCustomType.qml new file mode 100644 index 0000000000..f6ee4e9b77 --- /dev/null +++ b/tests/auto/qml/qqmlmetatype/data/testUnregisterCustomType.qml @@ -0,0 +1,8 @@ +import QtQuick 2.7 +import mytypes 1.0 + +Item { + id: root + Controller { id: controller; objectName: "controller" } +} + |