diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-03-15 11:58:58 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-21 01:10:41 +0100 |
| commit | 37cd29b2ff024f27f84ef6214ff5403603d522f2 (patch) | |
| tree | 88dd0d32f024195ed068dd87663e3b07bb6d798b /tests/auto/qml/qqmlecmascript/testtypes.cpp | |
| parent | fd8028514550da7594736a10f1d20bab1576bcfd (diff) | |
Support (registered) non-local enums for signal/slot params in QML.
It's now possible to detect whether a registered type is an enum,
allowing registered non-local enums to be used as parameters in
signals and slots from QML/C++.
Author: Glenn Watson <glenn.watson@nokia.com>
Task-number: QTBUG-20639
Change-Id: I8c439f2dcc7bfd8ec31914b0c86cd3a1de3c038c
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/testtypes.cpp')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/testtypes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.cpp b/tests/auto/qml/qqmlecmascript/testtypes.cpp index 64e91fbc95..a79207a1c8 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.cpp +++ b/tests/auto/qml/qqmlecmascript/testtypes.cpp @@ -196,7 +196,7 @@ void registerTypes() qmlRegisterModuleApi("Qt.test.qobjectApi",2,0,qobject_api); // register (qobject) module API for a uri which doesn't contain elements, major version set qmlRegisterModuleApi("Qt.test.qobjectApiParented",1,0,qobject_api_engine_parent); // register (parented qobject) module API for a uri which doesn't contain elements - qRegisterMetaType<MyQmlObject::MyType>("MyEnum2"); + qRegisterMetaType<MyQmlObject::MyEnum2>("MyEnum2"); qRegisterMetaType<Qt::MouseButtons>("Qt::MouseButtons"); qmlRegisterType<CircularReferenceObject>("Qt.test", 1, 0, "CircularReferenceObject"); |