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

Remove unneeded #ifdefs.

Browse Source 
Change-Id: I66241be77f61a53590b72560fc0afce50bda97d9
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Christian Kandeler
2013-02-04 13:34:09 +01:00
parent 1d14e7e439
commit 45fd1c248f
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androidqtversion.cpp
View File

@@ -33,6 +33,7 @@
#include "androidmanager.h"
#include <utils/environment.h>
#include <utils/hostosinfo.h>
#include <qt4projectmanager/qt4project.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h>
@@ -96,14 +97,9 @@ QList<ProjectExplorer::Abi> AndroidQtVersion::detectQtAbis() const
void AndroidQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const
{
QString ndk_host = QLatin1String(
#if defined(Q_OS_LINUX)
"linux-x86"
#elif defined(Q_OS_WIN)
"windows"
#elif defined(Q_OS_MAC)
"darwin-x86"
#endif
);
Utils::HostOsInfo::isLinuxHost() ? "linux-x86" :
Utils::HostOsInfo::isWindowsHost() ? "windows" :
Utils::HostOsInfo::isMacHost() ? "darwin-x86" : "");
// this env vars are used by qmake mkspecs to generate makefiles (check QTDIR/mkspecs/android-g++/qmake.conf for more info)
env.set(QLatin1String("ANDROID_NDK_HOST"), ndk_host);