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: [PATCH] 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/main.qml | 33 -------------------
.../app/{symbian10 => symbian11}/MainPage.qml | 4 +--
.../qtquickapp/qml/app/symbian11/main.qml | 18 ++++++++++
.../qt4projectmanager/wizards/qtquickapp.cpp | 8 ++---
.../qt4projectmanager/wizards/qtquickapp.h | 2 +-
.../wizards/qtquickappwizard.cpp | 8 ++---
.../wizards/qtquickappwizardpages.cpp | 4 +--
.../wizards/qtquickcomponentsetoptionspage.ui | 2 +-
8 files changed, 32 insertions(+), 47 deletions(-)
delete mode 100644 share/qtcreator/templates/qtquickapp/qml/app/symbian10/main.qml
rename share/qtcreator/templates/qtquickapp/qml/app/{symbian10 => symbian11}/MainPage.qml (79%)
create mode 100644 share/qtcreator/templates/qtquickapp/qml/app/symbian11/main.qml
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 339b042a12e..00000000000
--- 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
similarity index 79%
rename from share/qtcreator/templates/qtquickapp/qml/app/symbian10/MainPage.qml
rename to share/qtcreator/templates/qtquickapp/qml/app/symbian11/MainPage.qml
index 76273b89ff0..285ac341880 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 00000000000..85a0994a533
--- /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()
+ }
+ }
+}
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
index d18b69ca48c..a5d991f9f86 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
@@ -261,7 +261,7 @@ void QtQuickApp::handleCurrentProFileTemplateLine(const QString &line,
proFile << endl;
} else if (line.contains(QLatin1String("# QTQUICKCOMPONENTS"))) {
QString nextLine = proFileTemplate.readLine(); // eats '# CONFIG += qtquickcomponents'
- if (componentSet() == Symbian10Components)
+ if (componentSet() == Symbian11Components)
nextLine.remove(0, 2); // remove comment
proFile << nextLine << endl;
} else if (line.contains(QLatin1String("# HARMATTAN_BOOSTABLE"))) {
@@ -355,7 +355,7 @@ Core::GeneratedFiles QtQuickApp::generateFiles(QString *errorMessage) const
Core::GeneratedFiles files = AbstractMobileApp::generateFiles(errorMessage);
if (!useExistingMainQml()) {
files.append(file(generateFile(QtQuickAppGeneratedFileInfo::MainQmlFile, errorMessage), path(MainQml)));
- if ((componentSet() == QtQuickApp::Symbian10Components)
+ if ((componentSet() == QtQuickApp::Symbian11Components)
|| (componentSet() == QtQuickApp::Meego10Components))
files.append(file(generateFile(QtQuickAppGeneratedFileInfo::MainPageQmlFile, errorMessage), path(MainPageQml)));
files.last().setAttributes(Core::GeneratedFile::OpenEditorAttribute);
@@ -456,8 +456,8 @@ QList<DeploymentFolder> QtQuickApp::deploymentFolders() const
QString QtQuickApp::componentSetDir(ComponentSet componentSet) const
{
switch (componentSet) {
- case Symbian10Components:
- return QLatin1String("symbian10");
+ case Symbian11Components:
+ return QLatin1String("symbian11");
case Meego10Components:
return QLatin1String("meego10");
case QtQuick10Components:
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.h b/src/plugins/qt4projectmanager/wizards/qtquickapp.h
index e67518b062d..74d739e15ca 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.h
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.h
@@ -117,7 +117,7 @@ public:
enum ComponentSet {
QtQuick10Components,
- Symbian10Components,
+ Symbian11Components,
Meego10Components
};
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 4565135de26..6dbc23b20b0 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -85,9 +85,9 @@ bool QtQuickAppWizardDialog::validateCurrentPage()
{
if (currentPage() == m_componentOptionsPage) {
setIgnoreGenericOptionsPage(false);
- if (m_componentOptionsPage->componentSet() == QtQuickApp::Symbian10Components) {
+ if (m_componentOptionsPage->componentSet() == QtQuickApp::Symbian11Components) {
setIgnoreGenericOptionsPage(true);
- targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 3));
+ targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 4));
QSet<QString> requiredFeatures;
requiredFeatures << Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID;
targetsPage()->setRequiredFeatures(requiredFeatures);
@@ -139,7 +139,7 @@ Core::BaseFileWizardParameters QtQuickAppWizard::parameters()
"Symbian Installation System (SIS) packages for this type of "
"projects. Moreover, you can select to use a set of premade "
"UI components in your Qt Quick application. "
- "To utilize the components, Qt 4.7.3 or newer is required."));
+ "To utilize the components, Qt 4.7.4 or newer is required."));
parameters.setCategory(QLatin1String(QtSupport::Constants::QML_WIZARD_CATEGORY));
parameters.setDisplayCategory(QCoreApplication::translate(QtSupport::Constants::QML_WIZARD_TR_SCOPE,
QtSupport::Constants::QML_WIZARD_TR_CATEGORY));
@@ -170,7 +170,7 @@ void QtQuickAppWizard::prepareGenerateFiles(const QWizard *w,
d->app->setMainQml(QtQuickApp::ModeImport, mainQmlFile);
}
d->app->setComponentSet(wizard->m_componentOptionsPage->componentSet());
- if (d->app->componentSet() == QtQuickApp::Symbian10Components)
+ if (d->app->componentSet() == QtQuickApp::Symbian11Components)
d->app->setOrientation(AbstractMobileApp::ScreenOrientationImplicit);
}
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
index 90e9c6987ec..c252e0aa225 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
@@ -82,7 +82,7 @@ QtQuickApp::ComponentSet QtQuickComponentSetOptionsPage::componentSet() const
{
switch (d->ui.buttonGroup->checkedId()) {
case 2: return QtQuickApp::Meego10Components;
- case 1: return QtQuickApp::Symbian10Components;
+ case 1: return QtQuickApp::Symbian11Components;
case 0:
default: return QtQuickApp::QtQuick10Components;
}
@@ -92,7 +92,7 @@ void QtQuickComponentSetOptionsPage::setComponentSet(QtQuickApp::ComponentSet co
{
switch (componentSet) {
case QtQuickApp::Meego10Components: d->ui.meego10RadioButton->click(); break;
- case QtQuickApp::Symbian10Components: d->ui.symbian10RadioButton->click(); break;
+ case QtQuickApp::Symbian11Components: d->ui.symbian10RadioButton->click(); break;
case QtQuickApp::QtQuick10Components:
default: d->ui.qtquick10RadioButton->click(); break;
}
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
index 34c825dbc7f..43437de33a7 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
+++ b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
@@ -134,7 +134,7 @@ Requires Qt 4.7.1 or newer.</string>
<property name="text">
<string>The Qt Quick Components for Symbian are a set of ready-made components that are designed with specific native appearance for the Symbian platform.
-Requires Qt 4.7.3 or newer, and the component set installed for your Qt version.</string>
+Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
--
GitLab