Various symbian fixes

Conflicts:

	demos/quick3d/model_viewer/model_viewer.pro
	demos/quick3d/robo_bounce/robo_bounce.pro
	demos/quick3d/tea_service/tea_service.pro
	examples/qt3d/basket/basket.pro
	examples/qt3d/builder/builder.pro
	examples/quick3d/basket/basket.pro
	examples/quick3d/cube/cube.pro
	examples/quick3d/forest/forest.pro
	examples/quick3d/lander/lander.pro
	examples/quick3d/matrix_animation/matrix_animation.pro
	examples/quick3d/monkeygod/monkeygod.pro
	examples/quick3d/moon/moon.pro
	examples/quick3d/photoroom/photoroom.pro
	examples/quick3d/shaders/shaders.pro
	examples/quick3d/sphere/sphere.pro
	examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro
	examples/quick3d/tutorials/teapot_qml/teapot_qml.pro
	src/quick3d/quick3d.pri

Change-Id: Ia14cfdcabd85b2264266d977f97a1216244a783c
Reviewed-on: http://codereview.qt.nokia.com/1202
Reviewed-by: Sarah Jane Smith

13 files changed, 83 insertions, 14 deletions

diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index a46698156..c091b465d 100644
--- a/demos/qt3d/cubehouse/cubehouse.pro
+++ b/demos/qt3d/cubehouse/cubehouse.pro
@@ -18,3 +18,7 @@ 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 29326a535..1c0c79533 100644
--- a/demos/qt3d/cubehouse/main.cpp
+++ b/demos/qt3d/cubehouse/main.cpp
@@ -53,12 +53,18 @@ int main(int argc, char *argv[])
     if (QApplication::arguments().contains(QLatin1String("-stereo")))
         view.setStereo(true);
     else if (view.stereoType() != QGLView::RedCyanAnaglyph)
-        view.setStereo(true);
+        view.setStereo(true);  
+
+#ifdef Q_OS_SYMBIAN
+    view.setAttribute(Qt::WA_LockLandscapeOrientation, true);
+    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/demos/qt3d/pageflip/pageflip.cpp b/demos/qt3d/pageflip/pageflip.cpp
index 5e5768843..9cfc73711 100644
--- a/demos/qt3d/pageflip/pageflip.cpp
+++ b/demos/qt3d/pageflip/pageflip.cpp
@@ -368,12 +368,20 @@ int main(int argc, char *argv[])
         view.setBlend(true);
     if (QApplication::arguments().contains(QLatin1String("-vertical")))
         view.setVertical(true);
+
+
+#ifdef Q_OS_SYMBIAN
+    view.setAttribute(Qt::WA_LockLandscapeOrientation, true);
+    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/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index 8f71925fd..09aab36cd 100644
--- a/demos/qt3d/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
@@ -14,3 +14,7 @@ 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 748866bab..9bdd3f1f5 100644
--- a/demos/qt3d/photobrowser3d/main.cpp
+++ b/demos/qt3d/photobrowser3d/main.cpp
@@ -59,12 +59,19 @@ int main(int argc, char *argv[])
     {
         PhotoBrowser3DView view;
 
-        if (QApplication::arguments().contains("-maximize"))
-            view.showMaximized();
-        else if (QApplication::arguments().contains("-fullscreen"))
-            view.showFullScreen();
-        else
-            view.show();
+#ifdef Q_OS_SYMBIAN
+    view.setAttribute(Qt::WA_LockLandscapeOrientation, true);
+    view.showMaximized();
+#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
 
         result = app.exec();
     }
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index 26a5c0b47..1a73dd46c 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -70,3 +70,7 @@ 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 2ff4b04f4..adfcd9dfe 100644
--- a/demos/qt3d/shapes/shapes.cpp
+++ b/demos/qt3d/shapes/shapes.cpp
@@ -412,12 +412,18 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     ShapesWidget w;
+
+#ifdef Q_OS_SYMBIAN
+    w.setAttribute(Qt::WA_LockLandscapeOrientation, true);
+    w.showMaximized();
+#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 804f22ba7..af34c1623 100644
--- a/demos/qt3d/shapes/shapes.pro
+++ b/demos/qt3d/shapes/shapes.pro
@@ -11,3 +11,7 @@ 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 8923fb3ae..c19813d7f 100644
--- a/demos/qt3d/teaservice/teaservice.cpp
+++ b/demos/qt3d/teaservice/teaservice.cpp
@@ -372,6 +372,11 @@ 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.showMaximized();
+#endif
+
     mainw.show();
     return app.exec();
 }
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index f54f3b516..c80bac640 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -15,3 +15,7 @@ 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 ab6547065..82a0c1535 100644
--- a/demos/quick3d/model_viewer/main.cpp
+++ b/demos/quick3d/model_viewer/main.cpp
@@ -40,24 +40,29 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
+#include "qdeclarativeview3d.h"
 
 #include "../qmlres.h"
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     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.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/demos/quick3d/robo_bounce/main.cpp b/demos/quick3d/robo_bounce/main.cpp
index 530382542..25038bff1 100644
--- a/demos/quick3d/robo_bounce/main.cpp
+++ b/demos/quick3d/robo_bounce/main.cpp
@@ -40,21 +40,27 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
+#include "qdeclarativeview3d.h"
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     view.setSource(QUrl(QLatin1String("qrc:///qml/robobounce.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/demos/quick3d/tea_service/main.cpp b/demos/quick3d/tea_service/main.cpp
index 252cc2fbc..4c992c305 100644
--- a/demos/quick3d/tea_service/main.cpp
+++ b/demos/quick3d/tea_service/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
+#include "qdeclarativeview3d.h"
 
 #include "../qmlres.h"
 
@@ -48,16 +48,22 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     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.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();
 }