From 5ce1920e684b08b45e0ea0b8ba016a396ed14978 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Mon, 13 Feb 2012 12:26:23 +0100
Subject: [PATCH] Hack to get remote deployment for linux
Really ugly hack to get remote deployment for desktop linux going
again. This is a regression that we recently introduced and should
have again in the next version of Qt Creator.
The proper fix will be happening when adding a system environment
for Qt Creator 2.6.
Change-Id: Iaa9782eda0f7bb434ac5a538a4ef49be11eb3643
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
.../qt-desktop/desktopqtversion.cpp | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
index d030c20e6e0..0fc6e30a5b3 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
@@ -87,7 +87,20 @@ QList<ProjectExplorer::Abi> DesktopQtVersion::detectQtAbis() const
bool DesktopQtVersion::supportsTargetId(const QString &id) const
{
- return id == QLatin1String(Constants::DESKTOP_TARGET_ID);
+ using namespace ProjectExplorer;
+ if (id == QLatin1String(Constants::DESKTOP_TARGET_ID))
+ return true;
+ if (id == QLatin1String("RemoteLinux.EmbeddedLinuxTarget")) {
+ foreach (const Abi &abi, qtAbis()) {
+ switch (abi.os()) {
+ case Abi::BsdOS: case Abi::LinuxOS: case Abi::MacOS: case Abi::UnixOS:
+ return true;
+ default:
+ break;
+ }
+ }
+ }
+ return false;
}
QSet<QString> DesktopQtVersion::supportedTargetIds() const
--
GitLab