diff options
author | hjk <qthjk@ovi.com> | 2013-01-15 16:11:50 +0100 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2013-01-15 17:59:53 +0100 |
commit | 28f6fec97dc0799707a5104672f1d5da9122ccdb (patch) | |
tree | 0e7a785d0d71b01e88f72b31e1e35257f1c3f2a6 /src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp | |
parent | 2ab6416a34a223f1f40589bbe27cf0e4cf814dca (diff) | |
download | qt-creator-28f6fec97dc0799707a5104672f1d5da9122ccdb.tar.gz |
Features: Use Core::Id as base
Change-Id: Iab812778f8f924638224ec343cadac70e8854e4f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp')
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp index 1239c197f1..65334391fe 100644 --- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp +++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp @@ -49,12 +49,12 @@ #include "qmlproject.h" #include <QCoreApplication> -#include <QFileInfo> #include <QDirIterator> -#include <QUrl> #include <QFileDialog> +#include <QFileInfo> #include <QIcon> #include <QMessageBox> +#include <QUrl> using namespace Core; using namespace ExtensionSystem; @@ -99,9 +99,9 @@ void QmlApplicationWizard::createInstances(ExtensionSystem::IPlugin *plugin) QStringList stringList = templateInfo.featuresRequired.split(QLatin1Char(','), QString::SkipEmptyParts);; - Core::FeatureSet features; + FeatureSet features; foreach (const QString &string, stringList) { - Core::Feature feature(string.trimmed()); + Feature feature(Id::fromString(string.trimmed())); features |= feature; } @@ -126,8 +126,7 @@ BaseFileWizardParameters QmlApplicationWizard::parameters() } QWizard *QmlApplicationWizard::createWizardDialog(QWidget *parent, - const Core::WizardDialogParameters &wizardDialogParameters - ) const + const WizardDialogParameters &wizardDialogParameters) const { QmlApplicationWizardDialog *wizardDialog = new QmlApplicationWizardDialog(m_qmlApp, parent, wizardDialogParameters); |