feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
This reverts commit 31904563bb.
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>
This commit is contained in:
Kai Koehne
2011-06-24 12:47:38 +02:00
parent e1256f11f4
commit cdda5c775d
6 changed files with 9 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
View File

@@ -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;
}