From 4fc0839b37fe0e0c2732bb27c38b3cad1968f4ec Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Wed, 23 Feb 2011 19:10:09 +0100
Subject: [PATCH] Compile fixes
---
src/plugins/qt4projectmanager/librarydetailscontroller.cpp | 4 ++--
src/plugins/qt4projectmanager/qmakestep.cpp | 4 ++--
src/plugins/qt4projectmanager/qtversionmanager.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
index 180f3b7de1d..985353d3f4e 100644
--- a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
+++ b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
@@ -89,8 +89,8 @@ LibraryDetailsController::LibraryDetailsController(
// if its toolchain is maemo behave the same as we would be on linux
if (qt4BuildConfiguration
&& qt4BuildConfiguration->toolChain()
- && (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavour
- || qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavour))
+ && (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor
+ || qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor))
m_creatorPlatform = CreatorLinux;
#endif
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 9aa64218f0c..883365444c7 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -157,8 +157,8 @@ QStringList QMakeStep::moreArguments()
QStringList arguments;
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
ProjectExplorer::ToolChain *tc = bc->toolChain();
- if (tc && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavour
- || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavour))
+ if (tc && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor
+ || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor))
arguments << QLatin1String("-unix");
#endif
if (!bc->qtVersion()->supportsShadowBuilds()) {
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 096d6659758..e1d3c549f42 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1536,7 +1536,7 @@ void QtVersion::updateAbiAndMkspec() const
QList<ProjectExplorer::Abi> tmp = m_abis;
m_abis.clear();
foreach (const ProjectExplorer::Abi &abi, tmp)
- m_abis.append(ProjectExplorer::Abi(abi.architecture(), abi.os(), ProjectExplorer::Abi::WindowsMSysFlavour,
+ m_abis.append(ProjectExplorer::Abi(abi.architecture(), abi.os(), ProjectExplorer::Abi::WindowsMSysFlavor,
abi.binaryFormat(), abi.wordWidth()));
}
#endif
--
GitLab