From 272cf099becd232cc72b105497eea2b92f73e7a1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 5 Aug 2020 14:07:39 +0200 Subject: [PATCH] [hostinfo] Try to recognize ARM as well - /proc/cpuinfo is a terrible information source; it contains very different information on x86 from arm (testen on rpi4 and rock64). --- src/modules/hostinfo/HostInfoJob.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/modules/hostinfo/HostInfoJob.cpp b/src/modules/hostinfo/HostInfoJob.cpp index c2959fb6b..1d4676f65 100644 --- a/src/modules/hostinfo/HostInfoJob.cpp +++ b/src/modules/hostinfo/HostInfoJob.cpp @@ -91,6 +91,17 @@ hostCPUmatch( const QString& s ) return QString(); } +static QString +hostCPUmatchARM( const QString& s ) +{ + // Both Rock64 and Raspberry pi mention 0x41 + if ( s.contains( ": 0x41" ) ) + { + return QStringLiteral( "ARM" ); + } + return QString(); +} + #if defined( Q_OS_FREEBSD ) QString hostCPU_FreeBSD() @@ -127,6 +138,10 @@ hostCPU_Linux() { return hostCPUmatch( line ); } + if ( line.startsWith( "CPU implementer" ) ) + { + return hostCPUmatchARM( line ); + } } } return QString(); // Not open, or not found