diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-07-16 13:18:04 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-07-16 13:18:04 (GMT) |
| commit | 42f1e22bdfe2fe29f305dbf50e23933b8e1ef8d0 (patch) | |
| tree | 1c5ae2797ac21da8214c7b8cdaeebe49926585d0 /tools/qml/main.cpp | |
| parent | e2fb9c4df301678719cb0cff78838b35435c3b38 (diff) | |
| parent | ad4aff6e2d188d88a2c6b4b692932adb08491d22 (diff) | |
| download | Qt-42f1e22bdfe2fe29f305dbf50e23933b8e1ef8d0.zip Qt-42f1e22bdfe2fe29f305dbf50e23933b8e1ef8d0.tar.gz Qt-42f1e22bdfe2fe29f305dbf50e23933b8e1ef8d0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tools/qml/main.cpp')
| -rw-r--r-- | tools/qml/main.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index dfd1726..4b1162e 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -56,9 +56,7 @@ QT_USE_NAMESPACE QtMsgHandler systemMsgOutput = 0; -#if defined(Q_WS_S60) -#include <aknappui.h> // For locking app to portrait -#endif + #if defined (Q_OS_SYMBIAN) #include <unistd.h> @@ -211,12 +209,7 @@ int main(int argc, char ** argv) app.setOrganizationName("Nokia"); app.setOrganizationDomain("nokia.com"); -#if defined(Q_WS_S60) - CAknAppUi *appUi = static_cast<CAknAppUi *>(CEikonEnv::Static()->AppUi()); - if (appUi) { - appUi->SetOrientationL(CAknAppUi::EAppUiOrientationPortrait); - } -#endif + QDeclarativeViewer::registerTypes(); QDeclarativeTester::registerTypes(); |