summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjkobus <jaroslaw.kobus@digia.com>2014-08-12 13:22:46 +0200
committerJarek Kobus <jaroslaw.kobus@digia.com>2014-08-12 15:59:17 +0200
commit82a593579e59078bdd851c60a827593490907bf3 (patch)
treede33ee25e5cad4602cda81500f56d684b09d7105
parentee97aeb5b009b0bd167f4ac2a7d2645258ef8437 (diff)
downloadqt-creator-82a593579e59078bdd851c60a827593490907bf3.tar.gz
Set general qml and qtquick features for wizards
Task-number: QTCREATORBUG-12469 Task-number: QTCREATORBUG-12760 Change-Id: I6c068fadc418d2973bda12f877121d30fbba449c Reviewed-by: Christian Stenger <christian.stenger@digia.com>
-rw-r--r--src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.cpp2
-rw-r--r--src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.cpp
index ba56fbddb2..59b06b88e8 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.cpp
@@ -71,6 +71,8 @@ QtQuickAppWizardDialog::QtQuickAppWizardDialog(QWidget *parent,
addPage(m_componentSetPage);
addKitsPage();
+
+ setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK));
}
void QtQuickAppWizardDialog::initializePage(int id)
diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
index b5054626e9..ccaaad056e 100644
--- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
@@ -38,6 +38,7 @@
#include <qmakeprojectmanager/qmakeproject.h>
#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtsupportconstants.h>
#include "qmlprojectmanager.h"
#include "qmlproject.h"
@@ -79,6 +80,8 @@ QmlApplicationWizard::QmlApplicationWizard()
QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY));
setDisplayName(tr("Qt Quick UI"));
setDescription(tr("Creates a Qt Quick UI project."));
+ setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QMLPROJECT)
+ | Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK));
}
Core::BaseFileWizard *QmlApplicationWizard::create(QWidget *parent, const WizardDialogParameters &parameters) const