feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

EmbeddedLinux: Fix target being offered when not useful

Browse Source 
Change-Id: I33e5d7f6e5ccda49b693d0f46acd9e1254428f35
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Tobias Hunger
2011-11-08 16:44:28 +00:00
parent b0ec3c130e
commit f36fc6e14b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp
View File

@@ -82,8 +82,12 @@ QSet<QString> EmbeddedLinuxTargetFactory::targetFeatures(const QString & /*id*/)
QStringList EmbeddedLinuxTargetFactory::supportedTargetIds(ProjectExplorer::Project *project) const QStringList EmbeddedLinuxTargetFactory::supportedTargetIds(ProjectExplorer::Project *project) const
{ {
Q_UNUSED(project); if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(project))
return QStringList() << RemoteLinux::Constants::EMBEDDED_LINUX_TARGET_ID; return QStringList();
if (QtSupport::QtVersionManager::instance()->supportsTargetId(RemoteLinux::Constants::EMBEDDED_LINUX_TARGET_ID))
return QStringList() << QLatin1String(RemoteLinux::Constants::EMBEDDED_LINUX_TARGET_ID);
return QStringList();
} }
bool EmbeddedLinuxTargetFactory::supportsTargetId(const QString &id) const bool EmbeddedLinuxTargetFactory::supportsTargetId(const QString &id) const
@@ -125,7 +129,6 @@ bool EmbeddedLinuxTargetFactory::canCreate(ProjectExplorer::Project *parent, con
return supportsTargetId(id); return supportsTargetId(id);
} }
ProjectExplorer::Target *EmbeddedLinuxTargetFactory::create(ProjectExplorer::Project *parent, ProjectExplorer::Target *EmbeddedLinuxTargetFactory::create(ProjectExplorer::Project *parent,
const QString &id) const QString &id)
{ {
@@ -134,9 +137,6 @@ ProjectExplorer::Target *EmbeddedLinuxTargetFactory::create(ProjectExplorer::Pro
QList<QtSupport::BaseQtVersion *> knownVersions = QList<QtSupport::BaseQtVersion *> knownVersions =
QtSupport::QtVersionManager::instance()->versionsForTargetId(id); QtSupport::QtVersionManager::instance()->versionsForTargetId(id);
if (knownVersions.isEmpty())
return 0;
QtSupport::BaseQtVersion *qtVersion = knownVersions.first(); QtSupport::BaseQtVersion *qtVersion = knownVersions.first();
QtSupport::BaseQtVersion::QmakeBuildConfigs config = qtVersion->defaultBuildConfig(); QtSupport::BaseQtVersion::QmakeBuildConfigs config = qtVersion->defaultBuildConfig();