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

QtQuickAppWizard: adding missing wizard

Browse Source 
Adding Qt Quick 2 Application (from Existing QML File) wizard.

Task-number: QTCREATORBUG-8755
Change-Id: I3f5bdac5356ec31a4f6c1cd8e2a21f61982b04ee
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Thomas Hartmann
2013-02-14 14:34:55 +01:00
committed by Kai Koehne
parent 362671cbcd
commit bfcdc28a5d
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
View File

@@ -76,7 +76,7 @@ QtQuickAppWizardDialog::QtQuickAppWizardDialog(QWidget *parent,
setWindowTitle(tr("New Qt Quick Application")); setWindowTitle(tr("New Qt Quick Application"));
setIntroDescription(tr("This wizard generates a Qt Quick application project.")); setIntroDescription(tr("This wizard generates a Qt Quick application project."));
if (kind == QtQuickAppWizard::ImportQml) { //Choose existing qml file if (kind == QtQuickAppWizard::ImportQml || kind == QtQuickAppWizard::ImportQml2) { //Choose existing qml file
m_componentOptionsPage = new Internal::QtQuickComponentSetOptionsPage; m_componentOptionsPage = new Internal::QtQuickComponentSetOptionsPage;
m_componentOptionsPageId = addPageWithTitle(m_componentOptionsPage, tr("Select existing QML file")); m_componentOptionsPageId = addPageWithTitle(m_componentOptionsPage, tr("Select existing QML file"));
m_componentItem = wizardProgress()->item(m_componentOptionsPageId); m_componentItem = wizardProgress()->item(m_componentOptionsPageId);
@@ -84,7 +84,7 @@ QtQuickAppWizardDialog::QtQuickAppWizardDialog(QWidget *parent,
AbstractMobileAppWizardDialog::addMobilePages(); AbstractMobileAppWizardDialog::addMobilePages();
if (kind == QtQuickAppWizard::ImportQml) { if (kind == QtQuickAppWizard::ImportQml || kind == QtQuickAppWizard::ImportQml2) {
if (targetsPageItem()) if (targetsPageItem())
m_componentItem->setNextItems(QList<Utils::WizardProgressItem *>() m_componentItem->setNextItems(QList<Utils::WizardProgressItem *>()
<< targetsPageItem()); << targetsPageItem());
@@ -179,9 +179,19 @@ void QtQuickAppWizard::createInstances(ExtensionSystem::IPlugin *plugin)
parameter.setRequiredFeatures(basicFeatures); parameter.setRequiredFeatures(basicFeatures);
list << parameter; list << parameter;
parameter = base;
parameter.setDisplayName(tr("Qt Quick 2 Application (from Existing QML File)"));
parameter.setDescription(basicDescription + tr("Creates a deployable Qt Quick application from "
"existing QML files. 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.0</b> or newer."));
parameter.setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_2));
list << parameter;
QList<QtQuickAppWizard*> wizardList = Core::createMultipleBaseFileWizardInstances<QtQuickAppWizard>(list, plugin); QList<QtQuickAppWizard*> wizardList = Core::createMultipleBaseFileWizardInstances<QtQuickAppWizard>(list, plugin);
Q_ASSERT(wizardList.count() == 4); Q_ASSERT(wizardList.count() == 5);
for (int i = 0; i < wizardList.count(); i++) { for (int i = 0; i < wizardList.count(); i++) {
wizardList.at(i)->setQtQuickKind(Kind(i)); wizardList.at(i)->setQtQuickKind(Kind(i));
@@ -217,6 +227,10 @@ AbstractMobileAppWizardDialog *QtQuickAppWizard::createWizardDialogInternal(QWid
d->app->setComponentSet(QtQuickApp::QtQuick10Components); d->app->setComponentSet(QtQuickApp::QtQuick10Components);
d->app->setMainQml(QtQuickApp::ModeImport); d->app->setMainQml(QtQuickApp::ModeImport);
break; break;
case ImportQml2:
d->app->setComponentSet(QtQuickApp::QtQuick20Components);
d->app->setMainQml(QtQuickApp::ModeImport);
break;
case QtQuick2_0: case QtQuick2_0:
d->app->setComponentSet(QtQuickApp::QtQuick20Components); d->app->setComponentSet(QtQuickApp::QtQuick20Components);
d->app->setMainQml(QtQuickApp::ModeGenerate); d->app->setMainQml(QtQuickApp::ModeGenerate);

3
src/plugins/qt4projectmanager/wizards/qtquickappwizard.h
View File

@@ -44,7 +44,8 @@ public:
QtQuick1_1 = 0, QtQuick1_1 = 0,
QtQuick2_0 = 1, QtQuick2_0 = 1,
MeegoComponents = 2, MeegoComponents = 2,
ImportQml = 3 ImportQml = 3,
ImportQml2 = 4
}; };
QtQuickAppWizard(); QtQuickAppWizard();