summaryrefslogtreecommitdiff
path: root/share/qtcreator
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@nokia.com>2011-11-03 19:50:20 +0100
committerAlessandro Portale <alessandro.portale@nokia.com>2011-11-03 19:54:44 +0100
commitf642280ee5fd0dfc7ec7da7e6b8b38fbd28c6535 (patch)
tree9b17fcaeb51c7384bb65bfb15cd68323d7b87f6e /share/qtcreator
parent7c93cfdcf0b5110824a071d3113c2531118a5fa0 (diff)
downloadqt-creator-f642280ee5fd0dfc7ec7da7e6b8b38fbd28c6535.tar.gz
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>
Diffstat (limited to 'share/qtcreator')
-rw-r--r--share/qtcreator/templates/qtquickapp/qml/app/symbian10/main.qml33
-rw-r--r--share/qtcreator/templates/qtquickapp/qml/app/symbian11/MainPage.qml (renamed from share/qtcreator/templates/qtquickapp/qml/app/symbian10/MainPage.qml)4
-rw-r--r--share/qtcreator/templates/qtquickapp/qml/app/symbian11/main.qml18
3 files changed, 20 insertions, 35 deletions
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/symbian10/MainPage.qml b/share/qtcreator/templates/qtquickapp/qml/app/symbian11/MainPage.qml
index 76273b89ff..285ac34188 100644
--- a/share/qtcreator/templates/qtquickapp/qml/app/symbian10/MainPage.qml
+++ b/share/qtcreator/templates/qtquickapp/qml/app/symbian11/MainPage.qml
@@ -1,5 +1,5 @@
-import QtQuick 1.0
-import com.nokia.symbian 1.0
+import QtQuick 1.1
+import com.nokia.symbian 1.1
Page {
id: mainPage
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()
+ }
+ }
+}