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

librarydetailscontroller: bugfix mac

Browse Source 
Change-Id: Icac245a09fc2d8a9486bdf8e247a399957b5ff97
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Fawzi Mohamed
2012-06-20 17:27:00 +02:00
committed by Tobias Hunger
parent bb793093ed
commit bfb0dfafd0
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,7 @@
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/profileinformation.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildconfiguration.h>
@@ -83,14 +84,11 @@ LibraryDetailsController::LibraryDetailsController(
// project for which we are going to insert the snippet // project for which we are going to insert the snippet
const ProjectExplorer::Project *project = const ProjectExplorer::Project *project =
ProjectExplorer::ProjectExplorerPlugin::instance()->session()->projectForFile(proFile); ProjectExplorer::ProjectExplorerPlugin::instance()->session()->projectForFile(proFile);
// take active build configuration for it
Qt4BuildConfiguration *qt4BuildConfiguration =
qobject_cast<Qt4BuildConfiguration *>(project->activeTarget()->activeBuildConfiguration());
// if its tool chain is maemo behave the same as we would be on linux // if its tool chain is maemo behave the same as we would be on linux
if (qt4BuildConfiguration ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainProfileInformation::toolChain(project->activeTarget()->profile());
&& qt4BuildConfiguration->toolChain() if (tc
&& (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor
|| qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor)) || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor))
m_creatorPlatform = CreatorLinux; m_creatorPlatform = CreatorLinux;
#endif #endif