diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:04:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:04:21 +0200 |
| commit | d342edcc22d3c9c0299e86805d93e7031507345b (patch) | |
| tree | 29893a91dd70c3009e8f4343f9e4d447cf4dfb77 /tests/auto/qml/qml.cpp | |
| parent | 58c800edb56d976d95cb2097e27cd39cfc02bf50 (diff) | |
| parent | 3b28a6956cb3cab087481312dc82a907b118e0de (diff) | |
| download | qtwebchannel-d342edcc22d3c9c0299e86805d93e7031507345b.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If2a4f50d03fccc2654b8336d9e40daea85d6adca
Diffstat (limited to 'tests/auto/qml/qml.cpp')
| -rw-r--r-- | tests/auto/qml/qml.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qml/qml.cpp b/tests/auto/qml/qml.cpp index a974854..dcf1228 100644 --- a/tests/auto/qml/qml.cpp +++ b/tests/auto/qml/qml.cpp @@ -35,11 +35,13 @@ #include "testtransport.h" #include "testwebchannel.h" +#include "testobject.h" int main(int argc, char **argv) { qmlRegisterType<TestTransport>("QtWebChannel.Tests", 1, 0, "TestTransport"); qmlRegisterType<TestWebChannel>("QtWebChannel.Tests", 1, 0, "TestWebChannel"); + qmlRegisterType<TestObject>("QtWebChannel.Tests", 1, 0, "TestObject"); return quick_test_main(argc, argv, "qml", QUICK_TEST_SOURCE_DIR); } |