diff options
author | Christian Kandeler <christian.kandeler@nokia.com> | 2011-10-21 11:21:19 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@nokia.com> | 2011-10-21 11:27:54 +0200 |
commit | 5801841130cf89917ba05df3d49c9d0eb63fdbd3 (patch) | |
tree | f28b2bed33d71019dd58e7fb5676bbfb424452c4 /src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp | |
parent | bbb6a4bb647808d06003103b1a5c997806bc4634 (diff) | |
download | qt-creator-5801841130cf89917ba05df3d49c9d0eb63fdbd3.tar.gz |
RemoteLinux: Don't force generic run configurations on all targets.
Instead, as a heuristic, check whether a RemoteLinuxDeployConfiguration
(not a derived one!) exists.
Change-Id: I06561e37ef8d0ddc6eddcf7ed211be779b21ab4d
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Diffstat (limited to 'src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp')
-rw-r--r-- | src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp index f2d66b02d6..6aa3c6ef7a 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp @@ -31,6 +31,7 @@ **************************************************************************/ #include "remotelinuxrunconfigurationfactory.h" +#include "remotelinuxdeployconfigurationfactory.h" #include "remotelinuxrunconfiguration.h" #include "remotelinuxutils.h" @@ -91,10 +92,12 @@ bool RemoteLinuxRunConfigurationFactory::canClone(Target *parent, RunConfigurati QStringList RemoteLinuxRunConfigurationFactory::availableCreationIds(Target *parent) const { - if (Qt4BaseTarget *t = qobject_cast<Qt4BaseTarget *>(parent)) { - if (t && RemoteLinuxUtils::hasUnixQt(t)) { - return t->qt4Project()->applicationProFilePathes(RemoteLinuxRunConfiguration::Id); - } + const QList<DeployConfiguration *> &depConfs = parent->deployConfigurations(); + foreach (const DeployConfiguration * const dc, depConfs) { + if (dc->id() == RemoteLinuxDeployConfigurationFactory::genericDeployConfigurationId()) { + return qobject_cast<Qt4BaseTarget *>(parent)->qt4Project() + ->applicationProFilePathes(RemoteLinuxRunConfiguration::Id); + } } return QStringList(); } |