diff --git a/share/qtcreator/templates/qtquickapp/qml/app/qtquick11/main.qml b/share/qtcreator/templates/qtquickapp/qml/app/qtquick11/main.qml new file mode 100644 index 00000000000..460a22fc2cc --- /dev/null +++ b/share/qtcreator/templates/qtquickapp/qml/app/qtquick11/main.qml @@ -0,0 +1,16 @@ +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 548205fcd66..91d93354cf8 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -451,6 +451,8 @@ 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 34b854272c1..d1b3bedfb88 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.h +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.h @@ -117,6 +117,7 @@ public: enum ComponentSet { QtQuick10Components, + QtQuick11Components, Symbian10Components }; diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp index c75975c3b0b..74f8d2fac4a 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp @@ -92,6 +92,8 @@ bool QtQuickAppWizardDialog::validateCurrentPage() if (m_componentOptionsPage->componentSet() == QtQuickApp::Symbian10Components) { setIgnoreGenericOptionsPage(true); targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 3)); + } else if (m_componentOptionsPage->componentSet() == QtQuickApp::QtQuick11Components) { + targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 4)); } } return AbstractMobileAppWizardDialog::validateCurrentPage(); @@ -130,8 +132,7 @@ 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. " - "To utilize the components, Qt 4.7.3 or newer is required.")); + "UI components in your Qt Quick application.")); 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 9a0884f94b2..3d5dfc5b583 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp @@ -63,7 +63,8 @@ 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.symbian10RadioButton, 1); + m_d->ui.buttonGroup->setId(m_d->ui.qtquick11RadioButton, 1); + m_d->ui.buttonGroup->setId(m_d->ui.symbian10RadioButton, 2); connect(m_d->ui.buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(radioButtonChecked(int))); } @@ -75,7 +76,8 @@ QtQuickComponentSetOptionsPage::~QtQuickComponentSetOptionsPage() QtQuickApp::ComponentSet QtQuickComponentSetOptionsPage::componentSet() const { switch (m_d->ui.buttonGroup->checkedId()) { - case 1: return QtQuickApp::Symbian10Components; + case 1: return QtQuickApp::QtQuick11Components; + case 2: return QtQuickApp::Symbian10Components; case 0: default: return QtQuickApp::QtQuick10Components; } @@ -85,6 +87,7 @@ 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 c9c5eb2c088..fc3c0a2cc70 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui +++ b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui @@ -32,23 +32,33 @@ - QtQuick 1.0 + QtQuick 1.0 true - buttonGroup + buttonGroup + + + + + + + QtQuick 1.1 + + + buttonGroup - com.nokia.symbian 1.0 + com.nokia.symbian 1.0 - buttonGroup + buttonGroup @@ -71,7 +81,7 @@ - 1 + 0 @@ -92,6 +102,25 @@ Requires Qt 4.7.1 or newer. + + + + + + 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. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + +