diff --git a/src/cacic_hardware.cpp b/src/cacic_hardware.cpp index eb290dd..4de9f13 100644 --- a/src/cacic_hardware.cpp +++ b/src/cacic_hardware.cpp @@ -11,7 +11,7 @@ void cacic_hardware::iniciaColeta() OperatingSystem operatingSystem; // se o shell retorna erro ao tentar utilizar o lshw ou o dmidecode, instala o mesmo - if( console("lshw").contains("/bin/sh") ){ qDebug() << "lshw nao instalado."; + if( console("lshw").contains("/bin/sh:") ){ qDebug() << "lshw nao instalado."; if(operatingSystem.getIdOs() == OperatingSystem::LINUX_ARCH) console("pacman -S --needed --noconfirm lshw"); else if(operatingSystem.getIdOs() == OperatingSystem::LINUX_DEBIAN || @@ -400,15 +400,17 @@ void cacic_hardware::coletaLinuxMotherboard(QJsonObject &hardware) } consoleOutput= console("dmidecode -t 10").split("\n"); + + QVariantList onboardCapabilities; foreach(QString line, consoleOutput){ - QJsonArray onboardCapabilities; if(line.contains("Type:") ) onboardCapabilities.append( QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ) ); - motherboard["onboard_capabilities"] = onboardCapabilities; } + motherboard["onboard_capabilities"] = QJsonValue::fromVariant(onboardCapabilities); + hardware["motherboard"] = motherboard; } diff --git a/src/wmi.cpp b/src/wmi.cpp index 8b89757..0497fc0 100644 --- a/src/wmi.cpp +++ b/src/wmi.cpp @@ -1,4 +1,5 @@ #include "wmi.h" +#ifdef Q_OS_WIN wmi::wmi() { @@ -94,3 +95,4 @@ QJsonValue wmi::wmiSearch(QString classe, QStringList params) return wmiReturn; } +#endif //def Q_OS_WIN diff --git a/src/wmi.h b/src/wmi.h index a74e95f..9f66ff7 100644 --- a/src/wmi.h +++ b/src/wmi.h @@ -2,8 +2,10 @@ #define WMI_H #include +#ifdef Q_OS_WIN #include #include +#endif class wmi { -- libgit2 0.21.2