diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-27 22:10:06 +0200 |
| commit | abe319c9cb811832bb4c9c95290564dfa7b3603a (patch) | |
| tree | e93b7e554b3cd497b86f0be3bd46450a91ea088e /tests/auto/testplugin/testplugin.cpp | |
| parent | efdd81ce80b018b7b5779876e94f1b722af7fb9a (diff) | |
| parent | 69b3136bae16897492d27558c5909cd61a5e598e (diff) | |
| download | qtquickcontrols-abe319c9cb811832bb4c9c95290564dfa7b3603a.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp
Change-Id: I0b6018fdac65a5385136e4c3561fba1c52ecd32e
Diffstat (limited to 'tests/auto/testplugin/testplugin.cpp')
| -rw-r--r-- | tests/auto/testplugin/testplugin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/testplugin/testplugin.cpp b/tests/auto/testplugin/testplugin.cpp index 45573d92..039a59e0 100644 --- a/tests/auto/testplugin/testplugin.cpp +++ b/tests/auto/testplugin/testplugin.cpp @@ -40,6 +40,7 @@ void TestPlugin::registerTypes(const char *uri) qmlRegisterType<TestObject>(uri, 1, 0, "TestObject"); qmlRegisterType<TestItemModel>(uri, 1, 0, "TestItemModel"); qmlRegisterType<TestModel>(uri, 1, 0, "TreeModel"); + qmlRegisterType<TestFetchAppendModel>(uri, 1, 0, "TestFetchAppendModel"); } void TestPlugin::initializeEngine(QQmlEngine *engine, const char * /*uri*/) |