Fix up misc symbian vs qtc clashes.

Conflicts:

	examples/quick3d/photoroom/main.cpp
	pkg.pri

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

8 files changed, 44 insertions, 2 deletions

diff --git a/tutorials/qt3d/cube1/cube1.pro b/tutorials/qt3d/cube1/cube1.pro
index 04230cb32..c3b076ed0 100644
--- a/tutorials/qt3d/cube1/cube1.pro
+++ b/tutorials/qt3d/cube1/cube1.pro
@@ -6,5 +6,12 @@ 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 2d1ecbace..08793646e 100644
--- a/tutorials/qt3d/cube2/cube2.pro
+++ b/tutorials/qt3d/cube2/cube2.pro
@@ -6,5 +6,12 @@ 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 aca98164a..2bbaa2510 100644
--- a/tutorials/qt3d/cube3/cube3.pro
+++ b/tutorials/qt3d/cube3/cube3.pro
@@ -6,5 +6,12 @@ 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 908a35230..ffb4d312f 100644
--- a/tutorials/qt3d/cube4/cube4.pro
+++ b/tutorials/qt3d/cube4/cube4.pro
@@ -7,5 +7,12 @@ 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 a1b710117..a1f44b8f4 100644
--- a/tutorials/qt3d/penguin/penguin.pro
+++ b/tutorials/qt3d/penguin/penguin.pro
@@ -8,5 +8,12 @@ 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 f728a277d..92e49fcb3 100644
--- a/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
+++ b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
@@ -8,5 +8,12 @@ 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 7c2cb4652..349113cd1 100644
--- a/tutorials/quick3d/teapot_bounce_qml/main.cpp
+++ b/tutorials/quick3d/teapot_bounce_qml/main.cpp
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 #ifdef Q_OS_SYMBIAN
     view.setAttribute(Qt::WA_LockLandscapeOrientation, true);
     view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    view.showMaximized();
+    view.showFullScreen();
 #else
     if (QApplication::arguments().contains(QLatin1String("-maximize")))
         view.showMaximized();
diff --git a/tutorials/quick3d/teapot_qml/main.cpp b/tutorials/quick3d/teapot_qml/main.cpp
index fc86aef23..073a9996b 100644
--- a/tutorials/quick3d/teapot_qml/main.cpp
+++ b/tutorials/quick3d/teapot_qml/main.cpp
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 #ifdef Q_OS_SYMBIAN
     view.setAttribute(Qt::WA_LockLandscapeOrientation, true);
     view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    view.showMaximized();
+    view.showFullScreen();
 #else
     if (QApplication::arguments().contains(QLatin1String("-maximize")))
         view.showMaximized();