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

8 files changed, 40 insertions, 6 deletions

diff --git a/tutorials/qt3d/cube1/cube1.pro b/tutorials/qt3d/cube1/cube1.pro
index 0054518f..04230cb3 100644
--- a/tutorials/qt3d/cube1/cube1.pro
+++ b/tutorials/qt3d/cube1/cube1.pro
@@ -4,3 +4,7 @@ CONFIG += qt warn_on qt3d
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
 DESTDIR = ../../../../bin/qt3d/tutorials
+
+symbian {
+    ICON = ../../qt3d.svg
+}
diff --git a/tutorials/qt3d/cube2/cube2.pro b/tutorials/qt3d/cube2/cube2.pro
index 61f496fd..2d1ecbac 100644
--- a/tutorials/qt3d/cube2/cube2.pro
+++ b/tutorials/qt3d/cube2/cube2.pro
@@ -4,3 +4,7 @@ CONFIG += qt warn_on qt3d
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
 DESTDIR = ../../../../bin/qt3d/tutorials
+
+symbian {
+    ICON = ../../qt3d.svg
+}
diff --git a/tutorials/qt3d/cube3/cube3.pro b/tutorials/qt3d/cube3/cube3.pro
index b61205e2..aca98164 100644
--- a/tutorials/qt3d/cube3/cube3.pro
+++ b/tutorials/qt3d/cube3/cube3.pro
@@ -4,3 +4,7 @@ CONFIG += qt warn_on qt3d
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
 DESTDIR = ../../../../bin/qt3d/tutorials
+
+symbian {
+    ICON = ../../qt3d.svg
+}
diff --git a/tutorials/qt3d/cube4/cube4.pro b/tutorials/qt3d/cube4/cube4.pro
index 46b6c3c2..908a3523 100644
--- a/tutorials/qt3d/cube4/cube4.pro
+++ b/tutorials/qt3d/cube4/cube4.pro
@@ -5,3 +5,7 @@ SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
 RESOURCES = cube.qrc
 DESTDIR = ../../../../bin/qt3d/tutorials
+
+symbian {
+    ICON = ../../qt3d.svg
+}
diff --git a/tutorials/qt3d/penguin/penguin.pro b/tutorials/qt3d/penguin/penguin.pro
index 7f179dbf..a1b71011 100644
--- a/tutorials/qt3d/penguin/penguin.pro
+++ b/tutorials/qt3d/penguin/penguin.pro
@@ -6,3 +6,7 @@ SOURCES = modelview.cpp \
 HEADERS = modelview.h
 RESOURCES = model.qrc
 DESTDIR = ../../../../bin/qt3d/tutorials
+
+symbian {    
+    ICON = ../../qt3d.svg
+}
diff --git a/tutorials/qt3d/penguin_advanced/penguin_advanced.pro b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
index 35aab03e..f728a277 100644
--- a/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
+++ b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
@@ -6,3 +6,7 @@ SOURCES = modelview.cpp \
     main.cpp
 HEADERS = modelview.h
 RESOURCES = model_advanced.qrc
+
+symbian {
+    ICON = ../../qt3d.svg
+}
diff --git a/tutorials/quick3d/teapot_bounce_qml/main.cpp b/tutorials/quick3d/teapot_bounce_qml/main.cpp
index 65b03b85..7c2cb465 100644
--- a/tutorials/quick3d/teapot_bounce_qml/main.cpp
+++ b/tutorials/quick3d/teapot_bounce_qml/main.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtCore/qdir.h>
+#include "qdeclarativeview3d.h"
 
 #include "../qmlres.h"
 
@@ -49,16 +48,22 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     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.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/tutorials/quick3d/teapot_qml/main.cpp b/tutorials/quick3d/teapot_qml/main.cpp
index ac83cf12..fc86aef2 100644
--- a/tutorials/quick3d/teapot_qml/main.cpp
+++ b/tutorials/quick3d/teapot_qml/main.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtCore/qdir.h>
+#include "qdeclarativeview3d.h"
 
 #include "../qmlres.h"
 
@@ -49,16 +48,22 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     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.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();
 }