From f36fc6e14b29c043f48e88d4d0dada1dbde6fdae Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 8 Nov 2011 16:44:28 +0000 Subject: [PATCH] EmbeddedLinux: Fix target being offered when not useful Change-Id: I33e5d7f6e5ccda49b693d0f46acd9e1254428f35 Reviewed-by: Christian Kandeler --- .../remotelinux/embeddedlinuxtargetfactory.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp b/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp index 0304b4a3ad1..15c748e1f57 100644 --- a/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp +++ b/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp @@ -82,8 +82,12 @@ QSet EmbeddedLinuxTargetFactory::targetFeatures(const QString & /*id*/) QStringList EmbeddedLinuxTargetFactory::supportedTargetIds(ProjectExplorer::Project *project) const { - Q_UNUSED(project); - return QStringList() << RemoteLinux::Constants::EMBEDDED_LINUX_TARGET_ID; + if (!qobject_cast(project)) + 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 @@ -125,7 +129,6 @@ bool EmbeddedLinuxTargetFactory::canCreate(ProjectExplorer::Project *parent, con return supportsTargetId(id); } - ProjectExplorer::Target *EmbeddedLinuxTargetFactory::create(ProjectExplorer::Project *parent, const QString &id) { @@ -134,9 +137,6 @@ ProjectExplorer::Target *EmbeddedLinuxTargetFactory::create(ProjectExplorer::Pro QList knownVersions = QtSupport::QtVersionManager::instance()->versionsForTargetId(id); - if (knownVersions.isEmpty()) - return 0; - QtSupport::BaseQtVersion *qtVersion = knownVersions.first(); QtSupport::BaseQtVersion::QmakeBuildConfigs config = qtVersion->defaultBuildConfig();