diff options
| author | Damian Jansen <damian.jansen@nokia.com> | 2011-10-19 15:04:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-26 09:01:28 +0200 |
| commit | 4ae7aecb68b506f21bd5411bf92a1e8d9fe807bb (patch) | |
| tree | f264def252b28943e7dda1538ecd73e72746538a /examples/embedded/qmlcalculator | |
| parent | 27933ae4ee5741d09b607635213232d94c444633 (diff) | |
Remove Q_WS_*, symbian and maemo code in QtDeclarative
Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'examples/embedded/qmlcalculator')
| -rw-r--r-- | examples/embedded/qmlcalculator/deployment.pri | 6 | ||||
| -rw-r--r-- | examples/embedded/qmlcalculator/qmlcalculator.cpp | 19 | ||||
| -rw-r--r-- | examples/embedded/qmlcalculator/qmlcalculator.pro | 9 |
3 files changed, 3 insertions, 31 deletions
diff --git a/examples/embedded/qmlcalculator/deployment.pri b/examples/embedded/qmlcalculator/deployment.pri index a97498e91f..a3627b8fa2 100644 --- a/examples/embedded/qmlcalculator/deployment.pri +++ b/examples/embedded/qmlcalculator/deployment.pri @@ -1,8 +1,4 @@ qmlcalculator_src = $$PWD/../../declarative/calculator -symbian { - load(data_caging_paths) - qmlcalculator_uid3 = A000E3FB - qmlcalculator_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlcalculator_uid3 -} + qmlcalculator_files.files = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core DEPLOYMENT += qmlcalculator_files diff --git a/examples/embedded/qmlcalculator/qmlcalculator.cpp b/examples/embedded/qmlcalculator/qmlcalculator.cpp index bed579726c..94cb00f4a2 100644 --- a/examples/embedded/qmlcalculator/qmlcalculator.cpp +++ b/examples/embedded/qmlcalculator/qmlcalculator.cpp @@ -44,13 +44,6 @@ #include <QtDeclarative/QDeclarativeView> #include <QtDeclarative/QDeclarativeEngine> -#if defined(Q_OS_SYMBIAN) -#include <eikenv.h> -#include <eikappui.h> -#include <aknenv.h> -#include <aknappui.h> -#endif // Q_OS_SYMBIAN - int main(int argc, char *argv[]) { QApplication application(argc, argv); @@ -60,21 +53,11 @@ int main(int argc, char *argv[]) view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); - + #if defined(QT_KEYPAD_NAVIGATION) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION -#if defined(Q_OS_SYMBIAN) - CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi()); - TRAPD(error, - if (appUi) - appUi->SetOrientationL(CAknAppUi::EAppUiOrientationPortrait) - ) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmlcalculator/qmlcalculator.pro b/examples/embedded/qmlcalculator/qmlcalculator.pro index 72f45f56d1..25c16ca78a 100644 --- a/examples/embedded/qmlcalculator/qmlcalculator.pro +++ b/examples/embedded/qmlcalculator/qmlcalculator.pro @@ -1,12 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative SOURCES += $$PWD/qmlcalculator.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlcalculator_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - LIBS += -lcone -leikcore -lavkon # Screen orientation -} |