From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Tue, 18 Jan 2011 14:43:34 +0000 (+0100)
Subject: Fix non-Linux compilation.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bae2cefc45dc51e6680c5a36bef28f9c5cfffad4;p=qt-creator-jp%2Fqt-creator-jp.git

Fix non-Linux compilation.
---

diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
index 8767cf6961..75e0700018 100644
--- a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
+++ b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
@@ -53,7 +53,8 @@ LibraryDetailsController::LibraryDetailsController(
     Qt4BuildConfiguration *qt4BuildConfiguration =
             qobject_cast<Qt4BuildConfiguration *>(project->activeTarget()->activeBuildConfiguration());
     // if its toolchain is maemo behave the same as we would be on linux
-    if (qt4BuildConfiguration && qt4BuildConfiguration->toolChainType() == ProjectExplorer::ToolChain_GCC_MAEMO)
+    if (qt4BuildConfiguration && (qt4BuildConfiguration->toolChainType() == ProjectExplorer::ToolChain_GCC_MAEMO5
+            || qt4BuildConfiguration->toolChainType() == ProjectExplorer::ToolChain_GCC_HARMATTAN))
         m_creatorPlatform = CreatorLinux;
 #endif
 
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index fad082ce53..902436cf4b 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -148,8 +148,10 @@ QStringList QMakeStep::moreArguments()
     QStringList arguments;
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
     const ProjectExplorer::ToolChainType type = bc->toolChainType();
-    if (type == ProjectExplorer::ToolChain_GCC_MAEMO)
+    if (type == ProjectExplorer::ToolChain_GCC_MAEMO5
+            || type == ProjectExplorer::ToolChain_GCC_HARMATTAN) {
         arguments << QLatin1String("-unix");
+    }
 #endif
     if (!bc->qtVersion()->supportsShadowBuilds()) {
         // We have a target which does not allow shadow building.