From cfe49a5719ddd298117ecbf53b905964ba0c770d Mon Sep 17 00:00:00 2001 From: David Rosca Date: Tue, 14 Jun 2016 13:13:53 +0200 Subject: [PATCH] Use QSysInfo to obtain cpu architecture --- src/lib/tools/qztools.cpp | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp index 5b8459d76..7ba3b4ba0 100644 --- a/src/lib/tools/qztools.cpp +++ b/src/lib/tools/qztools.cpp @@ -938,31 +938,7 @@ QString QzTools::operatingSystem() QString QzTools::cpuArchitecture() { -#if defined(__x86_64__) || defined(_M_X64) - return QSL("x86_64"); -#endif -#if defined(_M_IX86) - return QSL("x86"); -#endif -#if defined(__i686__) - return QSL("i686"); -#endif -#if defined(__i586__) - return QSL("i586"); -#endif -#if defined(__i486__) - return QSL("i486"); -#endif -#if defined(__i386__) - return QSL("i386"); -#endif -#if defined(__aarch64__) - return QSL("arm64"); -#endif -#if defined(__arm__) || defined(_M_ARM) - return QSL("arm"); -#endif - return QString(); + return QSysInfo::currentCpuArchitecture(); } QString QzTools::operatingSystemLong()