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/qmlflickr | |
| 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/qmlflickr')
| -rw-r--r-- | examples/embedded/qmlflickr/deployment.pri | 6 | ||||
| -rw-r--r-- | examples/embedded/qmlflickr/qmlflickr.cpp | 5 | ||||
| -rw-r--r-- | examples/embedded/qmlflickr/qmlflickr.pro | 10 |
3 files changed, 2 insertions, 19 deletions
diff --git a/examples/embedded/qmlflickr/deployment.pri b/examples/embedded/qmlflickr/deployment.pri index a38dc95f8c..0d76ddc1db 100644 --- a/examples/embedded/qmlflickr/deployment.pri +++ b/examples/embedded/qmlflickr/deployment.pri @@ -1,8 +1,4 @@ qmlflickr_src = $$PWD/../../declarative/flickr -symbian { - load(data_caging_paths) - qmlflickr_uid3 = A000E3FF - qmlflickr_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlflickr_uid3 -} + qmlflickr_files.files = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile DEPLOYMENT += qmlflickr_files diff --git a/examples/embedded/qmlflickr/qmlflickr.cpp b/examples/embedded/qmlflickr/qmlflickr.cpp index 052d11c48a..dc7b5ee397 100644 --- a/examples/embedded/qmlflickr/qmlflickr.cpp +++ b/examples/embedded/qmlflickr/qmlflickr.cpp @@ -97,13 +97,8 @@ 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(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.setGeometry(QRect(100, 100, 360, 640)); view.show(); -#endif // Q_OS_SYMBIAN return application.exec(); } diff --git a/examples/embedded/qmlflickr/qmlflickr.pro b/examples/embedded/qmlflickr/qmlflickr.pro index 60abe31333..869d651b05 100644 --- a/examples/embedded/qmlflickr/qmlflickr.pro +++ b/examples/embedded/qmlflickr/qmlflickr.pro @@ -1,13 +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 network SOURCES += $$PWD/qmlflickr.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlflickr_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices - # Maximum heap size set to 128 MB in order to allow loading large images. - TARGET.EPOCHEAPSIZE = 0x20000 0x8000000 -} |