Commit cbe4d2a7 authored by Daniel Teske's avatar Daniel Teske
Browse files

Target setup: Disable symbian emulator by default

Change-Id: I41f4a596ee96f24ff704e94bcec2349ebd93101f
Reviewed-on: http://codereview.qt.nokia.com/1367

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 6f161c99
......@@ -175,6 +175,11 @@ QList<BuildConfigurationInfo> Qt4SymbianTargetFactory::availableBuildConfigurati
return tmp;
}
bool Qt4SymbianTargetFactory::selectByDefault(const QString &id) const
{
return id != QLatin1String(Constants::S60_EMULATOR_TARGET_ID);
}
QSet<QString> Qt4SymbianTargetFactory::targetFeatures(const QString & /*id*/) const
{
QSet<QString> features;
......
......@@ -61,6 +61,7 @@ public:
QList<ProjectExplorer::Task> reportIssues(const QString &proFile);
QList<BuildConfigurationInfo> availableBuildConfigurations(const QString &id, const QString &proFilePath, const QtSupport::QtVersionNumber &minimumQtVersion);
bool selectByDefault(const QString &id) const;
QSet<QString> targetFeatures(const QString &id) const;
};
......
......@@ -76,6 +76,7 @@ public:
virtual QIcon iconForId(const QString &id) const = 0;
virtual QSet<QString> targetFeatures(const QString &id) const = 0;
virtual bool selectByDefault(const QString &id) const;
virtual ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id) = 0;
virtual ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id, const QList<BuildConfigurationInfo> &infos) = 0;
......
......@@ -213,6 +213,12 @@ QList<ProjectExplorer::Task> Qt4BaseTargetFactory::reportIssues(const QString &p
return QList<ProjectExplorer::Task>();
}
bool Qt4BaseTargetFactory::selectByDefault(const QString &id) const
{
Q_UNUSED(id);
return true;
}
// -------------------------------------------------------------------------
// Qt4BaseTarget
// -------------------------------------------------------------------------
......
......@@ -136,7 +136,8 @@ void TargetSetupPage::setupWidgets()
selectTarget = !infos.isEmpty();
} else {
if (!m_preferredFeatures.isEmpty()) {
selectTarget = factory->targetFeatures(id).contains(m_preferredFeatures);
selectTarget = factory->targetFeatures(id).contains(m_preferredFeatures)
&& factory->selectByDefault(id);
}
}
widget->setTargetSelected(selectTarget);
......
Supports Markdown
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