diff options
Diffstat (limited to 'examples')
26 files changed, 15 insertions, 171 deletions
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index eaa48cd901..cfa7923128 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -18,12 +18,3 @@ ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarati INSTALLS = sources ImageProviderCore_sources target -symbian:{ - CONFIG += qt_example - TARGET.EPOCALLOWDLLDATA = 1 - - importFiles.files = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir - importFiles.path = ImageProviderCore - DEPLOYMENT += importFiles -} -maemo5: CONFIG += qt_example diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index 03f7294131..bdcb62ca8a 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -23,8 +23,3 @@ target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nok INSTALLS += qdeclarativesources sources target -symbian { - CONFIG += qt_example - TARGET.EPOCALLOWDLLDATA = 1 -} -maemo5: CONFIG += qt_example diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index d3683fe376..883c0afe2d 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -9,9 +9,6 @@ SUBDIRS = \ tutorials \ script -# plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name -symbian:SUBDIRS -= plugins - # These examples contain no C++ and can simply be copied sources.files = \ animation \ diff --git a/examples/declarative/painteditem/smile/smile.pro b/examples/declarative/painteditem/smile/smile.pro index 5d7b9df074..3b9e4e0f62 100644 --- a/examples/declarative/painteditem/smile/smile.pro +++ b/examples/declarative/painteditem/smile/smile.pro @@ -9,6 +9,3 @@ SOURCES += main.cpp CONFIG += console -symbian { - TARGET.EPOCHEAPSIZE = 0x20000 0x5000000 -} diff --git a/examples/declarative/script/shell/shell.pro b/examples/declarative/script/shell/shell.pro index 7ddc06b3c4..00191ab3d0 100644 --- a/examples/declarative/script/shell/shell.pro +++ b/examples/declarative/script/shell/shell.pro @@ -2,7 +2,6 @@ QT += declarative win32: CONFIG += console mac:CONFIG -= app_bundle -symbian: CONFIG += qt_example SOURCES += main.cpp 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 -} diff --git a/examples/embedded/qmlclocks/deployment.pri b/examples/embedded/qmlclocks/deployment.pri index 6c6704ccc7..771a4dba76 100644 --- a/examples/embedded/qmlclocks/deployment.pri +++ b/examples/embedded/qmlclocks/deployment.pri @@ -1,8 +1,4 @@ qmlclocks_src = $$PWD/../../../examples/declarative/toys/clocks -symbian { - load(data_caging_paths) - qmlclocks_uid3 = A000E3FC - qmlclocks_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlclocks_uid3 -} + qmlclocks_files.files = $$qmlclocks_src/clocks.qml $$qmlclocks_src/content DEPLOYMENT += qmlclocks_files diff --git a/examples/embedded/qmlclocks/qmlclocks.cpp b/examples/embedded/qmlclocks/qmlclocks.cpp index 75d0be0874..04366aa0ab 100644 --- a/examples/embedded/qmlclocks/qmlclocks.cpp +++ b/examples/embedded/qmlclocks/qmlclocks.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); @@ -65,16 +58,6 @@ int main(int argc, char *argv[]) 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::EAppUiOrientationLandscape) - ) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmlclocks/qmlclocks.pro b/examples/embedded/qmlclocks/qmlclocks.pro index 1b6cdad6be..8e9dcdf87c 100644 --- a/examples/embedded/qmlclocks/qmlclocks.pro +++ b/examples/embedded/qmlclocks/qmlclocks.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/qmlclocks.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlclocks_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - LIBS += -lcone -leikcore -lavkon # Screen orientation -} diff --git a/examples/embedded/qmldialcontrol/deployment.pri b/examples/embedded/qmldialcontrol/deployment.pri index a9784439a4..d845120923 100644 --- a/examples/embedded/qmldialcontrol/deployment.pri +++ b/examples/embedded/qmldialcontrol/deployment.pri @@ -1,8 +1,4 @@ qmldialcontrol_src = $$PWD/../../../examples/declarative/ui-components/dialcontrol -symbian { - load(data_caging_paths) - qmldialcontrol_uid3 = A000E3FD - qmldialcontrol_files.path = $$APP_PRIVATE_DIR_BASE/$$qmldialcontrol_uid3 -} + qmldialcontrol_files.files = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content DEPLOYMENT += qmldialcontrol_files diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp index 7cc4ed6668..6f9b0e574a 100644 --- a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp +++ b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp @@ -58,11 +58,6 @@ int main(int argc, char *argv[]) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.pro b/examples/embedded/qmldialcontrol/qmldialcontrol.pro index 3b2e88649e..08f876b926 100644 --- a/examples/embedded/qmldialcontrol/qmldialcontrol.pro +++ b/examples/embedded/qmldialcontrol/qmldialcontrol.pro @@ -1,11 +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/qmldialcontrol.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmldialcontrol_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} diff --git a/examples/embedded/qmleasing/deployment.pri b/examples/embedded/qmleasing/deployment.pri index 946fcd9d89..7a5d0401cb 100644 --- a/examples/embedded/qmleasing/deployment.pri +++ b/examples/embedded/qmleasing/deployment.pri @@ -1,8 +1,4 @@ qmleasing_src = $$PWD/../../../examples/declarative/animation/easing -symbian { - load(data_caging_paths) - qmleasing_uid3 = A000E3FE - qmleasing_files.path = $$APP_PRIVATE_DIR_BASE/$$qmleasing_uid3 -} + qmleasing_files.files = $$qmleasing_src/easing.qml $$qmleasing_src/content DEPLOYMENT += qmleasing_files diff --git a/examples/embedded/qmleasing/qmleasing.cpp b/examples/embedded/qmleasing/qmleasing.cpp index 38c457d376..3e24546b4a 100644 --- a/examples/embedded/qmleasing/qmleasing.cpp +++ b/examples/embedded/qmleasing/qmleasing.cpp @@ -58,11 +58,6 @@ int main(int argc, char *argv[]) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmleasing/qmleasing.pro b/examples/embedded/qmleasing/qmleasing.pro index bf332aa07d..c9f008d42e 100644 --- a/examples/embedded/qmleasing/qmleasing.pro +++ b/examples/embedded/qmleasing/qmleasing.pro @@ -1,11 +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/qmleasing.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmleasing_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} 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 -} diff --git a/examples/embedded/qmlphotoviewer/deployment.pri b/examples/embedded/qmlphotoviewer/deployment.pri index 23882e3686..504373914a 100644 --- a/examples/embedded/qmlphotoviewer/deployment.pri +++ b/examples/embedded/qmlphotoviewer/deployment.pri @@ -1,8 +1,4 @@ qmlphotoviewer_src = $$PWD/../../declarative/photoviewer -symbian { - load(data_caging_paths) - qmlphotoviewer_uid3 = A000E400 - qmlphotoviewer_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlphotoviewer_uid3 -} + qmlphotoviewer_files.files = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore DEPLOYMENT += qmlphotoviewer_files diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp index 89a0902373..16135a7851 100644 --- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp +++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp @@ -97,13 +97,8 @@ int main(int argc, char *argv[]) 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/qmlphotoviewer/qmlphotoviewer.pro b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro index b97bf269d3..9941b2e226 100644 --- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro +++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.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 network SOURCES += $$PWD/qmlphotoviewer.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlphotoviewer_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} diff --git a/examples/embedded/qmltwitter/deployment.pri b/examples/embedded/qmltwitter/deployment.pri index 3edc0e527c..a3c045ca54 100644 --- a/examples/embedded/qmltwitter/deployment.pri +++ b/examples/embedded/qmltwitter/deployment.pri @@ -1,8 +1,4 @@ qmltwitter_src = $$PWD/../../declarative/twitter -symbian { - load(data_caging_paths) - qmltwitter_uid3 = A000E401 - qmltwitter_files.path = $$APP_PRIVATE_DIR_BASE/$$qmltwitter_uid3 -} + qmltwitter_files.files = $$qmltwitter_src/twitter.qml $$qmltwitter_src/TwitterCore DEPLOYMENT += qmltwitter_files diff --git a/examples/embedded/qmltwitter/qmltwitter.cpp b/examples/embedded/qmltwitter/qmltwitter.cpp index f63f9055ef..5485028aff 100644 --- a/examples/embedded/qmltwitter/qmltwitter.cpp +++ b/examples/embedded/qmltwitter/qmltwitter.cpp @@ -96,13 +96,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/qmltwitter/qmltwitter.pro b/examples/embedded/qmltwitter/qmltwitter.pro index 79e25de287..ce40cd7489 100644 --- a/examples/embedded/qmltwitter/qmltwitter.pro +++ b/examples/embedded/qmltwitter/qmltwitter.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 network SOURCES += $$PWD/qmltwitter.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmltwitter_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} |