diff options
author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-10-01 16:10:45 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-10-01 20:22:42 +0200 |
commit | 649e12715612daa9df54fa5ffa6aa78ab08c4d56 (patch) | |
tree | 8336f6bc34fcc32125df925a6897b190b360bb7f /src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp | |
parent | 6c32b0fe5a8a3786dad4006e56e91d52c1a21f78 (diff) |
Wizards: Adding application wizards for Qt Quick Controls
Task-number: QTCREATORBUG-9477
Change-Id: I4eaf70089e19f0fcab8d85d9a101f74e119bbae0
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp index 281dc8f906..da32cbe6d4 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp @@ -185,8 +185,22 @@ void QtQuickAppWizard::createInstances(ExtensionSystem::IPlugin *plugin) "reside in the same directory as the main .qml file " "are deployed. You can modify the contents of the " "directory any time before deploying.\n\nRequires <b>Qt 5.0</b> or newer.")); + wizard->setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_2)); plugin->addAutoReleasedObject(wizard); + + wizard = new QtQuickAppWizard; + wizard->setQtQuickKind(QtQuick_Controls_1_0); + + wizard->setDisplayName(tr("Qt Quick 2 Application (Qt Quick Controls)")); + wizard->setDescription(basicDescription + tr("Creates a deployable Qt Quick application using " + "Qt Quick Controls. All files and directories that " + "reside in the same directory as the main .qml file " + "are deployed. You can modify the contents of the " + "directory any time before deploying.\n\nRequires <b>Qt 5.1.0</b> or newer.")); + wizard->setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_2) + | Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS)); + plugin->addAutoReleasedObject(wizard); } AbstractMobileAppWizardDialog *QtQuickAppWizard::createWizardDialogInternal(QWidget *parent, @@ -215,6 +229,10 @@ AbstractMobileAppWizardDialog *QtQuickAppWizard::createWizardDialogInternal(QWid d->app->setComponentSet(QtQuickApp::QtQuick20Components); d->app->setMainQml(QtQuickApp::ModeGenerate); break; + case QtQuick_Controls_1_0: + d->app->setComponentSet(QtQuickApp::QtQuickControls10); + d->app->setMainQml(QtQuickApp::ModeGenerate); + break; default: qWarning() << "QtQuickAppWizard illegal subOption:" << qtQuickKind(); break; |