Commit bae2cefc authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Fix non-Linux compilation.

parent cd3b6c7b
...@@ -53,7 +53,8 @@ LibraryDetailsController::LibraryDetailsController( ...@@ -53,7 +53,8 @@ LibraryDetailsController::LibraryDetailsController(
Qt4BuildConfiguration *qt4BuildConfiguration = Qt4BuildConfiguration *qt4BuildConfiguration =
qobject_cast<Qt4BuildConfiguration *>(project->activeTarget()->activeBuildConfiguration()); qobject_cast<Qt4BuildConfiguration *>(project->activeTarget()->activeBuildConfiguration());
// 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 && qt4BuildConfiguration->toolChainType() == ProjectExplorer::ToolChain_GCC_MAEMO) if (qt4BuildConfiguration && (qt4BuildConfiguration->toolChainType() == ProjectExplorer::ToolChain_GCC_MAEMO5
|| qt4BuildConfiguration->toolChainType() == ProjectExplorer::ToolChain_GCC_HARMATTAN))
m_creatorPlatform = CreatorLinux; m_creatorPlatform = CreatorLinux;
#endif #endif
......
...@@ -148,8 +148,10 @@ QStringList QMakeStep::moreArguments() ...@@ -148,8 +148,10 @@ 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)
const ProjectExplorer::ToolChainType type = bc->toolChainType(); 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"); arguments << QLatin1String("-unix");
}
#endif #endif
if (!bc->qtVersion()->supportsShadowBuilds()) { if (!bc->qtVersion()->supportsShadowBuilds()) {
// We have a target which does not allow shadow building. // We have a target which does not allow shadow building.
......
Markdown is supported
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