Commit e1256f11 authored by Kai Koehne's avatar Kai Koehne Committed by Alessandro Portale
Browse files

QtQuickApplication wizard: Don't show Harmattan targets for symbian components

Change-Id: Ia5108c04d7898567ece7b5498359c88210ed2682
Reviewed-on: http://codereview.qt.nokia.com/695

Reviewed-by: default avatarAlessandro Portale <alessandro.portale@nokia.com>
parent efbcb386
......@@ -158,8 +158,12 @@ ProjectExplorer::Target *Qt4DesktopTargetFactory::create(ProjectExplorer::Projec
QSet<QString> Qt4DesktopTargetFactory::targetFeatures(const QString & /*id*/) const
{
return QSet<QString>() << Constants::DESKTOP_TARGETFEATURE_ID
<< Constants::SHADOWBUILD_TARGETFEATURE_ID;
QSet<QString> features;
features << Constants::DESKTOP_TARGETFEATURE_ID;
features << Constants::SHADOWBUILD_TARGETFEATURE_ID;
// how to check check whether they component set is really installed?
features << Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID;
return features;
}
ProjectExplorer::Target *Qt4DesktopTargetFactory::create(ProjectExplorer::Project *parent, const QString &id, const QList<BuildConfigurationInfo> &infos)
......
......@@ -125,8 +125,13 @@ ProjectExplorer::Target *Qt4SimulatorTargetFactory::restore(ProjectExplorer::Pro
QSet<QString> Qt4SimulatorTargetFactory::targetFeatures(const QString & /*id*/) const
{
return QSet<QString>() << Constants::MOBILE_TARGETFEATURE_ID
<< Constants::SHADOWBUILD_TARGETFEATURE_ID;
QSet<QString> features;
features << Constants::MOBILE_TARGETFEATURE_ID;
features << Constants::SHADOWBUILD_TARGETFEATURE_ID;
// how to check check whether the component set is really installed?
features << Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID;
return features;
}
ProjectExplorer::Target *Qt4SimulatorTargetFactory::create(ProjectExplorer::Project *parent, const QString &id)
......
......@@ -177,7 +177,11 @@ QList<BuildConfigurationInfo> Qt4SymbianTargetFactory::availableBuildConfigurati
QSet<QString> Qt4SymbianTargetFactory::targetFeatures(const QString & /*id*/) const
{
return QSet<QString>() << Constants::MOBILE_TARGETFEATURE_ID;
QSet<QString> features;
features << Constants::MOBILE_TARGETFEATURE_ID;
// ideally we should check whether they're really installed
features << Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID;
return features;
}
ProjectExplorer::Target *Qt4SymbianTargetFactory::create(ProjectExplorer::Project *parent, const QString &id)
......
......@@ -96,6 +96,9 @@ const char * const QT_SIMULATOR_TARGET_ID = "Qt4ProjectManager.Target.QtSimulato
const char * const MOBILE_TARGETFEATURE_ID = "Qt4ProjectManager.TargetFeature.Mobile";
const char * const DESKTOP_TARGETFEATURE_ID = "Qt4ProjectManager.TargetFeature.Desktop";
const char * const SHADOWBUILD_TARGETFEATURE_ID = "Qt4ProjectManager.TargetFeature.ShadowBuild";
const char * const QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID
= "Qt4ProjectManager.TargetFeature.QtQuickComponentsSymbian";
// Tool chains:
const char * const GCCE_TOOLCHAIN_ID = "Qt4ProjectManager.ToolChain.GCCE";
......
......@@ -92,6 +92,9 @@ bool QtQuickAppWizardDialog::validateCurrentPage()
if (m_componentOptionsPage->componentSet() == QtQuickApp::Symbian10Components) {
setIgnoreGenericOptionsPage(true);
targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 3));
QSet<QString> requiredFeatures;
requiredFeatures << Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID;
targetsPage()->setRequiredFeatures(requiredFeatures);
} else if (m_componentOptionsPage->componentSet() == QtQuickApp::QtQuick11Components) {
targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 4));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment