diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-24 09:13:24 +0100 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-24 09:13:24 +0100 |
commit | af2a59da98f29bb541e10aef2858bde07e1d7469 (patch) | |
tree | ae8f67b2f13c94529d8ba35cb0ef74eca52c8371 | |
parent | 4051ce1e107034d1d17a4acf2c9a393cdbea028d (diff) | |
parent | 0b3edd6acca34e04412074fbf55966b6858f1d6d (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:research/qt-scene-graph
-rw-r--r-- | src/qmlscene_global.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/qmlscene_global.cpp b/src/qmlscene_global.cpp index f8ddf65..75ba95e 100644 --- a/src/qmlscene_global.cpp +++ b/src/qmlscene_global.cpp @@ -78,23 +78,6 @@ #include "utilities.h" -class OrientationObject : public QObject -{ - Q_OBJECT - Q_ENUMS(Orientation) - Q_PROPERTY(Orientation orientation READ orientation CONSTANT) -public: - enum Orientation { - UnknownOrientation, - Portrait, - Landscape, - PortraitInverted, - LandscapeInverted - }; - - Orientation orientation() const { return Portrait; } -}; - static QDeclarativePrivate::AutoParentResult QxItem_autoParent(QObject *obj, QObject *parent) { QxItem* gobj = qobject_cast<QxItem*>(obj); @@ -129,7 +112,6 @@ void qt_scenegraph_register_types() minorVersion = 7; } - qmlRegisterUncreatableType<OrientationObject>(name, majorVersion, minorVersion,"Orientation",""); QDeclarativePrivate::RegisterAutoParent autoparent = { 0, &QxItem_autoParent }; QDeclarativePrivate::qmlregister(QDeclarativePrivate::AutoParentRegistration, &autoparent); @@ -199,7 +181,7 @@ void qt_scenegraph_register_types() void qt_scenegraph_configure_engine(QDeclarativeEngine *engine) { - engine->rootContext()->setContextProperty("runtime", new OrientationObject); + Q_UNUSED(engine); } #include "qmlscene_global.moc" |