feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix non-Linux compilation.

Browse Source
This commit is contained in:
Christian Kandeler
2011-01-18 15:43:34 +01:00
parent cd3b6c7b23
commit bae2cefc45
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qt4projectmanager/librarydetailscontroller.cpp
View File

@@ -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

4
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -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.