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

Compile fixes

Browse Source
This commit is contained in:
Robert Loehning
2011-02-23 19:10:09 +01:00
parent 9cae0553b8
commit 4fc0839b37
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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()) {

2
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

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