From c78da91bf463c571b71129d97cba37f9785700fc Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 11 Mar 2011 16:48:16 +0100
Subject: [PATCH] symbian support: make it compile on linux
Reviewed-by: Tobias Hunger
---
.../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 2d711822247..d31aa3b26c6 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -295,12 +295,7 @@ QString S60DeviceRunConfiguration::localExecutableFileName() const
if (!ti.valid)
return QString();
- const ProjectExplorer::Abi hostAbi = ProjectExplorer::Abi::hostAbi();
- if (hostAbi.os() == ProjectExplorer::Abi::LinuxOS) {
- return executableFromPackageUnix(ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg"));
- }
-
- ProjectExplorer::ToolChain *tc = qt4Target()->activeBuildConfiguration()->toolChain();
+ ProjectExplorer::ToolChain *tc = target()->activeBuildConfiguration()->toolChain();
return localExecutableFromVersion(qtVersion(), symbianTarget(), targetName(), tc);
}
--
GitLab