Revert "QtQuickApp wizard: Add option for QtQuick 1.1 module"

This reverts commit 31904563bb2666c73bce71eeb7b5a166691a2b9d.
The option in the UI might actually confuse users: For the time being
we'll just keep 1.0 as the namespace.

Change-Id: Ifc7b46227d57ec8d246c8f7818d5a619ef0cd3bd
Reviewed-on: http://codereview.qt.nokia.com/699
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

diff --git a/share/qtcreator/templates/qtquickapp/qml/app/qtquick11/main.qml b/share/qtcreator/templates/qtquickapp/qml/app/qtquick11/main.qml
deleted file mode 100644 (file)
index 460a22f..0000000
--- a/share/qtcreator/templates/qtquickapp/qml/app/qtquick11/main.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import QtQuick 1.1
-
-Rectangle {
-    width: 360
-    height: 360
-    Text {
-        text: qsTr("Hello World")
-        anchors.centerIn: parent
-    }
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            Qt.quit();
-        }
-    }
-}

diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
index 91d9335..548205f 100644 (file)
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
@@ -451,8 +451,6 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const
     switch (componentSet) {
     case Symbian10Components:
         return QLatin1String("symbian10");
-    case QtQuick11Components:
-        return QLatin1String("qtquick11");
     case QtQuick10Components:
     default:
         return QLatin1String("qtquick10");

diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.h b/src/plugins/qt4projectmanager/wizards/qtquickapp.h
index d1b3bed..34b8542 100644 (file)
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.h
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.h
@@ -117,7 +117,6 @@ public:
 
     enum ComponentSet {
         QtQuick10Components,
-        QtQuick11Components,
         Symbian10Components
     };
 

diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 4102c67..380327c 100644 (file)
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -95,8 +95,6 @@ bool QtQuickAppWizardDialog::validateCurrentPage()
             QSet<QString> requiredFeatures;
             requiredFeatures << Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID;
             targetsPage()->setRequiredFeatures(requiredFeatures);
-        } else if (m_componentOptionsPage->componentSet() == QtQuickApp::QtQuick11Components) {
-            targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 4));
         }
     }
     return AbstractMobileAppWizardDialog::validateCurrentPage();
@@ -135,7 +133,8 @@ Core::BaseFileWizardParameters QtQuickAppWizard::parameters()
                                  "mobile target platforms. For example, you can create signed "
                                  "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."));
+                                 "UI components in your Qt Quick application. "
+                                 "To utilize the components, Qt 4.7.3 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));

diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
index 3d5dfc5..9a0884f 100644 (file)
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
@@ -63,8 +63,7 @@ QtQuickComponentSetOptionsPage::QtQuickComponentSetOptionsPage(QWidget *parent)
 {
     m_d->ui.setupUi(this);
     m_d->ui.buttonGroup->setId(m_d->ui.qtquick10RadioButton, 0);
-    m_d->ui.buttonGroup->setId(m_d->ui.qtquick11RadioButton, 1);
-    m_d->ui.buttonGroup->setId(m_d->ui.symbian10RadioButton, 2);
+    m_d->ui.buttonGroup->setId(m_d->ui.symbian10RadioButton, 1);
     connect(m_d->ui.buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(radioButtonChecked(int)));
 }
 
@@ -76,8 +75,7 @@ QtQuickComponentSetOptionsPage::~QtQuickComponentSetOptionsPage()
 QtQuickApp::ComponentSet QtQuickComponentSetOptionsPage::componentSet() const
 {
     switch (m_d->ui.buttonGroup->checkedId()) {
-    case 1: return QtQuickApp::QtQuick11Components;
-    case 2: return QtQuickApp::Symbian10Components;
+    case 1: return QtQuickApp::Symbian10Components;
     case 0:
     default: return QtQuickApp::QtQuick10Components;
     }
@@ -87,7 +85,6 @@ void QtQuickComponentSetOptionsPage::setComponentSet(QtQuickApp::ComponentSet co
 {
     switch (componentSet) {
     case QtQuickApp::Symbian10Components: m_d->ui.symbian10RadioButton->click(); break;
-    case QtQuickApp::QtQuick11Components: m_d->ui.qtquick11RadioButton->click(); break;
     case QtQuickApp::QtQuick10Components:
     default: m_d->ui.qtquick10RadioButton->click(); break;
     }

diff --git a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
index fc3c0a2..c9c5eb2 100644 (file)
--- a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
+++ b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
@@ -32,33 +32,23 @@
       <item>
        <widget class="QRadioButton" name="qtquick10RadioButton">
         <property name="text">
-         <string notr="true">QtQuick 1.0</string>
+         <string>QtQuick 1.0</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
         <attribute name="buttonGroup">
-         <string notr="true">buttonGroup</string>
-        </attribute>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="qtquick11RadioButton">
-        <property name="text">
-         <string notr="true">QtQuick 1.1</string>
-        </property>
-        <attribute name="buttonGroup">
-         <string notr="true">buttonGroup</string>
+         <string>buttonGroup</string>
         </attribute>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="symbian10RadioButton">
         <property name="text">
-         <string notr="true">com.nokia.symbian 1.0</string>
+         <string>com.nokia.symbian 1.0</string>
         </property>
         <attribute name="buttonGroup">
-         <string notr="true">buttonGroup</string>
+         <string>buttonGroup</string>
         </attribute>
        </widget>
       </item>
@@ -81,7 +71,7 @@
       <item>
        <widget class="QStackedWidget" name="descriptionStackedWidget">
         <property name="currentIndex">
-         <number>0</number>
+         <number>1</number>
         </property>
         <widget class="QWidget" name="qtquick10DescriptionWidget">
          <layout class="QGridLayout" name="gridLayout">
@@ -102,25 +92,6 @@ Requires Qt 4.7.1 or newer.</string>
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="qtquick11DescriptionWidget">
-         <layout class="QGridLayout" name="gridLayout_4">
-          <item row="0" column="0">
-           <widget class="QLabel" name="qtquick11DescriptionLabel">
-            <property name="text">
-             <string>The QtQuick 1.1 namespace contains basic elements which allow you to write cross-platform applications with a custom look and feel.
-
-Requires Qt 4.7.4 or newer.</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
         <widget class="QWidget" name="symbian10DescriptionWidget">
          <layout class="QGridLayout" name="gridLayout_3">
           <item row="0" column="0">