RemoteLinux: Allow deploying to and running on non-Linux unices.

Change-Id: Ib8b8648cc93c37415e0cdb9785f47afbf04e781e
Reviewed-on: http://codereview.qt-project.org/4070
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

4 files changed, 10 insertions, 8 deletions

diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
index 67551d57f0..20af7e0af1 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
@@ -55,7 +55,7 @@ RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory(QOb
 QStringList RemoteLinuxDeployConfigurationFactory::availableCreationIds(Target *parent) const
 {
     QStringList ids;
-    if (RemoteLinuxUtils::hasLinuxQt(parent))
+    if (RemoteLinuxUtils::hasUnixQt(parent))
         ids << genericDeployConfigurationId();
     return ids;
 }
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
index de5519f3ef..f2d66b02d6 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
@@ -92,7 +92,7 @@ bool RemoteLinuxRunConfigurationFactory::canClone(Target *parent, RunConfigurati
 QStringList RemoteLinuxRunConfigurationFactory::availableCreationIds(Target *parent) const
 {
     if (Qt4BaseTarget *t = qobject_cast<Qt4BaseTarget *>(parent)) {
-        if (t && RemoteLinuxUtils::hasLinuxQt(t)) {
+        if (t && RemoteLinuxUtils::hasUnixQt(t)) {
             return t->qt4Project()->applicationProFilePathes(RemoteLinuxRunConfiguration::Id);
         }
     }
diff --git a/src/plugins/remotelinux/remotelinuxutils.cpp b/src/plugins/remotelinux/remotelinuxutils.cpp
index 6d323c4e2f..eb0ad1d8c1 100644
--- a/src/plugins/remotelinux/remotelinuxutils.cpp
+++ b/src/plugins/remotelinux/remotelinuxutils.cpp
@@ -52,14 +52,16 @@ namespace RemoteLinux {
 namespace Internal {
 namespace {
 
-bool isLinuxQt(const BaseQtVersion *qtVersion)
+bool isUnixQt(const BaseQtVersion *qtVersion)
 {
     if (!qtVersion)
         return false;
     const QList<Abi> &abis = qtVersion->qtAbis();
     foreach (const Abi &abi, abis) {
-        if (abi.os() == Abi::LinuxOS)
-            return true;
+        switch (abi.os()) {
+        case Abi::UnixOS: case Abi::BsdOS: case Abi::LinuxOS: case Abi::MacOS: return true;
+        default: continue;
+        }
     }
     return false;
 }
@@ -67,13 +69,13 @@ bool isLinuxQt(const BaseQtVersion *qtVersion)
 } // anonymous namespace
 } // namespace Internal
 
-bool RemoteLinuxUtils::hasLinuxQt(const Target *target)
+bool RemoteLinuxUtils::hasUnixQt(const Target *target)
 {
     const Qt4BaseTarget * const qtTarget = qobject_cast<const Qt4BaseTarget *>(target);
     if (!qtTarget)
         return false;
     const Qt4BuildConfiguration * const bc = qtTarget->activeQt4BuildConfiguration();
-    return bc && Internal::isLinuxQt(bc->qtVersion());
+    return bc && Internal::isUnixQt(bc->qtVersion());
 }
 
 QString RemoteLinuxUtils::osTypeToString(const QString &osType)
diff --git a/src/plugins/remotelinux/remotelinuxutils.h b/src/plugins/remotelinux/remotelinuxutils.h
index 8e7752c8a7..51c04e5c08 100644
--- a/src/plugins/remotelinux/remotelinuxutils.h
+++ b/src/plugins/remotelinux/remotelinuxutils.h
@@ -46,7 +46,7 @@ class LinuxDeviceConfiguration;
 class REMOTELINUX_EXPORT RemoteLinuxUtils
 {
 public:
-    static bool hasLinuxQt(const ProjectExplorer::Target *target);
+    static bool hasUnixQt(const ProjectExplorer::Target *target);
     static QString osTypeToString(const QString &osType);
     static QString deviceConfigurationName(const QSharedPointer<const LinuxDeviceConfiguration> &devConf);
 };