Commit 4fc0839b authored by Robert Loehning's avatar Robert Loehning
Browse files

Compile fixes

parent 9cae0553
...@@ -89,8 +89,8 @@ LibraryDetailsController::LibraryDetailsController( ...@@ -89,8 +89,8 @@ LibraryDetailsController::LibraryDetailsController(
// if its toolchain is maemo behave the same as we would be on linux // if its toolchain is maemo behave the same as we would be on linux
if (qt4BuildConfiguration if (qt4BuildConfiguration
&& qt4BuildConfiguration->toolChain() && qt4BuildConfiguration->toolChain()
&& (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavour && (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor
|| qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavour)) || qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor))
m_creatorPlatform = CreatorLinux; m_creatorPlatform = CreatorLinux;
#endif #endif
......
...@@ -157,8 +157,8 @@ QStringList QMakeStep::moreArguments() ...@@ -157,8 +157,8 @@ QStringList QMakeStep::moreArguments()
QStringList arguments; QStringList arguments;
#if defined(Q_OS_WIN) || defined(Q_OS_MAC) #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
ProjectExplorer::ToolChain *tc = bc->toolChain(); ProjectExplorer::ToolChain *tc = bc->toolChain();
if (tc && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavour if (tc && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor
|| tc->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavour)) || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor))
arguments << QLatin1String("-unix"); arguments << QLatin1String("-unix");
#endif #endif
if (!bc->qtVersion()->supportsShadowBuilds()) { if (!bc->qtVersion()->supportsShadowBuilds()) {
......
...@@ -1536,7 +1536,7 @@ void QtVersion::updateAbiAndMkspec() const ...@@ -1536,7 +1536,7 @@ void QtVersion::updateAbiAndMkspec() const
QList<ProjectExplorer::Abi> tmp = m_abis; QList<ProjectExplorer::Abi> tmp = m_abis;
m_abis.clear(); m_abis.clear();
foreach (const ProjectExplorer::Abi &abi, tmp) 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())); abi.binaryFormat(), abi.wordWidth()));
} }
#endif #endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment