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

Merge multi Qt Quick UI wizards into one

Browse Source 
Change-Id: Ia984c36864dacd5b71c76976a351767bb4c3693c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
jkobus
2013-11-05 13:45:39 +01:00
committed by Jarek Kobus
parent 6313b2ca4b
commit 62590507b1
12 changed files with 225 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmlprojectmanager/qmlapplicationwizard.h
View File

@@ -42,18 +42,19 @@ namespace Internal {
class QmlApp;
class TemplateInfo;
class QmlComponentSetPage;
class QmlApplicationWizardDialog : public ProjectExplorer::BaseProjectWizardDialog
{
Q_OBJECT
public:
QmlApplicationWizardDialog(QmlApp *qmlApp, QWidget *parent,
QmlApplicationWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &parameters);
QmlApp *qmlApp() const;
TemplateInfo templateInfo() const;
private:
QmlApp *m_qmlApp;
QmlComponentSetPage *m_componentSetPage;
};
@@ -62,7 +63,7 @@ class QmlApplicationWizard : public Core::BaseFileWizard
Q_OBJECT
public:
explicit QmlApplicationWizard(const TemplateInfo &templateInfo);
explicit QmlApplicationWizard();
static void createInstances(ExtensionSystem::IPlugin *plugin);
@@ -74,7 +75,6 @@ private:
bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
private:
// mutable QString m_id;
QmlApp *m_qmlApp;
};