aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2012-02-13 12:26:23 +0100
committerChristian Kandeler <christian.kandeler@nokia.com>2012-02-24 15:07:29 +0100
commit5ce1920e684b08b45e0ea0b8ba016a396ed14978 (patch)
treed9d5493a2b0aa4b5aff6d58d2f7cf55301bff84a /src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
parent45dfc39f922069bdc496ca850cdad890901ed28c (diff)
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>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp')
-rw-r--r--src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
index d030c20e6e..0fc6e30a5b 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