From fd367ec8ae38d8fbde63724d894021c964ef6693 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Thu, 23 Feb 2012 12:14:07 +0100
Subject: [PATCH] Wizards: qml project support is desktop only
We support (pure) qml projects only on the desktop.
Change-Id: Ib68d8ddab053a2b4e4b60cc07e9408eff0e27d63
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp | 2 +-
src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp | 1 +
src/plugins/qtsupport/qtsupportconstants.h | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index b76d72ded30..80ed8efb44a 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -68,7 +68,7 @@ QmlProjectApplicationWizard::~QmlProjectApplicationWizard()
Core::FeatureSet QmlProjectApplicationWizard::requiredFeatures() const
{
- return Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK);
+ return Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK) | Core::Feature(QtSupport::Constants::FEATURE_QMLPROJECT);
}
Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
index 1e5c31fd811..d030c20e6e0 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
@@ -104,6 +104,7 @@ Core::FeatureSet DesktopQtVersion::availableFeatures() const
{
Core::FeatureSet features = QtSupport::BaseQtVersion::availableFeatures();
features |= Core::FeatureSet(QtSupport::Constants::FEATURE_DESKTOP);
+ features |= Core::Feature(QtSupport::Constants::FEATURE_QMLPROJECT);
return features;
}
diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h
index a89a453e2d3..df367c1fe26 100644
--- a/src/plugins/qtsupport/qtsupportconstants.h
+++ b/src/plugins/qtsupport/qtsupportconstants.h
@@ -51,6 +51,7 @@ const char WINCEQT[] = "Qt4ProjectManager.QtVersion.WinCE";
const char FEATURE_QT[] = "QtSupport.Wizards.FeatureQt";
const char FEATURE_QWIDGETS[] = "QtSupport.Wizards.FeatureQWidgets";
const char FEATURE_QT_QUICK[] = "QtSupport.Wizards.FeatureQtQuick";
+const char FEATURE_QMLPROJECT[] = "QtSupport.Wizards.FeatureQtQuickProject";
const char FEATURE_QT_QUICK_1[] = "QtSupport.Wizards.FeatureQtQuick.1";
const char FEATURE_QT_QUICK_1_1[] = "QtSupport.Wizards.FeatureQtQuick.1.1";
const char FEATURE_QT_QUICK_2[] = "QtSupport.Wizards.FeatureQtQuick.2";
--
GitLab