summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-07 04:01:07 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-07 04:01:07 (GMT)
commitc380aeefbfa2cd1aa2d1d21f45101bfb058a40de (patch)
tree873d7b2f476273dedc8aa0347d7367f5c2e1de5a /src/declarative/graphicsitems
parent1d27a2ace38d1098ef639086330a6fb88d8833d9 (diff)
downloadQt-c380aeefbfa2cd1aa2d1d21f45101bfb058a40de.zip
Qt-c380aeefbfa2cd1aa2d1d21f45101bfb058a40de.tar.gz
Qt-c380aeefbfa2cd1aa2d1d21f45101bfb058a40de.tar.bz2
Disallow creation of attached objects Keys and KeyNavigation
Also adds qmlRegisterUncreatableType<>() to allow registration of named types that cannot be created. Task-number: QTBUG-9575
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 7989a27..35a4d00 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -101,8 +101,6 @@ void QDeclarativeItemModule::defineModule()
qmlRegisterType<QDeclarativeGridView>("Qt",4,6,"GridView");
qmlRegisterType<QDeclarativeImage>("Qt",4,6,"Image");
qmlRegisterType<QDeclarativeItem>("Qt",4,6,"Item");
- qmlRegisterType<QDeclarativeKeyNavigationAttached>("Qt",4,6,"KeyNavigation");
- qmlRegisterType<QDeclarativeKeysAttached>("Qt",4,6,"Keys");
qmlRegisterType<QDeclarativeLayoutItem>("Qt",4,6,"LayoutItem");
qmlRegisterType<QDeclarativeListView>("Qt",4,6,"ListView");
qmlRegisterType<QDeclarativeLoader>("Qt",4,6,"Loader");
@@ -151,4 +149,7 @@ void QDeclarativeItemModule::defineModule()
#ifdef QT_WEBKIT_LIB
qmlRegisterType<QDeclarativeWebSettings>();
#endif
+
+ qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("Qt",4,6,"KeyNavigation");
+ qmlRegisterUncreatableType<QDeclarativeKeysAttached>("Qt",4,6,"Keys");
}