diff options
72 files changed, 36 insertions, 553 deletions
diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro index c091b465d..a46698156 100644 --- a/demos/qt3d/cubehouse/cubehouse.pro +++ b/demos/qt3d/cubehouse/cubehouse.pro @@ -18,7 +18,3 @@ OTHER_FILES += \ cubehouse.rc RC_FILE = cubehouse.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/demos/qt3d/cubehouse/main.cpp b/demos/qt3d/cubehouse/main.cpp index b68db76ba..8824adf47 100644 --- a/demos/qt3d/cubehouse/main.cpp +++ b/demos/qt3d/cubehouse/main.cpp @@ -55,16 +55,11 @@ int main(int argc, char *argv[]) else if (view.stereoType() != QGLView::RedCyanAnaglyph) view.setStereo(true); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/demos/qt3d/pageflip/pageflip.cpp b/demos/qt3d/pageflip/pageflip.cpp index 9efc27ef7..b4ffc4b1e 100644 --- a/demos/qt3d/pageflip/pageflip.cpp +++ b/demos/qt3d/pageflip/pageflip.cpp @@ -369,18 +369,12 @@ int main(int argc, char *argv[]) if (QApplication::arguments().contains(QLatin1String("-vertical"))) view.setVertical(true); - -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro index 09aab36cd..8f71925fd 100644 --- a/demos/qt3d/pageflip/pageflip.pro +++ b/demos/qt3d/pageflip/pageflip.pro @@ -14,7 +14,3 @@ OTHER_FILES += \ pageflip.rc RC_FILE = pageflip.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/demos/qt3d/photobrowser3d/main.cpp b/demos/qt3d/photobrowser3d/main.cpp index d499cc192..1ae1330b8 100644 --- a/demos/qt3d/photobrowser3d/main.cpp +++ b/demos/qt3d/photobrowser3d/main.cpp @@ -59,19 +59,14 @@ int main(int argc, char *argv[]) { PhotoBrowser3DView view; -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else - if (view.stereoType() != QGLView::RedCyanAnaglyph) - view.camera()->setEyeSeparation(0.3f); - if (QApplication::arguments().contains(QLatin1String("-maximize"))) - view.showMaximized(); - else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) - view.showFullScreen(); - else - view.show(); -#endif + if (view.stereoType() != QGLView::RedCyanAnaglyph) + view.camera()->setEyeSeparation(0.3f); + if (QApplication::arguments().contains(QLatin1String("-maximize"))) + view.showMaximized(); + else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) + view.showFullScreen(); + else + view.show(); result = app.exec(); } diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro index 1a73dd46c..60b3ecf6e 100644 --- a/demos/qt3d/photobrowser3d/photobrowser3d.pro +++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro @@ -58,19 +58,7 @@ OTHER_FILES += \ include(../../../qt3d_pkg_dep.pri) -symbian { - symbian-abld|symbian-sbsv2 { - # ro-section in photobrowser3d can exceed default allocated space, so move rw-section a little further - QMAKE_LFLAGS.ARMCC += --rw-base 0x800000 - QMAKE_LFLAGS.GCCE += -Tdata 0xC00000 - } -} - OTHER_FILES += \ photobrowser.rc RC_FILE = photobrowser.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/demos/qt3d/shapes/shapes.cpp b/demos/qt3d/shapes/shapes.cpp index 7fe40cf68..edb48e638 100644 --- a/demos/qt3d/shapes/shapes.cpp +++ b/demos/qt3d/shapes/shapes.cpp @@ -413,17 +413,12 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); ShapesWidget w; -#ifdef Q_OS_SYMBIAN - w.setAttribute(Qt::WA_LockLandscapeOrientation, true); - w.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) w.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) w.showFullScreen(); else w.show(); -#endif return app.exec(); } diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro index af34c1623..804f22ba7 100644 --- a/demos/qt3d/shapes/shapes.pro +++ b/demos/qt3d/shapes/shapes.pro @@ -11,7 +11,3 @@ OTHER_FILES += \ shapes.rc RC_FILE = shapes.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/demos/qt3d/teaservice/teaservice.cpp b/demos/qt3d/teaservice/teaservice.cpp index fe50e89c0..8923fb3ae 100644 --- a/demos/qt3d/teaservice/teaservice.cpp +++ b/demos/qt3d/teaservice/teaservice.cpp @@ -372,11 +372,6 @@ int main(int argc, char *argv[]) menu->addAction(exitAction); QObject::connect(exitAction, SIGNAL(triggered()), &app, SLOT(quit())); -#ifdef Q_OS_SYMBIAN - mainw.setAttribute(Qt::WA_LockLandscapeOrientation, true); - mainw.showFullScreen(); -#endif - mainw.show(); return app.exec(); } diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro index c80bac640..f54f3b516 100644 --- a/demos/qt3d/teaservice/teaservice.pro +++ b/demos/qt3d/teaservice/teaservice.pro @@ -15,7 +15,3 @@ OTHER_FILES += \ teaservice.rc RC_FILE = teaservice.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/demos/quick3d/model_viewer/main.cpp b/demos/quick3d/model_viewer/main.cpp index 0ac5ddce9..a3629b48e 100644 --- a/demos/quick3d/model_viewer/main.cpp +++ b/demos/quick3d/model_viewer/main.cpp @@ -53,18 +53,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/model_viewer.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro index 4ba78eb0b..1d6d52a4d 100644 --- a/demos/quick3d/model_viewer/model_viewer.pro +++ b/demos/quick3d/model_viewer/model_viewer.pro @@ -8,15 +8,6 @@ SOURCES += main.cpp include(../../../qt3dquick_pkg_dep.pri) include(../../../qml_pkg.pri) -symbian { - qmlDeployment2.sources = qml\meshes\* - qmlDeployment2.path = qml\meshes - DEPLOYMENT += qmlDeployment2 - qmlDeployment3.sources = qml\images\* - qmlDeployment3.path = qml\images - DEPLOYMENT += qmlDeployment3 -} - OTHER_FILES += \ model_viewer.rc diff --git a/demos/quick3d/robo_bounce/main.cpp b/demos/quick3d/robo_bounce/main.cpp index fc98988b3..687b3c4d6 100644 --- a/demos/quick3d/robo_bounce/main.cpp +++ b/demos/quick3d/robo_bounce/main.cpp @@ -53,18 +53,12 @@ int main(int argc, char *argv[]) QSGView view(f); view.setSource(QUrl(QLatin1String("qrc:///qml/robobounce.qml"))); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockPortraitOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/demos/quick3d/tea_service/main.cpp b/demos/quick3d/tea_service/main.cpp index bb22f33e0..42ea29984 100644 --- a/demos/quick3d/tea_service/main.cpp +++ b/demos/quick3d/tea_service/main.cpp @@ -54,18 +54,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/teaservice.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/devices/symbian/symbian.pro b/devices/symbian/symbian.pro deleted file mode 100644 index 6ea2b580f..000000000 --- a/devices/symbian/symbian.pro +++ /dev/null @@ -1,67 +0,0 @@ -# Use subdirs template to suppress generation of unnecessary files -TEMPLATE = subdirs - -symbian { - load(data_caging_paths) - - SUBDIRS= - # WARNING: Changing TARGET name will break Symbian SISX upgrade functionality - # DO NOT TOUCH TARGET VARIABLE IF YOU ARE NOT SURE WHAT YOU ARE DOING - TARGET = "Qt Quick 3D" - - # This is the UID for the overall .SIS file package - TARGET.UID3 = 0x20031E9A - - VERSION = 1.0.0 - - vendorinfo = \ - "; Localised Vendor name" \ - "%{\"Nokia\"}" \ - " " \ - "; Unique Vendor name" \ - ":\"Nokia\"" \ - " " - qt3dlibraries.pkg_prerules += vendorinfo - - qt3dlibraries.sources = Qt3D$${QT_LIBINFIX}.dll - qt3dlibraries.path = /sys/bin - DEPLOYMENT += qt3dlibraries - - contains(CONFIG, old_importer): { - qt3dsceneformats_plugins.sources = \ - qscene3ds$${QT_LIBINFIX}.dll \ - qsceneobj$${QT_LIBINFIX}.dll \ - qscenebezier$${QT_LIBINFIX}.dll - qt3dsceneformats_plugins.path = $$QT_PLUGINS_BASE_DIR/sceneformats - DEPLOYMENT += qt3dsceneformats_plugins - } else { - qt3dsceneformats_plugins.sources = \ - qsceneai$${QT_LIBINFIX}.dll \ - qscenebezier$${QT_LIBINFIX}.dll - qt3dsceneformats_plugins.path = $$QT_PLUGINS_BASE_DIR/sceneformats - DEPLOYMENT += qt3dsceneformats_plugins - } - - qt3dimageformats_plugins.sources = \ - qtga$${QT_LIBINFIX}.dll - qt3dimageformats_plugins.path = $$QT_PLUGINS_BASE_DIR/imageformats - DEPLOYMENT += qt3dimageformats_plugins - - qt3dquick.sources = Qt3DQuick$${QT_LIBINFIX}.dll - qt3dquick.path = /sys/bin - qt3dthreedImports.sources = \ - qthreedqmlplugin.dll \ - $$PWD/../../src/imports/threed/qmldir - qt3dthreedImports.path = $$QT_IMPORTS_BASE_DIR/Qt3D - qt3dshapesImports.sources = \ - qshapesqmlplugin.dll \ - $$PWD/../../src/imports/shapes/Cube.qml \ - $$PWD/../../src/imports/shapes/cube.obj \ - $$PWD/../../src/imports/shapes/Quad.qml \ - $$PWD/../../src/imports/shapes/quad.obj \ - $$PWD/../../src/imports/shapes/Teapot.qml \ - $$PWD/../../src/imports/shapes/teapot.bez \ - $$PWD/../../src/imports/shapes/qmldir - qt3dshapesImports.path = $$QT_IMPORTS_BASE_DIR/Qt3D/Shapes - DEPLOYMENT += qt3dquick qt3dthreedImports qt3dshapesImports -} diff --git a/examples/qt3d/basket/main.cpp b/examples/qt3d/basket/main.cpp index 3963408c9..a97b10775 100644 --- a/examples/qt3d/basket/main.cpp +++ b/examples/qt3d/basket/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); BasketView view; -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else if (view.stereoType() != QGLView::RedCyanAnaglyph) view.camera()->setEyeSeparation(0.3f); if (QApplication::arguments().contains(QLatin1String("-maximize"))) @@ -58,6 +54,6 @@ int main(int argc, char *argv[]) view.showFullScreen(); else view.show(); -#endif + return app.exec(); } diff --git a/examples/qt3d/builder/main.cpp b/examples/qt3d/builder/main.cpp index 29e9f1e68..46c68467e 100644 --- a/examples/qt3d/builder/main.cpp +++ b/examples/qt3d/builder/main.cpp @@ -46,10 +46,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); BuilderView view; -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else + if (view.stereoType() != QGLView::RedCyanAnaglyph) view.camera()->setEyeSeparation(0.3f); if (QApplication::arguments().contains(QLatin1String("-maximize"))) @@ -58,6 +55,6 @@ int main(int argc, char *argv[]) view.showFullScreen(); else view.show(); -#endif + return app.exec(); } diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro index 4f21388ab..7b2d2877e 100644 --- a/examples/qt3d/cube/cube.pro +++ b/examples/qt3d/cube/cube.pro @@ -13,7 +13,3 @@ OTHER_FILES += \ cube.rc RC_FILE = cube.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/examples/qt3d/cube/main.cpp b/examples/qt3d/cube/main.cpp index 79c75655b..bad1c4c4f 100644 --- a/examples/qt3d/cube/main.cpp +++ b/examples/qt3d/cube/main.cpp @@ -45,10 +45,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); CubeView view; -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else + if (view.stereoType() != QGLView::RedCyanAnaglyph) view.camera()->setEyeSeparation(0.3f); if (QApplication::arguments().contains(QLatin1String("-maximize"))) @@ -57,6 +54,6 @@ int main(int argc, char *argv[]) view.showFullScreen(); else view.show(); -#endif + return app.exec(); } diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro index 3fd34e9d7..a7e90f48a 100644 --- a/examples/qt3d/cylinder/cylinder.pro +++ b/examples/qt3d/cylinder/cylinder.pro @@ -13,7 +13,3 @@ OTHER_FILES += \ cylinder.rc RC_FILE = cylinder.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/examples/qt3d/cylinder/main.cpp b/examples/qt3d/cylinder/main.cpp index 8101853d2..39297a53d 100644 --- a/examples/qt3d/cylinder/main.cpp +++ b/examples/qt3d/cylinder/main.cpp @@ -45,10 +45,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); CylinderView view; -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else + if (view.stereoType() != QGLView::RedCyanAnaglyph) view.camera()->setEyeSeparation(0.3f); if (QApplication::arguments().contains(QLatin1String("-maximize"))) @@ -57,6 +54,6 @@ int main(int argc, char *argv[]) view.showFullScreen(); else view.show(); -#endif + return app.exec(); } diff --git a/examples/qt3d/geometry/geometry.cpp b/examples/qt3d/geometry/geometry.cpp index 870d68d57..a54b7ca75 100644 --- a/examples/qt3d/geometry/geometry.cpp +++ b/examples/qt3d/geometry/geometry.cpp @@ -133,13 +133,8 @@ Geometry::Geometry(QObject *parent, QGLMaterialCollection *materials) { { u4, v9 }, { u5, v8 }, { u4, v7 } } // L-G-B }; -#ifdef Q_OS_SYMBIAN - const int imgSize = 256; - const int txtSize = 6; -#else const int imgSize = 1024; const int txtSize = 36; -#endif QImage uv(imgSize, imgSize, QImage::Format_ARGB32); uv.fill(qRgba(196, 196, 196, 196)); diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro index 018948928..66cbc9484 100644 --- a/examples/qt3d/geometry/geometry.pro +++ b/examples/qt3d/geometry/geometry.pro @@ -18,7 +18,3 @@ OTHER_FILES += \ geometry.rc RC_FILE = geometry.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/examples/qt3d/geometry/main.cpp b/examples/qt3d/geometry/main.cpp index b2f2025f8..725066bb4 100644 --- a/examples/qt3d/geometry/main.cpp +++ b/examples/qt3d/geometry/main.cpp @@ -45,10 +45,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); GeometryView view; -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else + if (view.stereoType() != QGLView::RedCyanAnaglyph) view.camera()->setEyeSeparation(0.3f); if (QApplication::arguments().contains(QLatin1String("-maximize"))) @@ -57,6 +54,6 @@ int main(int argc, char *argv[]) view.showFullScreen(); else view.show(); -#endif + return app.exec(); } diff --git a/examples/qt3d/graphicsview/graphicsview.pro b/examples/qt3d/graphicsview/graphicsview.pro index d01ebf6db..758957e69 100644 --- a/examples/qt3d/graphicsview/graphicsview.pro +++ b/examples/qt3d/graphicsview/graphicsview.pro @@ -32,11 +32,3 @@ OTHER_FILES += \ graphicsview.rc RC_FILE = graphicsview.rc - -symbian { - ICON = ../qt3d.svg -} - -symbian { - ICON = ../qt3d.svg -} diff --git a/examples/qt3d/graphicsview/main.cpp b/examples/qt3d/graphicsview/main.cpp index d9eae41c7..39a3d7a08 100644 --- a/examples/qt3d/graphicsview/main.cpp +++ b/examples/qt3d/graphicsview/main.cpp @@ -54,9 +54,5 @@ int main(int argc, char *argv[]) view.setViewport(new QGLWidget(format)); view.show(); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#endif return app.exec(); } diff --git a/examples/qt3d/nesting/main.cpp b/examples/qt3d/nesting/main.cpp index f0c849d24..abb38f0f7 100644 --- a/examples/qt3d/nesting/main.cpp +++ b/examples/qt3d/nesting/main.cpp @@ -46,19 +46,12 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); CubeView view; -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else - if (view.stereoType() != QGLView::RedCyanAnaglyph) - view.camera()->setEyeSeparation(0.3f); if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro index a0734a410..f1b179702 100644 --- a/examples/qt3d/nesting/nesting.pro +++ b/examples/qt3d/nesting/nesting.pro @@ -13,7 +13,3 @@ OTHER_FILES += \ nesting.rc RC_FILE = nesting.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/examples/qt3d/solarsystem/main.cpp b/examples/qt3d/solarsystem/main.cpp index a4d44d3d0..49c7cfb17 100644 --- a/examples/qt3d/solarsystem/main.cpp +++ b/examples/qt3d/solarsystem/main.cpp @@ -47,19 +47,12 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); SolarSystemView view; -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else - if (view.stereoType() != QGLView::RedCyanAnaglyph) - view.camera()->setEyeSeparation(0.3f); if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro index 42d8cfde8..71e9e595e 100644 --- a/examples/qt3d/solarsystem/solarsystem.pro +++ b/examples/qt3d/solarsystem/solarsystem.pro @@ -22,7 +22,3 @@ OTHER_FILES += \ solarsystem.rc RC_FILE = solarsystem.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/examples/qt3d/tank/main.cpp b/examples/qt3d/tank/main.cpp index 14e1ef434..f4703f8b9 100644 --- a/examples/qt3d/tank/main.cpp +++ b/examples/qt3d/tank/main.cpp @@ -51,10 +51,6 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); TankView view; -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else if (view.stereoType() != QGLView::RedCyanAnaglyph) view.camera()->setEyeSeparation(0.3f); if (QApplication::arguments().contains(QLatin1String("-maximize"))) @@ -63,7 +59,6 @@ int main(int argc, char *argv[]) view.showFullScreen(); else view.show(); -#endif return a.exec(); } diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro index 3b4b932f4..1f1daef2c 100644 --- a/examples/qt3d/tank/tank.pro +++ b/examples/qt3d/tank/tank.pro @@ -18,7 +18,3 @@ OTHER_FILES += \ tank.rc RC_FILE = tank.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/examples/qt3d/teapot/main.cpp b/examples/qt3d/teapot/main.cpp index 8bf02f47b..f98693f3c 100644 --- a/examples/qt3d/teapot/main.cpp +++ b/examples/qt3d/teapot/main.cpp @@ -48,10 +48,6 @@ int main(int argc, char *argv[]) TeapotView view; //! [main-args] -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.showFullScreen(); -#else if (view.stereoType() != QGLView::RedCyanAnaglyph) view.camera()->setEyeSeparation(0.3f); if (QApplication::arguments().contains(QLatin1String("-maximize"))) @@ -60,7 +56,6 @@ int main(int argc, char *argv[]) view.showFullScreen(); else view.show(); -#endif //! [main-args-end] return app.exec(); diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro index ef24b6635..dbd8de35f 100644 --- a/examples/qt3d/teapot/teapot.pro +++ b/examples/qt3d/teapot/teapot.pro @@ -12,7 +12,3 @@ OTHER_FILES += \ teapot.rc RC_FILE = teapot.rc - -symbian { - ICON = ../qt3d.svg -} diff --git a/examples/quick3d/basket/main.cpp b/examples/quick3d/basket/main.cpp index b8a0884b2..9674f8396 100644 --- a/examples/quick3d/basket/main.cpp +++ b/examples/quick3d/basket/main.cpp @@ -54,18 +54,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/basket.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showMaximized(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/examples/quick3d/cube/main.cpp b/examples/quick3d/cube/main.cpp index 4e905054d..bbfe16888 100644 --- a/examples/quick3d/cube/main.cpp +++ b/examples/quick3d/cube/main.cpp @@ -55,18 +55,12 @@ int main(int argc, char *argv[]) view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/examples/quick3d/forest/main.cpp b/examples/quick3d/forest/main.cpp index 26f191d65..59daf702f 100644 --- a/examples/quick3d/forest/main.cpp +++ b/examples/quick3d/forest/main.cpp @@ -51,18 +51,12 @@ int main(int argc, char *argv[]) QSGView view(f); view.setSource(QUrl(QLatin1String("qrc:///qml/forest.qml"))); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/examples/quick3d/lander/lander.pro b/examples/quick3d/lander/lander.pro index d6dba2b59..f9eb251db 100644 --- a/examples/quick3d/lander/lander.pro +++ b/examples/quick3d/lander/lander.pro @@ -8,12 +8,6 @@ SOURCES += main.cpp include(../../../qt3dquick_pkg_dep.pri) include(../../../qml_pkg.pri) -symbian { - qmlDeployment2.sources = qml\meshes\* - qmlDeployment2.path = qml\meshes - DEPLOYMENT += qmlDeployment2 -} - OTHER_FILES += \ lander.rc diff --git a/examples/quick3d/lander/main.cpp b/examples/quick3d/lander/main.cpp index 9ede92553..445f897df 100644 --- a/examples/quick3d/lander/main.cpp +++ b/examples/quick3d/lander/main.cpp @@ -53,18 +53,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/lander.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/examples/quick3d/matrix_animation/main.cpp b/examples/quick3d/matrix_animation/main.cpp index de90e6a10..710ce1693 100644 --- a/examples/quick3d/matrix_animation/main.cpp +++ b/examples/quick3d/matrix_animation/main.cpp @@ -54,18 +54,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/matrix-animation.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/examples/quick3d/monkeygod/main.cpp b/examples/quick3d/monkeygod/main.cpp index 468cf5164..ec7482e09 100644 --- a/examples/quick3d/monkeygod/main.cpp +++ b/examples/quick3d/monkeygod/main.cpp @@ -55,18 +55,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/monkeygod.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/examples/quick3d/monkeygod/monkeygod.pro b/examples/quick3d/monkeygod/monkeygod.pro index 1c93f9e88..9bf5b82fb 100644 --- a/examples/quick3d/monkeygod/monkeygod.pro +++ b/examples/quick3d/monkeygod/monkeygod.pro @@ -8,12 +8,6 @@ SOURCES += main.cpp include(../../../qt3dquick_pkg_dep.pri) include(../../../qml_pkg.pri) -symbian { - qmlDeployment2.sources = qml\meshes\* - qmlDeployment2.path = qml\meshes - DEPLOYMENT += qmlDeployment2 -} - OTHER_FILES += \ monkeygod.rc diff --git a/examples/quick3d/moon/main.cpp b/examples/quick3d/moon/main.cpp index 2a3bf0ec3..61e8fdb9e 100644 --- a/examples/quick3d/moon/main.cpp +++ b/examples/quick3d/moon/main.cpp @@ -54,17 +54,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/moon.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif + return app.exec(); } diff --git a/examples/quick3d/photoroom/main.cpp b/examples/quick3d/photoroom/main.cpp index 0ec1ce168..782f80b62 100644 --- a/examples/quick3d/photoroom/main.cpp +++ b/examples/quick3d/photoroom/main.cpp @@ -54,17 +54,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/photoroom.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif + return app.exec(); } diff --git a/examples/quick3d/shaders/main.cpp b/examples/quick3d/shaders/main.cpp index e832891ff..ae29c3537 100644 --- a/examples/quick3d/shaders/main.cpp +++ b/examples/quick3d/shaders/main.cpp @@ -54,18 +54,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/shaders.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockPortraitOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/examples/quick3d/shaders/shaders.pro b/examples/quick3d/shaders/shaders.pro index 803897a2e..5dd55aa93 100644 --- a/examples/quick3d/shaders/shaders.pro +++ b/examples/quick3d/shaders/shaders.pro @@ -8,15 +8,6 @@ SOURCES += main.cpp include(../../../qt3dquick_pkg_dep.pri) include(../../../qml_pkg.pri) -symbian { - qmlDeployment2.sources = qml\images\* - qmlDeployment2.path = qml\images - DEPLOYMENT += qmlDeployment2 - qmlDeployment3.sources = qml\meshes\* - qmlDeployment3.path = qml\meshes - DEPLOYMENT += qmlDeployment3 -} - OTHER_FILES += \ shaders.rc diff --git a/examples/quick3d/sphere/main.cpp b/examples/quick3d/sphere/main.cpp index 003ed28a1..120664d03 100644 --- a/examples/quick3d/sphere/main.cpp +++ b/examples/quick3d/sphere/main.cpp @@ -54,18 +54,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/sphere.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } @@ -41,15 +41,5 @@ contains(TEMPLATE, app) { } else { DESTDIR = ../../../bin } - symbian { - vendorinfo = \ - "%{\"NOKIA\"}" \ - ":\"NOKIA\"" - - my_deployment.pkg_prerules = vendorinfo - DEPLOYMENT += my_deployment - - ICON = ../qt3d.svg - } } } diff --git a/qml_pkg.pri b/qml_pkg.pri index 0cf7e6e06..5c77efbd2 100644 --- a/qml_pkg.pri +++ b/qml_pkg.pri @@ -10,23 +10,16 @@ win32 { } qmlResources.files = qml -symbian { - DEPLOYMENT += qmlResources - qmlDeployment.sources = qml\* - qmlDeployment.path = qml - DEPLOYMENT += qmlDeployment +macx { + qmlResources.path = Contents/Resources + QMAKE_BUNDLE_DATA += qmlResources } else { - macx { - qmlResources.path = Contents/Resources - QMAKE_BUNDLE_DATA += qmlResources - } else { - !package { - qmlResources.input = qmlResources.files - qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml - qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - qmlResources.CONFIG += no_link_no_clean - qmlResources.variable_out = POST_TARGETDEPS - QMAKE_EXTRA_COMPILERS += qmlResources - } + !package { + qmlResources.input = qmlResources.files + qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml + qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + qmlResources.CONFIG += no_link_no_clean + qmlResources.variable_out = POST_TARGETDEPS + QMAKE_EXTRA_COMPILERS += qmlResources } } diff --git a/qt3dquick_pkg_dep.pri b/qt3dquick_pkg_dep.pri index 95cf22d4b..4d0103524 100644 --- a/qt3dquick_pkg_dep.pri +++ b/qt3dquick_pkg_dep.pri @@ -26,8 +26,4 @@ package { maemo: icons.files = icon-l-qtquick3d.png } -symbian { - ICON = ../qtquick3d.svg -} - include(pkg.pri) diff --git a/qtc_packaging/debian_harmattan/README b/qtc_packaging/debian_harmattan/README index b21b46dff..1c33a0125 100644 --- a/qtc_packaging/debian_harmattan/README +++ b/qtc_packaging/debian_harmattan/README @@ -27,15 +27,15 @@ util/ examples/ Some examples of using QtQuick3D (QML bindings) and Qt3D (C++ API). demos/ - Some more complex demos of using QtQuiick3D (QML bindings) and Qt3D (C++ API). + Some more complex demos of using QtQuick3D (QML bindings) and Qt3D (C++ API). +tutorials/ + Step-by-step tutorials tests/auto/qml3d/ Unit tests for the QtQuick3D bindings. tests/auto/threed/ Unit tests for the Qt3D C++ API doc/ Documentation. -devices/symbian/ - Symbian deployment file Documentation diff --git a/qtquick3d.pro b/qtquick3d.pro index b5e24cc80..cb9ad31ff 100644 --- a/qtquick3d.pro +++ b/qtquick3d.pro @@ -28,7 +28,7 @@ package { distInstalls.path = $$QT3D_INSTALL_DATA/mkspecs/features !qtc_hmtn: INSTALLS += distInstalls } else { - symbian|win32 { + win32 { Qt3DFile=$$PWD\\features\\qt3d.prf Qt3DFile=$$replace(Qt3DFile,/,\\) featuresDir=$$QT3D_INSTALL_DATA\\mkspecs\\features @@ -48,17 +48,6 @@ package { } } -symbian { - # symbian needs to be at the end, because qt3d.pro does an ordered build, - # and symbian depends on all the others. - SUBDIRS += symbianinstall - - symbianinstall.subdir = devices/symbian - symbianinstall.target = sub-symbianinstall - symbianinstall.depends = $$SUBDIRS - symbianinstall.depends -= symbianinstall -} - OTHER_FILES += \ qtc_packaging/debian_harmattan/rules \ qtc_packaging/debian_harmattan/README \ diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro index 3c607c5b0..3a71d9114 100644 --- a/src/imports/shapes/shapes.pro +++ b/src/imports/shapes/shapes.pro @@ -21,15 +21,6 @@ win32 { } } -symbian { - CONFIG += epocallowdlldata - MMP_RULES += EXPORTUNFROZEN - LIBS += -lQt3D -lQt3DQuick - TARGET.EPOCALLOWDLLDATA = 1 - TARGET.CAPABILITY = All -Tcb - TARGET.UID3 = 0x20031E9C -} - SOURCES += \ sphere.cpp \ shapes.cpp \ diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro index 6a42bb603..0de3f99d4 100644 --- a/src/imports/threed/threed.pro +++ b/src/imports/threed/threed.pro @@ -20,14 +20,6 @@ win32 { } } -symbian { - CONFIG += epocallowdlldata - MMP_RULES += EXPORTUNFROZEN - LIBS += -lQt3D -lQt3DQuick - TARGET.CAPABILITY = All -Tcb - TARGET.UID3 = 0x20031E9B -} - SOURCES += \ threed.cpp \ qt3dnamespace.cpp \ diff --git a/src/plugins/imageformats/tga/tga.pro b/src/plugins/imageformats/tga/tga.pro index 0a681b554..3b4d66cba 100644 --- a/src/plugins/imageformats/tga/tga.pro +++ b/src/plugins/imageformats/tga/tga.pro @@ -9,6 +9,3 @@ SOURCES += main.cpp \ qtgafile.cpp target.path += $$QT3D_INSTALL_PLUGINS/imageformats INSTALLS += target -symbian { - TARGET.UID3 = 0x20031E99 -} diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri index b1aa081c8..54d7da432 100644 --- a/src/plugins/qpluginbase.pri +++ b/src/plugins/qpluginbase.pri @@ -13,9 +13,3 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols include(qt_targets.pri) wince*:LIBS += $$QMAKE_LIBS_GUI - -symbian: { - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -Tcb - TARGET = $${TARGET}$${QT_LIBINFIX} -} diff --git a/src/plugins/sceneformats/assimp/assimp.pro b/src/plugins/sceneformats/assimp/assimp.pro index 7924f66d0..9be99fd0f 100644 --- a/src/plugins/sceneformats/assimp/assimp.pro +++ b/src/plugins/sceneformats/assimp/assimp.pro @@ -40,10 +40,6 @@ package { DESTDIR = $$QT3D_INSTALL_PLUGINS/sceneformats } -symbian { - LIBS += -lQt3D - TARGET.UID3 = 0x20031E97 -} # suppress warnings about std::copy using unsafe parameters win32: DEFINES +=_SCL_SECURE_NO_WARNINGS diff --git a/src/plugins/sceneformats/bezier/bezier.pro b/src/plugins/sceneformats/bezier/bezier.pro index 81556cf45..8307a0554 100644 --- a/src/plugins/sceneformats/bezier/bezier.pro +++ b/src/plugins/sceneformats/bezier/bezier.pro @@ -32,7 +32,3 @@ package { CONFIG += qt3d DESTDIR = $$QT3D_INSTALL_PLUGINS/sceneformats } -symbian { - LIBS += -lQt3D - TARGET.UID3 = 0x20031E98 -} diff --git a/src/quick3d/qt3dquickglobal.h b/src/quick3d/qt3dquickglobal.h index 7c751b593..87e7f4ba7 100644 --- a/src/quick3d/qt3dquickglobal.h +++ b/src/quick3d/qt3dquickglobal.h @@ -45,7 +45,7 @@ #include <QtCore/qglobal.h> QT_LICENSED_MODULE(QtQuick3D) -#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) # if defined(QT_NODLL) # undef QT_MAKEDLL # undef QT_DLL diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro index 72d3036e2..c73c51119 100644 --- a/src/quick3d/quick3d.pro +++ b/src/quick3d/quick3d.pro @@ -55,15 +55,6 @@ win32 { } } -symbian { - DEFINES += QT_MAKEDLL - CONFIG += epocallowdlldata - MMP_RULES += EXPORTUNFROZEN - LIBS += -lQt3D - TARGET.UID3 = 0x20031E96 - TARGET.CAPABILITY = All -Tcb -} - include(quick3d.pri) PUBLIC_HEADERS = $$HEADERS @@ -102,20 +93,3 @@ macx:CONFIG(qt_framework, qt_framework|qt_no_framework) { QMAKE_EXTRA_COMPILERS += exportHeaders } -symbian { - load(data_caging_paths) - - qt3dMwHeaders = *.h - for(api,qt3dMwHeaders) { - entries=$$files($$api); - #files() attaches a ';' at the end which needs to be removed - entries=$$replace(entries, ;,) - for(entry,entries) { - exists($$entry) { - contains(PUBLIC_HEADERS, $$basename(entry)) { - BLD_INF_RULES.prj_exports += "$$entry $$MW_LAYER_PUBLIC_EXPORT_PATH(Qt3DQuick/$$basename(entry))" - } - } - } - } -} diff --git a/src/threed/global/qt3dglobal.h b/src/threed/global/qt3dglobal.h index 1e3b3d793..76262044e 100644 --- a/src/threed/global/qt3dglobal.h +++ b/src/threed/global/qt3dglobal.h @@ -46,7 +46,7 @@ // XXX: Move to qglobal.h eventually. QT_LICENSED_MODULE(Qt3D) -#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) # if defined(QT_NODLL) # undef QT_MAKEDLL # undef QT_DLL diff --git a/src/threed/threed.pro b/src/threed/threed.pro index a80018329..c858969e3 100644 --- a/src/threed/threed.pro +++ b/src/threed/threed.pro @@ -37,14 +37,6 @@ win32 { } } -symbian { - DEFINES += QT_MAKEDLL - CONFIG += epocallowdlldata - MMP_RULES += EXPORTUNFROZEN - TARGET.CAPABILITY = All -Tcb - TARGET.UID3 = 0x20031E95 -} - include(../private/private.pri) include(threed.pri) PUBLIC_HEADERS = $$HEADERS @@ -82,18 +74,3 @@ macx:CONFIG(qt_framework, qt_framework|qt_no_framework) { exportHeaders.variable_out = PRE_TARGETDEPS QMAKE_EXTRA_COMPILERS += exportHeaders } - -symbian { - export_headers.files = $$PUBLIC_HEADERS - exportPath=$${EPOCROOT}$${MW_LAYER_PUBLIC_EXPORT_PATH}/Qt3D/ - nativePath=$$replace(exportPath,/,\\) - exists($$nativePath) { - } else { - system($$QMAKE_MKDIR $$nativePath) - } - - message($$PUBLIC_HEADERS) - for(export_header, export_headers.files) { - BLD_INF_RULES.prj_exports += "$$export_header $$MW_LAYER_PUBLIC_EXPORT_PATH(Qt3D/$$basename(export_header))" - } -} diff --git a/tests/benchmarks/matrix_properties/matrix_properties.pro b/tests/benchmarks/matrix_properties/matrix_properties.pro index ac490f37b..d73da6d43 100644 --- a/tests/benchmarks/matrix_properties/matrix_properties.pro +++ b/tests/benchmarks/matrix_properties/matrix_properties.pro @@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle SOURCES += tst_matrix_properties.cpp -symbian* { - data.sources = data/* - data.path = data - DEPLOYMENT += data -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/benchmarks/matrix_properties/tst_matrix_properties.cpp b/tests/benchmarks/matrix_properties/tst_matrix_properties.cpp index fafa555af..c5635d367 100644 --- a/tests/benchmarks/matrix_properties/tst_matrix_properties.cpp +++ b/tests/benchmarks/matrix_properties/tst_matrix_properties.cpp @@ -43,12 +43,6 @@ #include <QDeclarativeEngine> #include <QDeclarativeComponent> -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -// Application private dir is default search path for files, so SRCDIR can be set to empty -#define SRCDIR "." -#endif - class tst_matrix_properties : public QObject { Q_OBJECT diff --git a/tutorials/qt3d/cube1/cube1.pro b/tutorials/qt3d/cube1/cube1.pro index 6af35d1d7..f00497109 100644 --- a/tutorials/qt3d/cube1/cube1.pro +++ b/tutorials/qt3d/cube1/cube1.pro @@ -4,14 +4,3 @@ CONFIG += qt warn_on qt3d SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h DESTDIR = ../../../bin/qt3d/tutorials - -symbian { - vendorinfo = \ - "%{\"NOKIA\"}" \ - ":\"NOKIA\"" - - my_deployment.pkg_prerules = vendorinfo - DEPLOYMENT += my_deployment - - ICON = ../../qt3d.svg -} diff --git a/tutorials/qt3d/cube2/cube2.pro b/tutorials/qt3d/cube2/cube2.pro index 5adc2e283..bdf386ddd 100644 --- a/tutorials/qt3d/cube2/cube2.pro +++ b/tutorials/qt3d/cube2/cube2.pro @@ -4,14 +4,3 @@ CONFIG += qt warn_on qt3d SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h DESTDIR = ../../../bin/qt3d/tutorials - -symbian { - vendorinfo = \ - "%{\"NOKIA\"}" \ - ":\"NOKIA\"" - - my_deployment.pkg_prerules = vendorinfo - DEPLOYMENT += my_deployment - - ICON = ../../qt3d.svg -} diff --git a/tutorials/qt3d/cube3/cube3.pro b/tutorials/qt3d/cube3/cube3.pro index 1758cadbb..8479e385d 100644 --- a/tutorials/qt3d/cube3/cube3.pro +++ b/tutorials/qt3d/cube3/cube3.pro @@ -4,14 +4,3 @@ CONFIG += qt warn_on qt3d SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h DESTDIR = ../../../bin/qt3d/tutorials - -symbian { - vendorinfo = \ - "%{\"NOKIA\"}" \ - ":\"NOKIA\"" - - my_deployment.pkg_prerules = vendorinfo - DEPLOYMENT += my_deployment - - ICON = ../../qt3d.svg -} diff --git a/tutorials/qt3d/cube4/cube4.pro b/tutorials/qt3d/cube4/cube4.pro index 5beaa7523..c36712be0 100644 --- a/tutorials/qt3d/cube4/cube4.pro +++ b/tutorials/qt3d/cube4/cube4.pro @@ -5,14 +5,3 @@ SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h RESOURCES = cube.qrc DESTDIR = ../../../bin/qt3d/tutorials - -symbian { - vendorinfo = \ - "%{\"NOKIA\"}" \ - ":\"NOKIA\"" - - my_deployment.pkg_prerules = vendorinfo - DEPLOYMENT += my_deployment - - ICON = ../../qt3d.svg -} diff --git a/tutorials/qt3d/penguin/penguin.pro b/tutorials/qt3d/penguin/penguin.pro index d62a765cb..22c96cf5b 100644 --- a/tutorials/qt3d/penguin/penguin.pro +++ b/tutorials/qt3d/penguin/penguin.pro @@ -6,14 +6,3 @@ SOURCES = modelview.cpp \ HEADERS = modelview.h RESOURCES = model.qrc DESTDIR = ../../../bin/qt3d/tutorials - -symbian { - vendorinfo = \ - "%{\"NOKIA\"}" \ - ":\"NOKIA\"" - - my_deployment.pkg_prerules = vendorinfo - DEPLOYMENT += my_deployment - - ICON = ../../qt3d.svg -} diff --git a/tutorials/qt3d/penguin_advanced/penguin_advanced.pro b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro index 91233c363..baf5b9a8f 100644 --- a/tutorials/qt3d/penguin_advanced/penguin_advanced.pro +++ b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro @@ -6,14 +6,3 @@ SOURCES = modelview.cpp \ main.cpp HEADERS = modelview.h RESOURCES = model_advanced.qrc - -symbian { - vendorinfo = \ - "%{\"NOKIA\"}" \ - ":\"NOKIA\"" - - my_deployment.pkg_prerules = vendorinfo - DEPLOYMENT += my_deployment - - ICON = ../../qt3d.svg -} diff --git a/tutorials/quick3d/teapot_bounce_qml/main.cpp b/tutorials/quick3d/teapot_bounce_qml/main.cpp index c047358c0..5f3376f3c 100644 --- a/tutorials/quick3d/teapot_bounce_qml/main.cpp +++ b/tutorials/quick3d/teapot_bounce_qml/main.cpp @@ -54,18 +54,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/teapot-bounce.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } diff --git a/tutorials/quick3d/teapot_qml/main.cpp b/tutorials/quick3d/teapot_qml/main.cpp index c16067470..7293426e3 100644 --- a/tutorials/quick3d/teapot_qml/main.cpp +++ b/tutorials/quick3d/teapot_qml/main.cpp @@ -54,18 +54,12 @@ int main(int argc, char *argv[]) QString qml = q_get_qmldir(QLatin1String("qml/teapot.qml")); view.setSource(QUrl::fromLocalFile(qml)); -#ifdef Q_OS_SYMBIAN - view.setAttribute(Qt::WA_LockLandscapeOrientation, true); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - view.showFullScreen(); -#else if (QApplication::arguments().contains(QLatin1String("-maximize"))) view.showMaximized(); else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) view.showFullScreen(); else view.show(); -#endif return app.exec(); } |