From f642280ee5fd0dfc7ec7da7e6b8b38fbd28c6535 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Thu, 3 Nov 2011 19:50:20 +0100
Subject: App Wizard templates: Use com.nokia.symbian 1.1 instead of 1.0

Bumping the minimum required Qt version from 4.7.3 to 4.7.4,
accordingly.

Change-Id: I1f88278552c83ff18f9a710eb1f08b74f43688b8
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
---
 .../qtquickapp/qml/app/symbian10/MainPage.qml      | 12 --------
 .../qtquickapp/qml/app/symbian10/main.qml          | 33 ----------------------
 .../qtquickapp/qml/app/symbian11/MainPage.qml      | 12 ++++++++
 .../qtquickapp/qml/app/symbian11/main.qml          | 18 ++++++++++++
 4 files changed, 30 insertions(+), 45 deletions(-)
 delete mode 100644 share/qtcreator/templates/qtquickapp/qml/app/symbian10/MainPage.qml
 delete mode 100644 share/qtcreator/templates/qtquickapp/qml/app/symbian10/main.qml
 create mode 100644 share/qtcreator/templates/qtquickapp/qml/app/symbian11/MainPage.qml
 create mode 100644 share/qtcreator/templates/qtquickapp/qml/app/symbian11/main.qml

(limited to 'share')

diff --git a/share/qtcreator/templates/qtquickapp/qml/app/symbian10/MainPage.qml b/share/qtcreator/templates/qtquickapp/qml/app/symbian10/MainPage.qml
deleted file mode 100644
index 76273b89ff..0000000000
--- a/share/qtcreator/templates/qtquickapp/qml/app/symbian10/MainPage.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 1.0
-import com.nokia.symbian 1.0
-
-Page {
-    id: mainPage
-    Text {
-        anchors.centerIn: parent
-        text: qsTr("Hello world!")
-        color: platformStyle.colorNormalLight
-        font.pixelSize: 20
-    }
-}
diff --git a/share/qtcreator/templates/qtquickapp/qml/app/symbian10/main.qml b/share/qtcreator/templates/qtquickapp/qml/app/symbian10/main.qml
deleted file mode 100644
index 339b042a12..0000000000
--- a/share/qtcreator/templates/qtquickapp/qml/app/symbian10/main.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import QtQuick 1.0
-import com.nokia.symbian 1.0
-
-Window {
-    id: window
-
-    StatusBar {
-        id: statusBar
-        anchors.top: window.top
-    }
-
-    PageStack {
-        id: pageStack
-        anchors { left: parent.left; right: parent.right; top: statusBar.bottom; bottom: toolBar.top }
-    }
-
-    ToolBar {
-        id: toolBar
-        anchors.bottom: window.bottom
-        tools: ToolBarLayout {
-            id: toolBarLayout
-            ToolButton {
-                flat: true
-                iconSource: "toolbar-back"
-                onClicked: pageStack.depth <= 1 ? Qt.quit() : pageStack.pop()
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        pageStack.push(Qt.resolvedUrl("MainPage.qml"))
-    }
-}
diff --git a/share/qtcreator/templates/qtquickapp/qml/app/symbian11/MainPage.qml b/share/qtcreator/templates/qtquickapp/qml/app/symbian11/MainPage.qml
new file mode 100644
index 0000000000..285ac34188
--- /dev/null
+++ b/share/qtcreator/templates/qtquickapp/qml/app/symbian11/MainPage.qml
@@ -0,0 +1,12 @@
+import QtQuick 1.1
+import com.nokia.symbian 1.1
+
+Page {
+    id: mainPage
+    Text {
+        anchors.centerIn: parent
+        text: qsTr("Hello world!")
+        color: platformStyle.colorNormalLight
+        font.pixelSize: 20
+    }
+}
diff --git a/share/qtcreator/templates/qtquickapp/qml/app/symbian11/main.qml b/share/qtcreator/templates/qtquickapp/qml/app/symbian11/main.qml
new file mode 100644
index 0000000000..85a0994a53
--- /dev/null
+++ b/share/qtcreator/templates/qtquickapp/qml/app/symbian11/main.qml
@@ -0,0 +1,18 @@
+import QtQuick 1.1
+import com.nokia.symbian 1.1
+
+PageStackWindow {
+    id: window
+    initialPage: MainPage {tools: toolBarLayout}
+    showStatusBar: true
+    showToolBar: true
+
+    ToolBarLayout {
+        id: toolBarLayout
+        ToolButton {
+            flat: true
+            iconSource: "toolbar-back"
+            onClicked: window.pageStack.depth <= 1 ? Qt.quit() : window.pageStack.pop()
+        }
+    }
+}
-- 
cgit v1.2.1