Merge branch 'master' into uniqueid

Conflicts:
	src/systeminfo/linux/qsysteminfo_linux_common.cpp

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
index 2aa87d45e7..b3947ffcc7 100644
--- a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
+++ b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
@@ -80,6 +80,8 @@ private slots:
 
     void tst_currentPowerState();
 
+    void tst_currentThermalState();
+
     void tst_currentBluetoothPowerState();
 
     void tst_keyboardType();
@@ -241,6 +243,17 @@ void tst_QSystemDeviceInfo::tst_currentPowerState()
              || state == QSystemDeviceInfo::WallPowerChargingBattery);
 }
 
+void tst_QSystemDeviceInfo::tst_currentThermalState()
+{
+    QSystemDeviceInfo di;
+    QSystemDeviceInfo::ThermalState state = di.currentThermalState();
+    QVERIFY( state == QSystemDeviceInfo::UnknownThermal
+             || state == QSystemDeviceInfo::NormalThermal
+             || state == QSystemDeviceInfo::WarningThermal
+             || state == QSystemDeviceInfo::AlertThermal
+             || state == QSystemDeviceInfo::ErrorThermal);
+}
+
 void tst_QSystemDeviceInfo::tst_currentBluetoothPowerState()
 {
     QSystemDeviceInfo di;