From a08b1ef8536656d24938d55d2a1ebe4445d64008 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 17 Jan 2013 11:56:39 +0100 Subject: [PATCH] Compile fix for HostInfo on Linux Change-Id: I77924e1025baef92ebcff42ce683dbf9d8feb162 Reviewed-by: Daniel Teske --- src/libs/utils/hostosinfo.cpp | 6 +++++- src/libs/utils/hostosinfo.h | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libs/utils/hostosinfo.cpp b/src/libs/utils/hostosinfo.cpp index 012976afd1b..fcca6a2f5aa 100644 --- a/src/libs/utils/hostosinfo.cpp +++ b/src/libs/utils/hostosinfo.cpp @@ -31,11 +31,13 @@ #ifdef Q_OS_WIN #include +#endif using namespace Utils; HostOsInfo::HostArchitecture HostOsInfo::hostArchitecture() { +#ifdef Q_OS_WIN SYSTEM_INFO info; GetNativeSystemInfo(&info); switch (info.wProcessorArchitecture) { @@ -50,5 +52,7 @@ HostOsInfo::HostArchitecture HostOsInfo::hostArchitecture() default: return HostOsInfo::HostArchitectureOther; } -} +#else + return HostOsInfo::HostArchitectureUnknown; #endif +} diff --git a/src/libs/utils/hostosinfo.h b/src/libs/utils/hostosinfo.h index 027a57de343..1b0919f7c1f 100644 --- a/src/libs/utils/hostosinfo.h +++ b/src/libs/utils/hostosinfo.h @@ -49,11 +49,9 @@ public: enum HostOs { HostOsWindows, HostOsLinux, HostOsMac, HostOsOtherUnix, HostOsOther }; static inline HostOs hostOs(); -#ifdef Q_OS_WIN enum HostArchitecture { HostArchitectureX86, HostArchitectureAMD64, HostArchitectureItanium, - HostArchitectureArm, HostArchitectureOther }; + HostArchitectureArm, HostArchitectureUnknown }; static HostArchitecture hostArchitecture(); -#endif static bool isWindowsHost() { return hostOs() == HostOsWindows; } static bool isLinuxHost() { return hostOs() == HostOsLinux; }