diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-01 22:00:17 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-01 22:00:17 (GMT) |
| commit | 9d0317c91dbbe660af2ed2aa8ea47446049467d2 (patch) | |
| tree | b10925754df0608beb5de941b5c1ea4da1f3bd55 /tools/qml/qmlruntime.cpp | |
| parent | 628c9625c4bf6d0e189f9e8da5268eb7629e7597 (diff) | |
| parent | 33b76a659b2f44fa7038e375bbfb4cfd449ae617 (diff) | |
| download | Qt-9d0317c91dbbe660af2ed2aa8ea47446049467d2.zip Qt-9d0317c91dbbe660af2ed2aa8ea47446049467d2.tar.gz Qt-9d0317c91dbbe660af2ed2aa8ea47446049467d2.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'tools/qml/qmlruntime.cpp')
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index c59621a..5e169d8 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -1532,6 +1532,7 @@ void QDeclarativeViewer::registerTypes() if (!registered) { // registering only for exposing the DeviceOrientation::Orientation enum qmlRegisterUncreatableType<DeviceOrientation>("Qt",4,7,"Orientation",""); + qmlRegisterUncreatableType<DeviceOrientation>("QtQuick",1,0,"Orientation",""); registered = true; } } |